Merge pull request #472 from globocom/develop

Develop

Author: renan-lopes-rodrigues

networkapi/infrastructure/xml_utils.py

@@ -55,7 +55,8 @@ def _add_text_node(value, node, doc):
     if not isinstance(value, StringTypes):
         text = '%s' % unicode(value)
     else:
-        text = r'%s' % value.replace('%', '%%')
+        # text = r'%s' % value.replace('%', '%%')
+        text = value
 
     try:
         textNode = doc.createTextNode(text)

networkapi/util/interface_validate.py

@@ -41,6 +41,16 @@ def check_overriding(self, source_interface_str_list, target_interface_str_list)
                 for target_interface_str in target_interface_str_list:
 
                     log.info("Validating '%s' with '%s'", source_interface_str, source_interface_str)
+
+                    if (
+                        'mngmt' in target_interface_str.lower() or 
+                        'mgmt' in target_interface_str.lower() or 
+                        'management' in target_interface_str.lower() or 
+                        'eth0' in target_interface_str.lower()
+                    ):
+                        log.warning("Skipping overriding validation: '%s' with '%s' (management interface)", source_interface_str, target_interface_str)
+                        continue
+
                     source_interface_array = [int(num) for num in re.findall(r'\d+', source_interface_str)]
                     target_interface_array = [int(num) for num in re.findall(r'\d+', target_interface_str)]
                     response = self._is_overriding(