[lnst] Machine: allow multiple non-primary interface masters

[Jiří Pírko]

commit 94d1d272e99354523c720e4e0a5d79ecd7cb1f5f
Author: Ondrej Lichtner 
Date:   Mon May 12 15:43:31 2014 +0200

Machine: allow multiple non-primary interface masters

In the kernel a net_device uses two lists (upper and lower) to create
    a hierarchy between the interfaces. This patch makes LNST reflect that
    hierarchy - lower == Interface._slaves and upper == Interface._master
    the patch also sepparates the master list into two parts - the _primary_
    master (e.g. bridge, bond, team) and _other_ masters (e.g. vlan
    interfaces). There can only be one primary master!

Since the other masters are not required by the slave configuration
    (yet) the Slave modules don't have to be changed.

Signed-off-by: Ondrej Lichtner 
    Signed-off-by: Jiri Pirko

lnst/Controller/Machine.py |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)
---
diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py
index e2f1d3e..56566a5 100644
--- a/lnst/Controller/Machine.py
+++ b/lnst/Controller/Machine.py
@@ -126,7 +126,7 @@ class Machine(object):
             ind1 = 0
             ind2 = 0
             for i in ordered_list:
-                master = i.get_master()
+                master = i.get_primary_master()
                 if master != None:
                     ind1 = ordered_list.index(i)
                     ind2 = ordered_list.index(master)
@@ -391,7 +391,7 @@ class Interface(object):
         self._addresses = []
         self._options = []

-        self._master = None
+        self._master = {"primary": None, "other": []}

self._ovs_conf = None

@@ -431,19 +431,26 @@ class Interface(object):
     def set_option(self, name, value):
         self._options.append((name, value))

-    def set_master(self, master):
-        if self._master != None:
-            msg = "Interface %s already has a master." % self._master.get_id()
+    def add_master(self, master, primary=True):
+        if primary and self._master["primary"] != None:
+            msg = "Interface %s already has a primary master."\
+                    % self._master.get_id()
             raise MachineError(msg)
         else:
-            self._master = master
+            if primary:
+                self._master["primary"] = master
+            else:
+                self._master["other"].append(master)

-    def get_master(self):
-        return self._master
+    def get_primary_master(self):
+        return self._master["primary"]

def add_slave(self, iface):
         self._slaves[iface.get_id()] = iface
-        iface.set_master(self)
+        if self._type in ["vlan"]:
+            iface.add_master(self, primary=False)
+        else:
+            iface.add_master(self)

def set_slave_option(self, slave_id, name, value):
         if slave_id not in self._slave_options:
@@ -473,10 +480,14 @@ class Interface(object):
                   "addresses": self._addresses, "slaves": self._slaves.keys(),
                   "options": self._options,
                   "slave_options": self._slave_options,
-                  "master": None, "ovs_conf": self._ovs_conf}
+                  "master": None, "other_masters": [],
+                  "ovs_conf": self._ovs_conf}
+
+        if self._master["primary"] != None:
+            config["master"] = self._master["primary"].get_id()

-        if self._master != None:
-            config["master"] = self._master.get_id()
+        for m in self._master["other"]:
+            config["other_masters"].append(m.get_id())

return config