reverting the iface.py changes ; addons: vrf: enable ipv6 on slaves

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>

diff --git a/ifupdown2/addons/vrf.py b/ifupdown2/addons/vrf.py
index a9bc25c05fb81e87cd49bdfad9a573fc5e6f57d3..22365d6d67c5eafe74994fa948fab1be9506126a 100644 (file)
--- a/ifupdown2/addons/vrf.py
+++ b/ifupdown2/addons/vrf.py
@@ -450,10 +450,7 @@ class vrf(moduleBase):
         - workaround for intf moved from bridge port to VRF slave
         """
         try:
-            for ifaceobj in statemanager.get_ifaceobjs(ifname) or []:
-                if ifaceobj.link_privflags & ifaceLinkPrivFlags.BRIDGE_PORT:
-                    self.write_file("/proc/sys/net/ipv6/conf/%s/disable_ipv6" % ifname, "0")
-                    return
+            self.write_file("/proc/sys/net/ipv6/conf/%s/disable_ipv6" % ifname, "0")
         except Exception, e:
             self.logger.info(str(e))
 
@@ -487,6 +484,7 @@ class vrf(moduleBase):
                 if not uppers or vrfname not in uppers:
                     self._handle_existing_connections(ifaceobj, vrfname)
                     self.ipcmd.link_set(ifacename, 'master', vrfname)
+                    self.enable_ipv6(ifacename)
             elif ifaceobj:
                 vrf_master_objs = ifaceobj_getfunc(vrfname)
                 if not vrf_master_objs:

diff --git a/ifupdown2/ifupdown/iface.py b/ifupdown2/ifupdown/iface.py
index 4be2b4f3cb82749d1c117dfbf4408cba46f91ebc..bb095358997223f4a84431a0723de0aa9906ad44 100644 (file)
--- a/ifupdown2/ifupdown/iface.py
+++ b/ifupdown2/ifupdown/iface.py
@@ -647,13 +647,14 @@ class iface():
         del odict['env']
         del odict['link_type']
         del odict['link_kind']
-        #del odict['link_privflags']
+        del odict['link_privflags']
         del odict['role']
         del odict['dependency_type']
         del odict['blacklisted']
         return odict
 
     def __setstate__(self, dict):
+        self.__dict__.update(dict)
         self._config_status = {}
         self.state = ifaceState.NEW
         self.status = ifaceStatus.UNKNOWN
@@ -673,7 +674,6 @@ class iface():
         self.link_privflags = ifaceLinkPrivFlags.UNKNOWN
         self.dependency_type = ifaceDependencyType.UNKNOWN
         self.blacklisted = False
-        self.__dict__.update(dict)
 
     def dump_raw(self, logger):
         indent = '  '