make son-emu-cli python3 compatible for integration with son-cli
diff --git a/setup_cli_only.py b/setup_cli_only.py
new file mode 100755
index 0000000..320ddc3
--- /dev/null
+++ b/setup_cli_only.py
@@ -0,0 +1,26 @@
+from setuptools import setup, find_packages
+
+setup(name='emuvim',
+ version='0.0.1',
+ license='Apache 2.0',
+ description='emuvim is a VIM for the SONATA platform',
+ url='http://github.com/sonata-emu',
+ author_email='sonata-dev@sonata-nfv.eu',
+ package_dir={'': 'src'},
+ # packages=find_packages('emuvim', exclude=['*.test', '*.test.*', 'test.*', 'test']),
+ packages=find_packages('src'),
+ install_requires=[
+ 'urllib3',
+ 'zerorpc',
+ 'tabulate',
+ 'argparse',
+ ],
+ zip_safe=False,
+ entry_points={
+ 'console_scripts': [
+ 'son-emu-cli=emuvim.cli.son_emu_cli:main',
+ ],
+ },
+ setup_requires=['pytest-runner'],
+ tests_require=['pytest'],
+)
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")
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(
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"))
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"))