X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=bb60f1fd40282d4cc859be0df89c2da8b18afac7;hb=0b33147b732e26a07d2566346908e3c0fb026dfc;hp=c03035fe07893fd07206243e4f8ea1d1fe375687;hpb=51490a6a15596f64b3367ce7c5be5bcff2a3c443;p=nodemanager.git

diff --git a/net.py b/net.py
index c03035f..bb60f1f 100644
--- a/net.py
+++ b/net.py
@@ -9,8 +9,10 @@ import logger
 import string
 import iptables
 import os
+import plnet
 
 def GetSlivers(plc, data):
+    InitInterfaces(plc, data)
     InitNodeLimit(data)
     InitI2(plc, data)
     InitNAT(plc, data)
@@ -98,7 +100,7 @@ def InitNAT(plc, data):
             continue
 
         try:
-            settings = plc.GetInterfaceSettings({'interface_setting_id': network['interface_setting_ids']})
+            settings = plc.GetInterfaceTags({'interface_tag_id': network['interface_tag_ids']})
         except:
             continue
         # XXX arbitrary names
@@ -123,5 +125,10 @@ def InitNAT(plc, data):
                     ipt.add_pf(fields)
     ipt.commit()
 
+def InitInterfaces(plc, data):
+    if not 'networks' in data:
+        return
+    plnet.InitInterfaces(logger, plc, data)
+
 def start(options, config):
     pass