Merge branch '202012' of https://github.com/Azure/sonic-buildimage in…

…to 202012-nb-inno3

device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py

@@ -234,7 +234,7 @@ def get_position_in_parent(self):
         Returns:
             integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
         """
-        return -1
+        return self.index + 1
 
     def is_replaceable(self):
         """

device/celestica/x86_64-cel_e1031-r0/sonic_platform/thermal.py

@@ -324,6 +324,5 @@ def get_position_in_parent(self):
         Returns:
             A int value, 0 represent ASIC thermal, 1 represent CPU thermal info
         """
-        if self.postion == "cpu":
-            return 1
-        return 0
+
+        return self.index + 1

src/sonic-bgpcfgd/bgpcfgd/main.py

@@ -17,7 +17,6 @@
 from .managers_intf import InterfaceMgr
 from .managers_setsrc import ZebraSetSrc
 from .managers_static_rt import StaticRouteMgr
-from .managers_rm import RouteMapMgr
 from .runner import Runner, signal_handler
 from .template import TemplateFabric
 from .utils import read_constants
@@ -61,7 +60,6 @@ def do_work():
         StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE"),
         # Route Advertisement Managers
         AdvertiseRouteMgr(common_objs, "STATE_DB", swsscommon.STATE_ADVERTISE_NETWORK_TABLE_NAME),
-        RouteMapMgr(common_objs, "APPL_DB", swsscommon.APP_BGP_PROFILE_TABLE_NAME),
     ]
     runner = Runner(common_objs['cfg_mgr'])
     for mgr in managers:

src/sonic-bgpcfgd/bgpcfgd/managers_advertise_rt.py

@@ -1,14 +1,10 @@
 from .manager import Manager
 from .template import TemplateFabric
 from swsscommon import swsscommon
-from .managers_rm import ROUTE_MAPS
-import ipaddress
-from .log import log_info, log_err, log_debug
 
 
 class AdvertiseRouteMgr(Manager):
     """ This class Advertises routes when ADVERTISE_NETWORK_TABLE in STATE_DB is updated """
-
     def __init__(self, common_objs, db, table):
         """
         Initialize the object
@@ -22,105 +18,82 @@ def __init__(self, common_objs, db, table):
             db,
             table,
         )
-
+        
         self.directory.subscribe([("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"),], self.on_bgp_asn_change)
         self.advertised_routes = dict()
 
 
-    OP_DELETE = "DELETE"
-    OP_ADD = "ADD"
+    OP_DELETE = 'DELETE'
+    OP_ADD = 'ADD'
+
 
     def set_handler(self, key, data):
-        log_debug("AdvertiseRouteMgr:: set handler")
-        if not self.__set_handler_validate(key, data):
-            return True
         vrf, ip_prefix = self.split_key(key)
-        self.add_route_advertisement(vrf, ip_prefix, data)
+        self.add_route_advertisement(vrf, ip_prefix)
 
         return True
 
+
     def del_handler(self, key):
-        log_debug("AdvertiseRouteMgr:: del handler")
         vrf, ip_prefix = self.split_key(key)
         self.remove_route_advertisement(vrf, ip_prefix)
 
-    def __set_handler_validate(self, key, data):
-        if data:
-            if ("profile" in data and data["profile"] in ROUTE_MAPS) or data == {"":""}:
-                """
-                    APP which config the data should be responsible to pass a valid IP prefix
-                """
-                return True
-
-        log_err("BGPAdvertiseRouteMgr:: Invalid data %s for advertised route %s" % (data, key))
-        return False
-
-    def add_route_advertisement(self, vrf, ip_prefix, data):
+
+    def add_route_advertisement(self, vrf, ip_prefix):
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
-            if not self.advertised_routes.get(vrf, dict()):
+            if not self.advertised_routes.get(vrf, set()):
                 self.bgp_network_import_check_commands(vrf, self.OP_ADD)
