last version using pyro4

[osm/vim-emu.git] / dockernetrpc / rpc.py

diff --git a/dockernetrpc/rpc.py b/dockernetrpc/rpc.py
index da0518f..c649d77 100644 (file)
--- a/dockernetrpc/rpc.py
+++ b/dockernetrpc/rpc.py
@@ -1,6 +1,7 @@
 # We need a properly installed Dockernet
 from mininet.net import Mininet
 from mininet.node import Controller, Docker, OVSSwitch
+from mininet.link import *
 from mininet.cli import CLI
 import mininet.log
 import logging
@@ -18,9 +19,15 @@ class RemoteMininetNetwork(object):
     def start(self):
         self.net.start()
 
-    def stop(self):
+    def CLI(self):
         CLI(self.net)
-        self.net.stop()
+
+    def stop(self):
+        try:
+            self.net.stop()
+        except Exception as e:
+            print e
+
 
     def addHost(self, name, cls=None, **params):
         return str(self.net.addHost(name, cls=cls, **params))
@@ -28,14 +35,23 @@ class RemoteMininetNetwork(object):
     def addDocker(self, name, **params):
         return str(self.net.addDocker(name, **params))
 
-    def addSwitch(self, name, cls=None, **params):
-        return str(self.net.addSwitch(name, cls=cls, **params))
+    def addSwitch(self, name, **params):
+        # we have to use OVSSwitch to be able to do link attachments
+        # at runtime (switch.attach) method
+        return str(self.net.addSwitch(name, cls=OVSSwitch, **params))
 
     def addLink(self, node1, node2, port1=None, port2=None,
                 cls=None, **params):
         return str(self.net.addLink(node1, node2,
                                     port1, port2, cls=cls, **params))
 
+    def removeHost(self, name, **params):
+        return self.net.removeHost(name, **params)
+
+    def removeLink(self, link=None, node1=None, node2=None):
+        n1, n2 = self.net.get(node1), self.net.get(node2)
+        return self.net.removeLink(node1=n1, node2=n2)
+
 
 def start_server():
     daemon = Pyro4.Daemon()