Fix some prints

JIRA: NETVIRT:1232
Change-Id: I9318bf47b635960aa8c4e8956b8c00565560f0f4
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/resources/tools/odltools/odltools/mdsal/models/opendaylight_inventory.py b/resources/tools/odltools/odltools/mdsal/models/opendaylight_inventory.py
index 0b117d08add9bd75e7bf928a6e4f201cea22c38d..48f5d6a00f2d02a7e708544745e9994742fa3391 100644 (file)
--- a/resources/tools/odltools/odltools/mdsal/models/opendaylight_inventory.py
+++ b/resources/tools/odltools/odltools/mdsal/models/opendaylight_inventory.py
@@ -24,7 +24,7 @@ class Nodes(Model):
             dpnid = self.get_dpn_from_ofnodeid(node['id'])
             for group in node.get(Nodes.NODE_GROUP, []):
                 if group_dict.get(dpnid) and group_dict.get(dpnid).get(group[key]):
-                    print 'Duplicate:', dpnid, group[key]
+                    print "Duplicate: dpn_id: {}, group: {}".format(dpnid, group[key])
                 group_dict[dpnid][group[key]] = group
         return dict(group_dict)
 

diff --git a/resources/tools/odltools/odltools/netvirt/analyze.py b/resources/tools/odltools/odltools/netvirt/analyze.py
index 39b7cd013131e5a76d7620df5d52337d6ff49e21..704b4e35d7a316a0b9bd53b24dff634201d16064 100644 (file)
--- a/resources/tools/odltools/odltools/netvirt/analyze.py
+++ b/resources/tools/odltools/odltools/netvirt/analyze.py
@@ -13,7 +13,6 @@ from odltools.netvirt import utils
 
 def print_keys(ifaces, ifstates):
     print "InterfaceNames: {}\n".format(ifaces.keys())
-    print
     print "IfStateNames: {}".format(ifstates.keys())
 
 

diff --git a/resources/tools/odltools/odltools/netvirt/flows.py b/resources/tools/odltools/odltools/netvirt/flows.py
index 4c488d9e52f8c902645174b84ac3ce245912e0e9..c7ab815844960b138a54fb0c6d733c11d5899237 100644 (file)
--- a/resources/tools/odltools/odltools/netvirt/flows.py
+++ b/resources/tools/odltools/odltools/netvirt/flows.py
@@ -246,7 +246,7 @@ def get_iface_for_lport(ifaces, ifindexes, lport):
 
 
 def get_eltag_for_iface(eifaces, einsts, iface):
-    print eifaces
+    print "eifaces: {}".format(eifaces)
     ifname = iface.get('name') if iface else None
     eiface = eifaces.get(ifname) if ifname else None
     einst_name = eiface.get('elan-instance-name') if eiface else None