Merge branch 'sonic-net:master' into pr-json-support-platform-temp

Author: vikumarks

generic_config_updater/patch_sorter.py

@@ -571,6 +571,9 @@ def __init__(self, path_addressing):
             ["BGP_MONITORS", "*", "nhopself"],
             ["BGP_MONITORS", "*", "rrclient"],
             ["MIRROR_SESSION", "*", "*"],
+            ["VLAN_SUB_INTERFACE", "*", "vnet_name"],
+            ["VLAN_INTERFACE", "*", "vnet_name"],
+            ["INTERFACE", "*", "vnet_name"],
         ]
 
     def get_filter(self):

tests/generic_config_updater/files/change_applier_test.data.json

@@ -136,6 +136,11 @@
                 "type": "LeafRouter"
             }
         },
+        "INTERFACE": {
+            "Ethernet2": {
+                "vnet_name": "Vnet3"
+            }
+        },
         "PORT": {
             "Ethernet0": {
                 "alias": "fortyGigE0/0",
@@ -232,7 +237,10 @@
         "VLAN_INTERFACE": {
             "Vlan1000": {},
             "Vlan1000|192.168.0.1/21": {},
-            "Vlan1000|2603:10b0:b13:c70::1/64": {}
+            "Vlan1000|2603:10b0:b13:c70::1/64": {},
+            "Vlan100": {
+                "vnet_name": "Vnet2"
+            }
         },
         "VLAN_MEMBER": {
             "Vlan1000|Ethernet12": {
@@ -244,6 +252,12 @@
             "Vlan1000|Ethernet28": {
             }
         },
+        "VLAN_SUB_INTERFACE": {
+            "Ethernet0.10": {
+                "vlan": 10,
+                "vnet_name": "Vnet1"
+            }
+        },
         "WRED_PROFILE": {
             "AZURE_LOSSLESS": {
                 "ecn": "ecn_all",