Add new methods to lookup ports by switch and port number

Change-Id: I3464f1fad1bd3d5c421dfa2db69ddce3b95f2603
diff --git a/admin.py b/admin.py
index 2e95ae3..5879764 100644
--- a/admin.py
+++ b/admin.py
@@ -209,6 +209,13 @@
                   help = "Lookup a port ID by switch and port name",
                   nargs = 2,
                   metavar = "<switch_id> <name>")
+port_group.add_option("--lookup_port_by_switch_and_number",
+                  dest = "lookup_port_by_switch_and_number",
+                  action = "store",
+                  type = "string",
+                  help = "Lookup a port ID by switch and number",
+                  nargs = 2,
+                  metavar = "<switch_id> <name>")
 port_group.add_option("--set_port_mode",
                   dest = "set_port_mode",
                   action = "store",
@@ -444,6 +451,19 @@
             print 'No port found for switch_id %d, name %s' % (int(opts.lookup_port_by_switch_and_name[0]), opts.lookup_port_by_switch_and_name[1])
     except InputError as inst:
         print 'Failed: %s' % inst
+elif opts.lookup_port_by_switch_and_number is not None:
+    try:
+        p = call_vland('db_query',
+                       {'command':'db.get_port_by_switch_and_number',
+                        'data':
+                        {'switch_id': opts.lookup_port_by_switch_and_number[0],
+                         'number': opts.lookup_port_by_switch_and_number[1]}})
+        if p is not None:
+            print p
+        else:
+            print 'No port found for switch_id %d, port number %d' % (int(opts.lookup_port_by_switch_and_number[0]), int(opts.lookup_port_by_switch_and_number[1]))
+    except InputError as inst:
+        print 'Failed: %s' % inst
 elif opts.set_port_mode is not None:
     try:
         port_id = call_vland('vlan_update',