Renames vlan_name argument to just name with list_vlans()

sudorandom · sudorandom · commit 4f88b2b053b3 · 2014-01-20T14:54:15.000-06:00
diff --git a/SoftLayer/CLI/modules/vlan.py b/SoftLayer/CLI/modules/vlan.py
@@ -119,7 +119,7 @@ def execute(self, args):
         vlans = mgr.list_vlans(
             datacenter=args.get('--datacenter'),
             vlan_number=args.get('--number'),
-            vlan_name=args.get('--name'),
+            name=args.get('--name'),
         )
         for vlan in vlans:
             t.add_row([
diff --git a/SoftLayer/managers/network.py b/SoftLayer/managers/network.py
@@ -256,7 +256,7 @@ def list_subnets(self, identifier=None, datacenter=None, version=0,
 
         return self.account.getSubnets(**kwargs)
 
-    def list_vlans(self, datacenter=None, vlan_number=None, vlan_name=None,
+    def list_vlans(self, datacenter=None, vlan_number=None, name=None,
                    **kwargs):
         """ Display a list of all VLANs on the account.
 
@@ -267,7 +267,7 @@ def list_vlans(self, datacenter=None, vlan_number=None, vlan_name=None,
                                     VLANs in the specified data center.
         :param int vlan_number: If specified, the list will only contain the
                                   VLAN matching this VLAN number.
-        :param int vlan_name: If specified, the list will only contain the
+        :param int name: If specified, the list will only contain the
                                   VLAN matching this VLAN name.
         :param dict \*\*kwargs: response-level arguments (limit, offset, etc.)
 
@@ -277,8 +277,8 @@ def list_vlans(self, datacenter=None, vlan_number=None, vlan_name=None,
         if vlan_number:
             _filter['networkVlans']['vlanNumber'] = query_filter(vlan_number)
 
-        if vlan_name:
-            _filter['networkVlans']['name'] = query_filter(vlan_name)
+        if name:
+            _filter['networkVlans']['name'] = query_filter(name)
 
         if datacenter:
             _filter['networkVlans']['primaryRouter']['datacenter']['name'] = \
@@ -385,7 +385,7 @@ def _list_subnets_by_identifier(self, identifier):
         return [result['id'] for result in results]
 
     def _list_vlans_by_name(self, name):
-        results = self.list_vlans(vlan_name=name, mask='id')
+        results = self.list_vlans(name=name, mask='id')
         return [result['id'] for result in results]
 
     def _get_subnet_mask(self):
diff --git a/SoftLayer/tests/managers/network_tests.py b/SoftLayer/tests/managers/network_tests.py
@@ -237,7 +237,7 @@ def test_list_vlans_with_filters(self):
         self.network.list_vlans(
             vlan_number=5,
             datacenter='dal00',
-            vlan_name='primary-vlan',
+            name='primary-vlan',
         )
 
         service = self.client['Account']

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ def execute(self, args):`
`119`	`119`	`vlans = mgr.list_vlans(`
`120`	`120`	`datacenter=args.get('--datacenter'),`
`121`	`121`	`vlan_number=args.get('--number'),`
`122`		`- vlan_name=args.get('--name'),`
	`122`	`+ name=args.get('--name'),`
`123`	`123`	`)`
`124`	`124`	`for vlan in vlans:`
`125`	`125`	`t.add_row([`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ def test_list_vlans_with_filters(self):`
`237`	`237`	`self.network.list_vlans(`
`238`	`238`	`vlan_number=5,`
`239`	`239`	`datacenter='dal00',`
`240`		`- vlan_name='primary-vlan',`
	`240`	`+ name='primary-vlan',`
`241`	`241`	`)`
`242`	`242`
`243`	`243`	`service = self.client['Account']`