From eefea6c01c828a4c533a9fceea2945a8236766a5 Mon Sep 17 00:00:00 2001 From: stevenvanrossem Date: Wed, 17 Feb 2016 12:03:26 +0100 Subject: [PATCH] small update network cli --- emuvim/cli/network.py | 2 -- emuvim/dcemulator/net.py | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/emuvim/cli/network.py b/emuvim/cli/network.py index fd7851a..8d4219b 100755 --- a/emuvim/cli/network.py +++ b/emuvim/cli/network.py @@ -57,8 +57,6 @@ parser.add_argument( help="vnf name of the destination of the chain") def main(argv): - print "This is the son-emu network CLI." - print "Arguments: %s" % str(argv) args = vars(parser.parse_args(argv)) c = ZeroRpcClient() c.execute_command(args) diff --git a/emuvim/dcemulator/net.py b/emuvim/dcemulator/net.py index e0d524e..f3c7a68 100755 --- a/emuvim/dcemulator/net.py +++ b/emuvim/dcemulator/net.py @@ -148,10 +148,10 @@ class DCNetwork(Dockernet): next_node = self.getNodeByName(next_hop) if next_hop == vnf_dst_name: - return 0 + return "path added between {0} and {1}".format(vnf_src_name, vnf_dst_name) elif not isinstance( next_node, OVSSwitch ): - logging.info("Next node: {0} is not a switch".format(next_hop1)) - return 0 + logging.info("Next node: {0} is not a switch".format(next_hop)) + return "Next node: {0} is not a switch".format(next_hop) switch_inport = self.DCNetwork_graph[current_hop][next_hop]['dst_port'] @@ -177,4 +177,4 @@ class DCNetwork(Dockernet): current_hop = next_hop - return 1 \ No newline at end of file + return "destination node: {0} not reached".format(vnf_dst_name) \ No newline at end of file -- 2.25.1