Subnet and Global IP commands now use resolve_id in order to ensure there's exactly one matching id

sudorandom · sudorandom · commit 554bf7ee5cf8 · 2014-01-20T14:54:15.000-06:00
diff --git a/SoftLayer/CLI/modules/globalip.py b/SoftLayer/CLI/modules/globalip.py
@@ -15,7 +15,7 @@
 
 from SoftLayer import NetworkManager
 from SoftLayer.CLI import (
-    CLIRunnable, Table, FormattedItem, confirm, no_going_back)
+    CLIRunnable, Table, FormattedItem, confirm, no_going_back, resolve_id)
 from SoftLayer.CLI.helpers import CLIAbort, SequentialOutput
 
 
@@ -33,8 +33,9 @@ class GlobalIpAssign(CLIRunnable):
 
     def execute(self, args):
         mgr = NetworkManager(self.client)
-
-        global_ip_id = mgr.resolve_global_ip_ids(args.get('<identifier>'))
+        global_ip_id = resolve_id(mgr.resolve_global_ip_ids,
+                                  args.get('<identifier>'),
+                                  name='global ip')
         if not global_ip_id:
             raise CLIAbort("Unable to find global IP record for " +
                            args['<identifier>'])
@@ -53,7 +54,9 @@ class GlobalIpCancel(CLIRunnable):
 
     def execute(self, args):
         mgr = NetworkManager(self.client)
-        global_ip_id = mgr.resolve_global_ip_ids(args.get('<identifier>'))
+        global_ip_id = resolve_id(mgr.resolve_global_ip_ids,
+                                  args.get('<identifier>'),
+                                  name='global ip')(args.get('<identifier>'))
 
         if args['--really'] or no_going_back(global_ip_id):
             mgr.cancel_global_ip(global_ip_id)
@@ -172,8 +175,9 @@ class GlobalIpUnassign(CLIRunnable):
 
     def execute(self, args):
         mgr = NetworkManager(self.client)
-
-        global_ip_id = mgr.resolve_global_ip_ids(args.get('<identifier>'))
+        global_ip_id = resolve_id(mgr.resolve_global_ip_ids,
+                                  args.get('<identifier>'),
+                                  name='global ip')
         if not global_ip_id:
             raise CLIAbort("Unable to find global IP record for " +
                            args['<identifier>'])
diff --git a/SoftLayer/CLI/modules/subnet.py b/SoftLayer/CLI/modules/subnet.py
@@ -15,7 +15,8 @@
 
 from SoftLayer import NetworkManager
 from SoftLayer.CLI import (
-    CLIRunnable, Table, KeyValueTable, FormattedItem, confirm, no_going_back)
+    CLIRunnable, Table, KeyValueTable, FormattedItem, confirm, no_going_back,
+    resolve_id)
 from SoftLayer.CLI.helpers import CLIAbort, SequentialOutput
 
 
@@ -31,7 +32,9 @@ class SubnetCancel(CLIRunnable):
 
     def execute(self, args):
         mgr = NetworkManager(self.client)
-        subnet_id = mgr.resolve_subnet_ids(args.get('<identifier>'))
+        subnet_id = resolve_id(mgr.resolve_subnet_ids,
+                               args.get('<identifier>'),
+                               name='subnet')
 
         if args['--really'] or no_going_back(subnet_id):
             mgr.cancel_subnet(subnet_id)
@@ -122,8 +125,9 @@ class SubnetDetail(CLIRunnable):
 
     def execute(self, args):
         mgr = NetworkManager(self.client)
-
-        subnet_id = mgr.resolve_subnet_ids(args.get('<identifier>'))
+        subnet_id = resolve_id(mgr.resolve_subnet_ids,
+                               args.get('<identifier>'),
+                               name='subnet')
         subnet = mgr.get_subnet(subnet_id)
 
         t = KeyValueTable(['Name', 'Value'])
