Change case of check strings

Ticket: CM-3346
Reviewed By: cosmetic
Testing Done: ifquery check sanity

addons/bridge.py

@@ -336,15 +336,6 @@ class bridge(moduleBase):
             b = list(b)
             yield b[0][1], b[-1][1]
 
-    def _handle_reserved_vlan(self, vlanid):
-        if vlanid in range(self._resv_vlan_range[0],
-                           self._resv_vlan_range[1]):
-           self.logger.warn('skipping reserved vlan %d' %vlanid +
-                   ' (reserved vlan range %d-%d)' %(self._resv_vlan_range[0],
-                   self._resv_vlan_range[1]))
-           return True
-        return False
-
     def _ranges_to_ints(self, rangelist):
         """ returns expanded list of integers given set of string ranges
         example: ['1', '2-4', '6'] returns [1, 2, 3, 4, 6]

addons/vlan.py

@@ -124,6 +124,8 @@ class vlan(moduleBase):
         vlanid = self._get_vlan_id(ifaceobj)
         if vlanid == -1:
             raise Exception('could not determine vlanid')
+        if self._handle_reserved_vlan(vlanid):
+           return
         vlanrawdevice = self._get_vlan_raw_device(ifaceobj)
         if not vlanrawdevice:
             raise Exception('could not determine vlan raw device')

config/ifupdown2.conf

@@ -23,8 +23,8 @@ multiple_vlan_aware_bridge_support=0
 # cross marks against interface attributes.
 # Use the below strings to modify the default behaviour.
 #
-ifquery_check_success_str=(OK)
-ifquery_check_error_str=(FAIL)
+ifquery_check_success_str=(ok)
+ifquery_check_error_str=(fail)
 ifquery_check_unknown_str=
 #
 

ifupdownaddons/modulebase.py

@@ -336,3 +336,14 @@ class moduleBase(object):
             # ignore errors
             pass
         return (start, end)
+
+    def _handle_reserved_vlan(self, vlanid):
+        """ Helper function to check and warn if the vlanid falls in the
+        reserved vlan range """
+        if vlanid in range(self._resv_vlan_range[0],
+                           self._resv_vlan_range[1]):
+           self.logger.warn('skipping reserved vlan %d' %vlanid +
+                   ' (reserved vlan range %d-%d)' %(self._resv_vlan_range[0],
+                   self._resv_vlan_range[1]))
+           return True
+        return False