commit 49378157d278717311359ee6691dea6124cc990a
author stevenvanrossem <steven.vanrossem@intec.ugent.be> Thu May 19 11:33:48 2016 +0200
committer stevenvanrossem <steven.vanrossem@intec.ugent.be> Thu May 19 11:33:48 2016 +0200
tree 40444e5a46eaa4a4ce24a8f01b470a436e7053a1
parent 48db0512f82329aa9f46ba9e87efb8a1846ba966

make son-emu-cli python3 compatible for integration with son-cli

src/emuvim/cli/compute.py

diff --git a/src/emuvim/cli/compute.py b/src/emuvim/cli/compute.py
index 433826e..c096475 100755
--- a/src/emuvim/cli/compute.py
+++ b/src/emuvim/cli/compute.py
@@ -24,7 +24,7 @@
             # call the local method with the same name as the command arg
             getattr(self, args["command"])(args)
         else:
-            print "Command not implemented."
+            print("Command not implemented.")
 
     def start(self, args):
         nw_list = list()
@@ -71,7 +71,7 @@
                    "eth0 IP",
                    "eth0 status",
                    "Status"]
-        print tabulate(table, headers=headers, tablefmt="grid")
+        print(tabulate(table, headers=headers, tablefmt="grid"))
 
     def status(self, args):
         r = self.c.compute_status(
@@ -138,8 +138,8 @@
     help="Startup command of the container e.g. './start.sh'")
 parser.add_argument(
     "--net", dest="network",
-    help="Network properties of compute instance e.g. \
-          '10.0.0.123/8' or '10.0.0.123/8,11.0.0.123/24' for multiple interfaces.")
+    help="Network properties of a compute instance e.g. \
+          '(id=input,ip=10.0.10.3/24),(id=output,ip=10.0.10.4/24)' for multiple interfaces.")
 parser.add_argument(
     "--input", "-in", dest="input",
     help="input interface of the vnf to profile")

src/emuvim/cli/datacenter.py

diff --git a/src/emuvim/cli/datacenter.py b/src/emuvim/cli/datacenter.py
index c3850fc..cbe4d0b 100755
--- a/src/emuvim/cli/datacenter.py
+++ b/src/emuvim/cli/datacenter.py
@@ -24,7 +24,7 @@
             # call the local method with the same name as the command arg
             getattr(self, args["command"])(args)
         else:
-            print "Command not implemented."
+            print("Command not implemented.")
 
     def list(self, args):
         r = self.c.datacenter_list()
@@ -42,7 +42,7 @@
                    "Switch",
                    "# Containers",
                    "# Metadata Items"]
-        print tabulate(table, headers=headers, tablefmt="grid")
+        print(tabulate(table, headers=headers, tablefmt="grid"))
 
     def status(self, args):
         r = self.c.datacenter_status(

src/emuvim/cli/monitor.py

diff --git a/src/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
index 79ff25b..7be7374 100755
--- a/src/emuvim/cli/monitor.py
+++ b/src/emuvim/cli/monitor.py
@@ -30,7 +30,7 @@
             # call the local method with the same name as the command arg

             getattr(self, args["command"])(args)

         else:

-            print "Command not implemented."

+            print("Command not implemented.")

 

     def setup_metric(self, args):

         vnf_name = self._parse_vnf_name(args.get("vnf_name"))

src/emuvim/cli/network.py

diff --git a/src/emuvim/cli/network.py b/src/emuvim/cli/network.py
index 516a752..bfd1127 100755
--- a/src/emuvim/cli/network.py
+++ b/src/emuvim/cli/network.py
@@ -25,7 +25,7 @@
             # call the local method with the same name as the command arg

             getattr(self, args["command"])(args)

         else:

-            print "Command not implemented."

+            print("Command not implemented.")

 

     def add(self, args):

         vnf_src_name = self._parse_vnf_name(args.get("source"))