-            self.advertise_route_commands(ip_prefix, vrf, self.OP_ADD, data)
+            self.advertise_route_commands(ip_prefix, vrf, self.OP_ADD)
+
+        self.advertised_routes.setdefault(vrf, set()).add(ip_prefix)
 
-        self.advertised_routes.setdefault(vrf, dict()).update({ip_prefix: data})
 
     def remove_route_advertisement(self, vrf, ip_prefix):
-        if ip_prefix not in self.advertised_routes.get(vrf, dict()):
-            log_info("BGPAdvertiseRouteMgr:: %s|%s does not exist" % (vrf, ip_prefix))
-            return
-        self.advertised_routes.get(vrf, dict()).pop(ip_prefix)
-        if not self.advertised_routes.get(vrf, dict()):
+        self.advertised_routes.setdefault(vrf, set()).discard(ip_prefix)
+        if not self.advertised_routes.get(vrf, set()):
             self.advertised_routes.pop(vrf, None)
 
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
-            if not self.advertised_routes.get(vrf, dict()):
+            if not self.advertised_routes.get(vrf, set()):
                 self.bgp_network_import_check_commands(vrf, self.OP_DELETE)
             self.advertise_route_commands(ip_prefix, vrf, self.OP_DELETE)
 
-    def advertise_route_commands(self, ip_prefix, vrf, op, data=None):
+
+    def advertise_route_commands(self, ip_prefix, vrf, op):
         is_ipv6 = TemplateFabric.is_ipv6(ip_prefix)
         bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
 
         cmd_list = []
-        if vrf == "default":
+        if vrf == 'default':
             cmd_list.append("router bgp %s" % bgp_asn)
         else:
             cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
 
         cmd_list.append(" address-family %s unicast" % ("ipv6" if is_ipv6 else "ipv4"))
-
-        if data and "profile" in data:
-            cmd_list.append("  network %s route-map %s" % (ip_prefix, "%s_RM" % data["profile"]))
-            log_debug(
-                "BGPAdvertiseRouteMgr:: Update bgp %s network %s with route-map %s"
-                % (bgp_asn, vrf + "|" + ip_prefix, "%s_RM" % data["profile"])
-            )
-        else:
-            cmd_list.append("  %snetwork %s" % ("no " if op == self.OP_DELETE else "", ip_prefix))
-            log_debug(
-                "BGPAdvertiseRouteMgr:: %sbgp %s network %s"
-                % ("Remove " if op == self.OP_DELETE else "Update ", bgp_asn, vrf + "|" + ip_prefix)
-            )
+        cmd_list.append("  %snetwork %s" % ('no ' if op == self.OP_DELETE else '', ip_prefix))
 
         self.cfg_mgr.push_list(cmd_list)
-        log_debug("BGPAdvertiseRouteMgr::Done")
+
 
     def bgp_network_import_check_commands(self, vrf, op):
         bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
         cmd_list = []
-        if vrf == "default":
+        if vrf == 'default':
             cmd_list.append("router bgp %s" % bgp_asn)
         else:
             cmd_list.append("router bgp %s vrf %s" % (bgp_asn, vrf))
-        cmd_list.append(" %sbgp network import-check" % ("" if op == self.OP_DELETE else "no "))
+        cmd_list.append(" %sbgp network import-check" % ('' if op == self.OP_DELETE else 'no '))
 
         self.cfg_mgr.push_list(cmd_list)
 
+
     def on_bgp_asn_change(self):
         if self.directory.path_exist("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost/bgp_asn"):
             for vrf, ip_prefixes in self.advertised_routes.items():
                 self.bgp_network_import_check_commands(vrf, self.OP_ADD)
                 for ip_prefix in ip_prefixes:
-                    self.add_route_advertisement(vrf, ip_prefix, ip_prefixes[ip_prefix])
+                    self.add_route_advertisement(vrf, ip_prefix)
+
 
     @staticmethod
     def split_key(key):
