Merge with master

Author: edsonarios

SoftLayer/CLI/subnet/detail.py

@@ -38,7 +38,7 @@ def cli(env, identifier, no_vs, no_hardware):
     table.add_row(['identifier',
                    '%s/%s' % (subnet['networkIdentifier'],
                               str(subnet['cidr']))])
-    table.add_row(['subnet type', subnet['subnetType']])
+    table.add_row(['subnet type', subnet.get('subnetType', formatting.blank())])
     table.add_row(['network space',
                    utils.lookup(subnet, 'networkVlan', 'networkSpace')])
     table.add_row(['gateway', subnet.get('gateway', formatting.blank())])

SoftLayer/managers/network.py

@@ -698,7 +698,7 @@ def _list_subnets_by_identifier(self, identifier):
         """
         identifier = identifier.split('/', 1)[0]
 
-        results = self.list_subnets(identifier=identifier, mask='id')
+        results = self.list_subnets()
         return [result['id'] for result in results]
 
     def _list_vlans_by_name(self, name):

tests/CLI/modules/account_tests.py

@@ -71,8 +71,9 @@ def test_invoice_detail_csv_output_format(self):
         result_output = result.output.replace('\r', '').split('\n')
         self.assert_no_fail(result)
         self.assertEqual(result_output[0], 'Item Id,Category,Description,Single,Monthly,Create Date,Location')
-        self.assertEqual(result_output[1], '724951323,Private (only) Secondary VLAN IP Addresses,64 Portable Private'
-                                           ' IP Addresses (bleg.beh.com),$0.00,$0.00,2018-04-04,fra02')
+        self.assertEqual(result_output[1], '724951323,Private (only) Secondary VLAN IP Addresses,'
+                                           '64 Portable Private IP Addresses (bleg.beh.com),'
+                                           '$0.00,$0.00,2018-04-04,fra02')
 
     # slcli account invoices
     def test_invoices(self):

tests/managers/network_tests.py

@@ -310,21 +310,13 @@ def test_list_global_ips_with_filter(self):
                                 filter=_filter)
 
     def test_list_subnets_default(self):
-        result = self.network.list_subnets()
-
-        self.assertEqual(result, fixtures.SoftLayer_Account.getSubnets)
-        self.assert_called_with('SoftLayer_Account', 'getSubnets',
-                                mask='mask[%s]' % network.DEFAULT_SUBNET_MASK)
-
-    def test_list_subnets_with_filters(self):
         result = self.network.list_subnets(
             identifier='10.0.0.1',
             datacenter='dal00',
             version=4,
             subnet_type='PRIMARY',
             network_space='PUBLIC',
         )
-
         self.assertEqual(result, fixtures.SoftLayer_Account.getSubnets)
         _filter = {
             'subnets': {
@@ -342,6 +334,14 @@ def test_list_subnets_with_filters(self):
                                 mask='mask[%s]' % network.DEFAULT_SUBNET_MASK,
                                 filter=_filter)
 
+    def test_list_subnets_with_filters(self):
+        result = self.network.list_subnets()
+
+        self.assertEqual(result, fixtures.SoftLayer_Account.getSubnets)
+
+        self.assert_called_with('SoftLayer_Account', 'getSubnets',
+                                mask='mask[%s]' % network.DEFAULT_SUBNET_MASK)
+
     def test_list_vlans_default(self):
         result = self.network.list_vlans()