Use ifname in place of ifName

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

diff --git a/resources/tools/odltools/odltools/netvirt/analyze.py b/resources/tools/odltools/odltools/netvirt/analyze.py
index 822697626525b07484d6832c1e097020d9c294ad..6f38d7791c95d3ff82167259709e54e9897cc560 100644 (file)
--- a/resources/tools/odltools/odltools/netvirt/analyze.py
+++ b/resources/tools/odltools/odltools/netvirt/analyze.py
@@ -46,11 +46,11 @@ def analyze_interface(args):
     ietf_interfaces_interfaces_state = ietf_interfaces.interfaces_state(Model.OPERATIONAL, args)
     ifstates = ietf_interfaces_interfaces_state.get_clist_by_key()
 
-    if not args.ifName:
+    if not args.ifname:
         print_keys(ifaces, ifstates)
         exit(1)
 
-    ifname = args.ifName
+    ifname = args.ifname
     iface, ifstate, port, tunnel, tunState = by_ifname(args, ifname, ifstates, ifaces)
     print "InterfaceConfig: \n{}".format(utils.format_json(args, iface))
     print "InterfaceState: \n{}".format(utils.format_json(args, ifstate))
@@ -64,9 +64,9 @@ def analyze_interface(args):
         print "TunState: \n{}".format(utils.format_json(args, tunState))
     if ifstate:
         ncId = ifstate.get('lower-layer-if')[0]
-        nodeId = ncId[:ncId.rindex(':')]
-        # analyze_inventory(nodeId, True, ncId, ifname)
-        # analyze_inventory(nodeId, False, ncId, ifname)
+        nodeid = ncId[:ncId.rindex(':')]
+        # analyze_inventory(nodeid, True, ncId, ifname)
+        # analyze_inventory(nodeid, False, ncId, ifname)
 
 
 def analyze_trunks(args):
@@ -157,9 +157,9 @@ def analyze_inventory(args):
     else:
         print "Inventory Operational:"
         nodes = config.gmodels.odl_inventory_nodes_operational.get_clist_by_key()
-    node = nodes.get("openflow:" + args.nodeId)
+    node = nodes.get("openflow:" + args.nodeid)
     if node is None:
-        print "node: {} was not found".format("openflow:" + args.nodeId)
+        print "node: {} was not found".format("openflow:" + args.nodeid)
         return
     tables = node.get(Nodes.NODE_TABLE)
     groups = node.get(Nodes.NODE_GROUP)
@@ -167,7 +167,7 @@ def analyze_inventory(args):
     print "Flows:"
     for table in tables:
         for flow in table.get('flow', []):
-            if not args.ifName or args.ifName in utils.nstr(flow.get('flow-name')):
+            if not args.ifname or args.ifname in utils.nstr(flow.get('flow-name')):
                 flow_dict = {'table': table['id'], 'id': flow['id'], 'name': flow.get('flow-name'), 'flow': flow}
                 flow_list.append(flow_dict)
     flows = sorted(flow_list, key=lambda x: x['table'])

diff --git a/resources/tools/odltools/odltools/netvirt/cli.py b/resources/tools/odltools/odltools/netvirt/cli.py
index a6875f782fd3102243089fa467636c24ed0a80e7..1af731b356ca902dd8b6d503faf923f107ee30ba 100644 (file)
--- a/resources/tools/odltools/odltools/netvirt/cli.py
+++ b/resources/tools/odltools/odltools/netvirt/cli.py
@@ -24,18 +24,18 @@ def add_common_args(parser):
 def add_interface_parser(parsers):
     parser = parsers.add_parser("interface")
     add_common_args(parser)
-    parser.add_argument("--ifName",
+    parser.add_argument("--ifname",
                         help="interfaces-state:interface:name")
     parser.set_defaults(func=analyze.analyze_interface)
 
     parser = parsers.add_parser("inventory")
     add_common_args(parser)
-    parser.add_argument("--ifName",
+    parser.add_argument("--ifname",
                         help="interfaces-state:interface:name")
     parser.add_argument("--isConfig",
                         help="config or operational inventory")
-    parser.add_argument("--nodeId",
-                        help="nodeId")
+    parser.add_argument("--nodeid",
+                        help="an openflow node id, not including the prefix such as openflow:")
     parser.set_defaults(func=analyze.analyze_inventory)
 
     parser = parsers.add_parser("trunks")
@@ -57,7 +57,7 @@ def add_show_parser(parsers):
     parser.add_argument("--modules",
                         help="service module owning the flow")
     parser.add_argument("flowtype", choices=["all", "duplicate", "elan", "learned", "stale"])
-    parser.add_argument("--metaOnly", action="store_true",
+    parser.add_argument("--metaonly", action="store_true",
                         help="display flow meta info only")
     parser.add_argument("--urls", action="store_true",
                         help="show flow urls")

diff --git a/resources/tools/odltools/odltools/netvirt/tests/__init__.py b/resources/tools/odltools/odltools/netvirt/tests/__init__.py
index cf65228211d16c314fb0af940561896f3a5e4f2b..667b82217152c11d8d634485e2944979ba9bf542 100644 (file)
--- a/resources/tools/odltools/odltools/netvirt/tests/__init__.py
+++ b/resources/tools/odltools/odltools/netvirt/tests/__init__.py
@@ -3,7 +3,7 @@ import os
 
 class Args:
     def __init__(self, transport="http", ip="localhost", port=8181, user="admin", pw="admin", path="/tmp",
-                 pretty_print=False, if_name=""):
+                 pretty_print=False, ifname=""):
         self.transport = transport
         self.ip = ip
         self.port = port
@@ -11,7 +11,7 @@ class Args:
         self.pw = pw
         self.path = path
         self.pretty_print = pretty_print
-        self.ifName = if_name
+        self.ifname = ifname
 
 
 def get_resources_path():

diff --git a/resources/tools/odltools/odltools/netvirt/tests/test_analyze.py b/resources/tools/odltools/odltools/netvirt/tests/test_analyze.py
index b953aa1c97fc8bb88c4426161365beac1c0b4cda..a50eda135aec5d1ff2db358b3f9ca82f744d054d 100644 (file)
--- a/resources/tools/odltools/odltools/netvirt/tests/test_analyze.py
+++ b/resources/tools/odltools/odltools/netvirt/tests/test_analyze.py
@@ -11,7 +11,7 @@ class TestAnalyze(unittest.TestCase):
 
     def setUp(self):
         logg.Logger(logging.INFO, logging.INFO)
-        self.args = tests.Args(path=tests.get_resources_path(), if_name="98c2e265-b4f2-40a5-8f31-2fb5d2b2baf6")
+        self.args = tests.Args(path=tests.get_resources_path(), ifname="98c2e265-b4f2-40a5-8f31-2fb5d2b2baf6")
 
     @unittest.skip("skipping")
     def test_analyze_trunks(self):