@@ -129,7 +102,7 @@ def split_key(key):
         :param key: key to split
         :return: vrf name extracted from the key, ip prefix extracted from the key
         """
-        if "|" not in key:
-            return "default", key
+        if '|' not in key:
+            return 'default', key
         else:
-            return tuple(key.split("|", 1))
+            return tuple(key.split('|', 1))

src/sonic-bgpcfgd/tests/test_advertise_rt.py

@@ -48,7 +48,7 @@ def test_set_del():
     set_del_test(
         mgr,
         "SET",
-        ("10.1.0.0/24", {"":""}),
+        ("10.1.0.0/24", {}),
         True,
         [
             ["router bgp 65100",
@@ -62,7 +62,7 @@ def test_set_del():
     set_del_test(
         mgr,
         "SET",
-        ("fc00:10::/64", {"":""}),
+        ("fc00:10::/64", {}),
         True,
         [
             ["router bgp 65100",
@@ -103,7 +103,7 @@ def test_set_del_vrf():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|10.2.0.0/24", {"":""}),
+        ("vrfRED|10.2.0.0/24", {}),
         True,
         [
             ["router bgp 65100 vrf vrfRED",
@@ -117,7 +117,7 @@ def test_set_del_vrf():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|fc00:20::/64", {"":""}),
+        ("vrfRED|fc00:20::/64", {}),
         True,
         [
             ["router bgp 65100 vrf vrfRED",
@@ -158,9 +158,7 @@ def test_set_del_bgp_asn_change():
     set_del_test(
         mgr,
         "SET",
-        ("vrfRED|10.3.0.0/24", {
-            "profile": "FROM_SDN_SLB_ROUTES"
-        }),
+        ("vrfRED|10.3.0.0/24", {}),
         True,
         []
     )
@@ -172,7 +170,7 @@ def test_set_del_bgp_asn_change():
          " no bgp network import-check"],
         ["router bgp 65100 vrf vrfRED",
          " address-family ipv4 unicast",
-         "  network 10.3.0.0/24 route-map FROM_SDN_SLB_ROUTES_RM"]
+         "  network 10.3.0.0/24"]
     ]
     def push_list(cmds):
         test_set_del_bgp_asn_change.push_list_called = True
@@ -185,61 +183,3 @@ def push_list(cmds):
     mgr.directory.put("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME, "localhost", {"bgp_asn": "65100"})
 
     assert test_set_del_bgp_asn_change.push_list_called
-
-def test_set_del_with_community():
-    mgr = constructor()
-    set_del_test(
-        mgr,
-        "SET",
-        ("10.1.0.0/24", {
-            "profile": "FROM_SDN_SLB_ROUTES"
-        }),
-        True,
-        [
-            ["router bgp 65100",
-             " no bgp network import-check"],
-            ["router bgp 65100",
-             " address-family ipv4 unicast",
-             "  network 10.1.0.0/24 route-map FROM_SDN_SLB_ROUTES_RM"]
-        ]
-    )
-
-    set_del_test(
-        mgr,
-        "SET",
-        ("fc00:10::/64", {
-            "profile": "FROM_SDN_SLB_ROUTES"
-        }),
-        True,
-        [
-            ["router bgp 65100",
-             " address-family ipv6 unicast",
-             "  network fc00:10::/64 route-map FROM_SDN_SLB_ROUTES_RM"]
-        ]
-    )
-
-    set_del_test(
-        mgr,
-        "DEL",
-        ("10.1.0.0/24",),
-        True,
-        [
-            ["router bgp 65100",
-             " address-family ipv4 unicast",
-             "  no network 10.1.0.0/24"]
-        ]
-    )
-
-    set_del_test(
-        mgr,
-        "DEL",
-        ("fc00:10::/64",),
-        True,
-        [
-            ["router bgp 65100",
-             " bgp network import-check"],
-            ["router bgp 65100",
-             " address-family ipv6 unicast",
-             "  no network fc00:10::/64"]
-        ]
-    )