addons: support for new addon module for vrf

[mirror_ifupdown2.git] / ifupdownaddons / iproute2.py

diff --git a/ifupdownaddons/iproute2.py b/ifupdownaddons/iproute2.py
index a09234c566a43c4c4ff7038625cca7a765ac3ca5..b8f7ae2007cf121705d43ad658f65370acfe1ac5 100644 (file)
--- a/ifupdownaddons/iproute2.py
+++ b/ifupdownaddons/iproute2.py
@@ -585,6 +585,9 @@ class iproute2(utilsBase):
     def get_vxlandev_attrs(self, ifacename):
         return self._cache_get('link', [ifacename, 'linkinfo'])
 
+    def link_get_linkinfo_attrs(self, ifacename):
+        return self._cache_get('link', [ifacename, 'linkinfo'])
+
     def link_get_mtu(self, ifacename):
         return self._cache_get('link', [ifacename, 'mtu'])
 
@@ -600,13 +603,17 @@ class iproute2(utilsBase):
                                              %ifacename)
         return address
 
-    def link_create(self, ifacename, type, link=None):
+    def link_create(self, ifacename, type, attrs={}):
+        """ generic link_create function """
         if self.link_exists(ifacename):
             return
         cmd = 'link add'
-        if link:
-            cmd += ' link %s' %link
         cmd += ' name %s type %s' %(ifacename, type)
+        if attrs:
+            for k, v in attrs.iteritems():
+                cmd += ' %s' %k
+                if v:
+                    cmd += ' %s' %v
         if self.ipbatch and not self.ipbatch_pause:
             self.add_to_batch(cmd)
         else:
@@ -623,6 +630,17 @@ class iproute2(utilsBase):
             self.exec_command('ip %s' %cmd)
         self._cache_invalidate()
 
+    def link_get_master(self, ifacename):
+        sysfs_master_path = '/sys/class/net/%s/master' %ifacename
+        if os.path.exists(sysfs_master_path):
+            link_path = os.readlink(sysfs_master_path)
+            if link_path:
+                return os.path.basename(link_path)
+            else:
+                return None
+        else:
+            return self._cache_get('link', [ifacename, 'master'])
+
     def bridge_port_vids_add(self, bridgeportname, vids):
         [self.exec_command('bridge vlan add vid %s dev %s'
                           %(v, bridgeportname)) for v in vids]