using new containernet function to add/remove SAPs

[osm/vim-emu.git] / src / emuvim / dcemulator / node.py

diff --git a/src/emuvim/dcemulator/node.py b/src/emuvim/dcemulator/node.py
index d5a8cdf..c594f8f 100755 (executable)
--- a/src/emuvim/dcemulator/node.py
+++ b/src/emuvim/dcemulator/node.py
@@ -67,7 +67,7 @@ class EmulatorCompute(Docker):
             vnf_interface = str(i)
             dc_port_name = self.datacenter.net.find_connected_dc_interface(vnf_name, vnf_interface)
             # format list of tuples (name, Ip, MAC, isUp, status, dc_portname)
-            intf_dict = {'intf_name': str(i), 'ip': i.IP(), 'mac': i.MAC(), 'up': i.isUp(), 'status': i.status(), 'dc_portname': dc_port_name}
+            intf_dict = {'intf_name': str(i), 'ip': i.IP(), 'netmask': i.prefixLen, 'mac': i.MAC(), 'up': i.isUp(), 'status': i.status(), 'dc_portname': dc_port_name}
             networkStatusList.append(intf_dict)
 
         return networkStatusList
@@ -258,18 +258,18 @@ class Datacenter(object):
         # create SAP as separate OVS switch with an assigned ip address
         sap_ip = str(sap_net[1]) + '/' + str(sap_net.prefixlen)
         # allow connection to the external internet through the host
-        params = dict(NAT=True, SAPNet=str(sap_net))
+        params = dict(NAT=True)
         sap_switch = self.net.addExtSAP(sap_name, sap_ip, dpid=hex(self._get_next_extSAP_dpid())[2:], **params)
         sap_switch.start()
 
         # link SAP to the DC switch
         self.net.addLink(sap_switch, self.switch, cls=Link)
 
-    def removeExternalSAP(self, sap_name, sap_net):
+    def removeExternalSAP(self, sap_name):
         sap_switch = self.net.getNodeByName(sap_name)
         # link SAP to the DC switch
         self.net.removeLink(link=None, node1=sap_switch, node2=self.switch)
-        self.net.removeExtSAP(sap_name, str(sap_net))
+        self.net.removeExtSAP(sap_name)
 
     def listCompute(self):
         """