Revert "addons: vrf: ifquery fixes for vrf"

This reverts commit 934c4c49c0e77289e7d56349c44d14ca2c307621.

    Ticket: CM-10175
    Reviewed By: Roopa Prabhu
    Testing Done: yes, by installing ifupdown .deb file onto dell-s3000-02

default addr fix for vrf check is deleting lo addrs accidentally
info: rtnetlink: setting link lo up
info: executing ip addr del ::1/128 dev lo
info: executing ip addr del 127.0.0.1/8 dev lo
info: eth0: running ops ...

Signed-off-by: Nikhil <nikhil@cumulusnetworks.com>

diff --git a/addons/addressvirtual.py b/addons/addressvirtual.py
index bfe640c3711372600dd5372037a4a001795b6916..45a582c5c1ba7a0e254b3ae27791c015b2cda6e2 100644 (file)
--- a/addons/addressvirtual.py
+++ b/addons/addressvirtual.py
@@ -244,7 +244,7 @@ class addressvirtual(moduleBase):
             return True 
         mac = mac.lower()
         try:
-            if int(mac.split(":")[0], 16) & 1 :
+            if int(mac.split(":")[0][1], 16) & 1 :
                 self.logger.error("%s: Multicast bit is set in the virtual mac address '%s'" %(ifaceobj.name, mac))
                 return False
             return True

diff --git a/addons/vrf.py b/addons/vrf.py
index ff4a348a760ae5d8a51e038f5c2fa9c124d76e20..8d1b3cf7d351c767c0371bd32ecb5ebc1943c9ad 100644 (file)
--- a/addons/vrf.py
+++ b/addons/vrf.py
@@ -693,7 +693,7 @@ class vrf(moduleBase):
         try:
             master = self.ipcmd.link_get_master(ifaceobj.name)
             if not master or master != vrf:
-                ifaceobjcurr.update_config_with_status('vrf', str(master), 1)
+                ifaceobjcurr.update_config_with_status('vrf', master, 1)
             else:
                 ifaceobjcurr.update_config_with_status('vrf', master, 0)
         except Exception, e:

diff --git a/ifupdownaddons/iproute2.py b/ifupdownaddons/iproute2.py
index add27822563b8e14518b9cdf1155353c78cb7ba2..15888a4c59f7a233bcfe7edc445b90f3a563dcd8 100644 (file)
--- a/ifupdownaddons/iproute2.py
+++ b/ifupdownaddons/iproute2.py
@@ -109,9 +109,9 @@ class iproute2(utilsBase):
         [linkCache.update_attrdict([ifname], linkattrs)
                     for ifname, linkattrs in linkout.items()]
 
-    def _addr_filter(self, ifname, addr, scope=None):
+    def _addr_filter(self, addr, scope=None):
         default_addrs = ['127.0.0.1/8', '::1/128' , '0.0.0.0']
-        if ifname == 'lo' and addr in default_addrs:
+        if addr in default_addrs:
             return True
         if scope and scope == 'link':
             return True
@@ -151,14 +151,14 @@ class iproute2(utilsBase):
                 except KeyError:
                     linkout[ifname] = linkattrs
             if citems[2] == 'inet':
-                if self._addr_filter(citems[3], ifname, scope=citems[5]):
+                if self._addr_filter(citems[3], scope=citems[5]):
                     continue
                 addrattrs = {}
                 addrattrs['scope'] = citems[5]
                 addrattrs['type'] = 'inet'
                 linkout[ifname]['addrs'][citems[3]] = addrattrs
             elif citems[2] == 'inet6':
-                if self._addr_filter(citems[3], ifname, scope=citems[5]):
+                if self._addr_filter(citems[3], scope=citems[5]):
                     continue
                 if citems[5] == 'link': continue #skip 'link' addresses
                 addrattrs = {}