Merge branch 'master' into dev/mghoneim/groupings

Author: ghooo

azure-pipelines.yml

@@ -20,7 +20,7 @@ stages:
   - job:
     displayName: "Python3"
     variables:
-      DIFF_COVER_CHECK_THRESHOLD: 0
+      DIFF_COVER_CHECK_THRESHOLD: 50
       DIFF_COVER_ENABLE: 'true'
     pool:
       vmImage: ubuntu-20.04

config/vlan.py

@@ -24,6 +24,10 @@ def add_vlan(db, vid):
         ctx.fail("Invalid VLAN ID {} (1-4094)".format(vid))
 
     vlan = 'Vlan{}'.format(vid)
+    
+    if vid == 1:
+        ctx.fail("{} is default VLAN".format(vlan))
+    
     if clicommon.check_if_vlanid_exist(db.cfgdb, vlan):
         ctx.fail("{} already exists".format(vlan))
 

generic_config_updater/gu_common.py

@@ -273,7 +273,13 @@ def create_path(self, tokens):
         return JsonPointer.from_parts(tokens).path
 
     def has_path(self, doc, path):
-        return JsonPointer(path).get(doc, default=None) is not None
+        return self.get_from_path(doc, path) is not None
+
+    def get_from_path(self, doc, path):
+        return JsonPointer(path).get(doc, default=None)
+
+    def is_config_different(self, path, current, target):
+        return self.get_from_path(current, path) != self.get_from_path(target, path)
 
     def get_xpath_tokens(self, xpath):
         """
@@ -558,7 +564,8 @@ def _get_xpath_tokens_from_leaf(self, model, token_index, path_tokens, config):
             if uses_leaf_model:
                 return [token]
 
-        raise ValueError("Token not found")
+        raise ValueError(f"Path token not found.\n  model: {model}\n  token_index: {token_index}\n  " + \
+                         f"path_tokens: {path_tokens}\n  config: {config}")
 
     def _extractKey(self, tableKey, keys):
         keyList = keys.split()
@@ -729,7 +736,8 @@ def _get_path_tokens_from_leaf(self, model, token_index, xpath_tokens, config):
             if uses_leaf_model:
                 return [token]
 
-        raise Exception("no leaf")
+        raise ValueError(f"Xpath token not found.\n  model: {model}\n  token_index: {token_index}\n  " + \
+                         f"xpath_tokens: {xpath_tokens}\n  config: {config}")
 
     def _extract_key_dict(self, list_token):
         # Example: VLAN_MEMBER_LIST[name='Vlan1000'][port='Ethernet8']

generic_config_updater/patch_sorter.py

@@ -0,0 +1,49 @@
+{
+    "PORT": {
+        "Ethernet4": {
+            "admin_status": "up",
+            "alias": "fortyGigE0/4",
+            "description": "Servers0:eth0",
+            "index": "1",
+            "lanes": "29,30,31,32",
+            "mtu": "9100",
+            "pfc_asym": "off",
+            "speed": "40000"
+        },
+        "Ethernet8": {
+            "admin_status": "up",
+            "alias": "fortyGigE0/8",
+            "description": "Servers1:eth0",
+            "index": "2",
+            "lanes": "33,34,35,36",
+            "pfc_asym": "off",
+            "speed": "40000"
+        },
+        "Ethernet12": {
+            "admin_status": "down",
+            "alias": "fortyGigE0/12",
+            "description": "Servers2:eth0",
+            "index": "3",
+            "lanes": "37,38,39,40",
+            "mtu": "9100",
+            "pfc_asym": "off",
+            "speed": "40000"
+        },
+        "Ethernet16": {
+            "alias": "fortyGigE0/16",
+            "description": "Servers3:eth0",
+            "index": "4",
+            "lanes": "41,42,43,44",
+            "pfc_asym": "off",
+            "speed": "40000"
+        }
+    },
+    "BUFFER_PG": {
+        "Ethernet4|0": {
+            "profile": "ingress_lossy_profile"
+        },
+        "Ethernet12|0": {
+            "profile": "ingress_lossy_profile"
+        }
+    }
+}