diff options
Diffstat (limited to 'openstackclient/tests/functional/network')
28 files changed, 909 insertions, 925 deletions
diff --git a/openstackclient/tests/functional/network/v2/common.py b/openstackclient/tests/functional/network/v2/common.py index a9c5b830..afdf5d70 100644 --- a/openstackclient/tests/functional/network/v2/common.py +++ b/openstackclient/tests/functional/network/v2/common.py @@ -40,34 +40,43 @@ class NetworkTagTests(NetworkTests): # Network create with no options name1 = self._create_resource_and_tag_check('', []) # Network create with tags - name2 = self._create_resource_and_tag_check('--tag red --tag blue', - ['red', 'blue']) + name2 = self._create_resource_and_tag_check( + '--tag red --tag blue', ['red', 'blue'] + ) # Network create with no tag explicitly name3 = self._create_resource_and_tag_check('--no-tag', []) - self._set_resource_and_tag_check('set', name1, '--tag red --tag green', - ['red', 'green']) + self._set_resource_and_tag_check( + 'set', name1, '--tag red --tag green', ['red', 'green'] + ) - list_expected = ((name1, ['red', 'green']), - (name2, ['red', 'blue']), - (name3, [])) + list_expected = ( + (name1, ['red', 'green']), + (name2, ['red', 'blue']), + (name3, []), + ) self._list_tag_check(auth_project_id, list_expected) - self._set_resource_and_tag_check('set', name1, '--tag blue', - ['red', 'green', 'blue']) self._set_resource_and_tag_check( - 'set', name1, + 'set', name1, '--tag blue', ['red', 'green', 'blue'] + ) + self._set_resource_and_tag_check( + 'set', + name1, '--no-tag --tag yellow --tag orange --tag purple', - ['yellow', 'orange', 'purple']) - self._set_resource_and_tag_check('unset', name1, '--tag yellow', - ['orange', 'purple']) + ['yellow', 'orange', 'purple'], + ) + self._set_resource_and_tag_check( + 'unset', name1, '--tag yellow', ['orange', 'purple'] + ) self._set_resource_and_tag_check('unset', name1, '--all-tag', []) self._set_resource_and_tag_check('set', name2, '--no-tag', []) def _list_tag_check(self, project_id, expected): cmd_output = self.openstack( - '{} list --long --project {}'.format(self.base_command, - project_id), + '{} list --long --project {}'.format( + self.base_command, project_id + ), parse_output=True, ) for name, tags in expected: @@ -84,7 +93,8 @@ class NetworkTagTests(NetworkTests): name = uuid.uuid4().hex cmd_output = self._create_resource_for_tag_test(name, args) self.addCleanup( - self.openstack, '{} delete {}'.format(self.base_command, name)) + self.openstack, '{} delete {}'.format(self.base_command, name) + ) self.assertIsNotNone(cmd_output["id"]) self.assertEqual(set(expected), set(cmd_output['tags'])) return name diff --git a/openstackclient/tests/functional/network/v2/test_address_group.py b/openstackclient/tests/functional/network/v2/test_address_group.py index 17ab2362..e3fb2eae 100644 --- a/openstackclient/tests/functional/network/v2/test_address_group.py +++ b/openstackclient/tests/functional/network/v2/test_address_group.py @@ -30,8 +30,7 @@ class AddressGroupTests(common.NetworkTests): """Test create, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'address group create ' + - name1, + 'address group create ' + name1, parse_output=True, ) self.assertEqual( @@ -41,8 +40,7 @@ class AddressGroupTests(common.NetworkTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'address group create ' + - name2, + 'address group create ' + name2, parse_output=True, ) self.assertEqual( @@ -81,8 +79,7 @@ class AddressGroupTests(common.NetworkTests): name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'address group create ' + - name1, + 'address group create ' + name1, parse_output=True, ) self.addCleanup(self.openstack, 'address group delete ' + name1) @@ -93,9 +90,11 @@ class AddressGroupTests(common.NetworkTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'address group create ' + - '--project ' + demo_project_id + - ' ' + name2, + 'address group create ' + + '--project ' + + demo_project_id + + ' ' + + name2, parse_output=True, ) self.addCleanup(self.openstack, 'address group delete ' + name2) @@ -115,8 +114,7 @@ class AddressGroupTests(common.NetworkTests): # Test list --project cmd_output = self.openstack( - 'address group list ' + - '--project ' + demo_project_id, + 'address group list ' + '--project ' + demo_project_id, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -125,8 +123,7 @@ class AddressGroupTests(common.NetworkTests): # Test list --name cmd_output = self.openstack( - 'address group list ' + - '--name ' + name1, + 'address group list ' + '--name ' + name1, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -138,10 +135,10 @@ class AddressGroupTests(common.NetworkTests): name = uuid.uuid4().hex newname = name + "_" cmd_output = self.openstack( - 'address group create ' + - '--description aaaa ' + - '--address 10.0.0.1 --address 2001::/16 ' + - name, + 'address group create ' + + '--description aaaa ' + + '--address 10.0.0.1 --address 2001::/16 ' + + name, parse_output=True, ) self.addCleanup(self.openstack, 'address group delete ' + newname) @@ -151,18 +148,19 @@ class AddressGroupTests(common.NetworkTests): # Test set name, description and address raw_output = self.openstack( - 'address group set ' + - '--name ' + newname + ' ' + - '--description bbbb ' + - '--address 10.0.0.2 --address 192.0.0.0/8 ' + - name, + 'address group set ' + + '--name ' + + newname + + ' ' + + '--description bbbb ' + + '--address 10.0.0.2 --address 192.0.0.0/8 ' + + name, ) self.assertOutput('', raw_output) # Show the updated address group cmd_output = self.openstack( - 'address group show ' + - newname, + 'address group show ' + newname, parse_output=True, ) self.assertEqual(newname, cmd_output['name']) @@ -171,16 +169,15 @@ class AddressGroupTests(common.NetworkTests): # Test unset address raw_output = self.openstack( - 'address group unset ' + - '--address 10.0.0.1 --address 2001::/16 ' + - '--address 10.0.0.2 --address 192.0.0.0/8 ' + - newname, + 'address group unset ' + + '--address 10.0.0.1 --address 2001::/16 ' + + '--address 10.0.0.2 --address 192.0.0.0/8 ' + + newname, ) self.assertEqual('', raw_output) cmd_output = self.openstack( - 'address group show ' + - newname, + 'address group show ' + newname, parse_output=True, ) self.assertEqual(0, len(cmd_output['addresses'])) diff --git a/openstackclient/tests/functional/network/v2/test_address_scope.py b/openstackclient/tests/functional/network/v2/test_address_scope.py index 8ebb9522..48957a7e 100644 --- a/openstackclient/tests/functional/network/v2/test_address_scope.py +++ b/openstackclient/tests/functional/network/v2/test_address_scope.py @@ -33,8 +33,7 @@ class AddressScopeTests(common.NetworkTests): """Test create, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'address scope create ' + - name1, + 'address scope create ' + name1, parse_output=True, ) self.assertEqual( @@ -46,8 +45,7 @@ class AddressScopeTests(common.NetworkTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'address scope create ' + - name2, + 'address scope create ' + name2, parse_output=True, ) self.assertEqual( @@ -64,10 +62,7 @@ class AddressScopeTests(common.NetworkTests): """Test create defaults, list filters, delete""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'address scope create ' + - '--ip-version 4 ' + - '--share ' + - name1, + 'address scope create ' + '--ip-version 4 ' + '--share ' + name1, parse_output=True, ) self.addCleanup(self.openstack, 'address scope delete ' + name1) @@ -83,10 +78,10 @@ class AddressScopeTests(common.NetworkTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'address scope create ' + - '--ip-version 6 ' + - '--no-share ' + - name2, + 'address scope create ' + + '--ip-version 6 ' + + '--no-share ' + + name2, parse_output=True, ) self.addCleanup(self.openstack, 'address scope delete ' + name2) @@ -132,10 +127,7 @@ class AddressScopeTests(common.NetworkTests): name = uuid.uuid4().hex newname = name + "_" cmd_output = self.openstack( - 'address scope create ' + - '--ip-version 4 ' + - '--no-share ' + - name, + 'address scope create ' + '--ip-version 4 ' + '--no-share ' + name, parse_output=True, ) self.addCleanup(self.openstack, 'address scope delete ' + newname) @@ -150,16 +142,12 @@ class AddressScopeTests(common.NetworkTests): self.assertFalse(cmd_output['shared']) raw_output = self.openstack( - 'address scope set ' + - '--name ' + newname + - ' --share ' + - name, + 'address scope set ' + '--name ' + newname + ' --share ' + name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'address scope show ' + - newname, + 'address scope show ' + newname, parse_output=True, ) self.assertEqual( diff --git a/openstackclient/tests/functional/network/v2/test_floating_ip.py b/openstackclient/tests/functional/network/v2/test_floating_ip.py index 871cab2d..9f298250 100644 --- a/openstackclient/tests/functional/network/v2/test_floating_ip.py +++ b/openstackclient/tests/functional/network/v2/test_floating_ip.py @@ -29,17 +29,14 @@ class FloatingIpTests(common.NetworkTests): # Create a network for the floating ip json_output = cls.openstack( - 'network create ' + - '--external ' + - cls.EXTERNAL_NETWORK_NAME, + 'network create ' + '--external ' + cls.EXTERNAL_NETWORK_NAME, parse_output=True, ) cls.external_network_id = json_output["id"] # Create a private network for the port json_output = cls.openstack( - 'network create ' + - cls.PRIVATE_NETWORK_NAME, + 'network create ' + cls.PRIVATE_NETWORK_NAME, parse_output=True, ) cls.private_network_id = json_output["id"] @@ -49,9 +46,10 @@ class FloatingIpTests(common.NetworkTests): try: if cls.haz_network: del_output = cls.openstack( - 'network delete ' + - cls.EXTERNAL_NETWORK_NAME + ' ' + - cls.PRIVATE_NETWORK_NAME + 'network delete ' + + cls.EXTERNAL_NETWORK_NAME + + ' ' + + cls.PRIVATE_NETWORK_NAME ) cls.assertOutput('', del_output) finally: @@ -76,23 +74,27 @@ class FloatingIpTests(common.NetworkTests): # try 4 times for i in range(4): # Make a random subnet - subnet = ".".join(map( - str, - (random.randint(0, 223) for _ in range(3)) - )) + ".0/26" + subnet = ( + ".".join(map(str, (random.randint(0, 223) for _ in range(3)))) + + ".0/26" + ) try: # Create a subnet for the network json_output = self.openstack( - 'subnet create ' + - '--network ' + network_name + ' ' + - '--subnet-range ' + subnet + ' ' + - subnet_name, + 'subnet create ' + + '--network ' + + network_name + + ' ' + + '--subnet-range ' + + subnet + + ' ' + + subnet_name, parse_output=True, ) self.assertIsNotNone(json_output["id"]) subnet_id = json_output["id"] except Exception: - if (i == 3): + if i == 3: # raise the exception at the last time raise pass @@ -106,15 +108,14 @@ class FloatingIpTests(common.NetworkTests): # Subnets must exist even if not directly referenced here ext_subnet_id = self._create_subnet( - self.EXTERNAL_NETWORK_NAME, - "ext-test-delete" + self.EXTERNAL_NETWORK_NAME, "ext-test-delete" ) self.addCleanup(self.openstack, 'subnet delete ' + ext_subnet_id) json_output = self.openstack( - 'floating ip create ' + - '--description aaaa ' + - self.EXTERNAL_NETWORK_NAME, + 'floating ip create ' + + '--description aaaa ' + + self.EXTERNAL_NETWORK_NAME, parse_output=True, ) self.assertIsNotNone(json_output["id"]) @@ -125,9 +126,9 @@ class FloatingIpTests(common.NetworkTests): ) json_output = self.openstack( - 'floating ip create ' + - '--description bbbb ' + - self.EXTERNAL_NETWORK_NAME, + 'floating ip create ' + + '--description bbbb ' + + self.EXTERNAL_NETWORK_NAME, parse_output=True, ) self.assertIsNotNone(json_output["id"]) @@ -148,15 +149,14 @@ class FloatingIpTests(common.NetworkTests): # Subnets must exist even if not directly referenced here ext_subnet_id = self._create_subnet( - self.EXTERNAL_NETWORK_NAME, - "ext-test-delete" + self.EXTERNAL_NETWORK_NAME, "ext-test-delete" ) self.addCleanup(self.openstack, 'subnet delete ' + ext_subnet_id) json_output = self.openstack( - 'floating ip create ' + - '--description aaaa ' + - self.EXTERNAL_NETWORK_NAME, + 'floating ip create ' + + '--description aaaa ' + + self.EXTERNAL_NETWORK_NAME, parse_output=True, ) self.assertIsNotNone(json_output["id"]) @@ -170,9 +170,9 @@ class FloatingIpTests(common.NetworkTests): fip1 = json_output["floating_ip_address"] json_output = self.openstack( - 'floating ip create ' + - '--description bbbb ' + - self.EXTERNAL_NETWORK_NAME, + 'floating ip create ' + + '--description bbbb ' + + self.EXTERNAL_NETWORK_NAME, parse_output=True, ) self.assertIsNotNone(json_output["id"]) @@ -191,8 +191,8 @@ class FloatingIpTests(common.NetworkTests): parse_output=True, ) fip_map = { - item.get('ID'): - item.get('Floating IP Address') for item in json_output + item.get('ID'): item.get('Floating IP Address') + for item in json_output } # self.assertEqual(item_map, json_output) self.assertIn(ip1, fip_map.keys()) @@ -202,13 +202,12 @@ class FloatingIpTests(common.NetworkTests): # Test list --long json_output = self.openstack( - 'floating ip list ' + - '--long', + 'floating ip list ' + '--long', parse_output=True, ) fip_map = { - item.get('ID'): - item.get('Floating IP Address') for item in json_output + item.get('ID'): item.get('Floating IP Address') + for item in json_output } self.assertIn(ip1, fip_map.keys()) self.assertIn(ip2, fip_map.keys()) @@ -223,8 +222,7 @@ class FloatingIpTests(common.NetworkTests): # TODO(dtroyer): add more filter tests json_output = self.openstack( - 'floating ip show ' + - ip1, + 'floating ip show ' + ip1, parse_output=True, ) self.assertIsNotNone(json_output["id"]) @@ -247,13 +245,11 @@ class FloatingIpTests(common.NetworkTests): # Subnets must exist even if not directly referenced here ext_subnet_id = self._create_subnet( - self.EXTERNAL_NETWORK_NAME, - "ext-test-delete" + self.EXTERNAL_NETWORK_NAME, "ext-test-delete" ) self.addCleanup(self.openstack, 'subnet delete ' + ext_subnet_id) priv_subnet_id = self._create_subnet( - self.PRIVATE_NETWORK_NAME, - "priv-test-delete" + self.PRIVATE_NETWORK_NAME, "priv-test-delete" ) self.addCleanup(self.openstack, 'subnet delete ' + priv_subnet_id) @@ -261,9 +257,9 @@ class FloatingIpTests(common.NetworkTests): self.PORT_NAME = uuid.uuid4().hex json_output = self.openstack( - 'floating ip create ' + - '--description aaaa ' + - self.EXTERNAL_NETWORK_NAME, + 'floating ip create ' + + '--description aaaa ' + + self.EXTERNAL_NETWORK_NAME, parse_output=True, ) self.assertIsNotNone(json_output["id"]) @@ -275,33 +271,34 @@ class FloatingIpTests(common.NetworkTests): ) json_output = self.openstack( - 'port create ' + - '--network ' + self.PRIVATE_NETWORK_NAME + ' ' + - '--fixed-ip subnet=' + priv_subnet_id + ' ' + - self.PORT_NAME, + 'port create ' + + '--network ' + + self.PRIVATE_NETWORK_NAME + + ' ' + + '--fixed-ip subnet=' + + priv_subnet_id + + ' ' + + self.PORT_NAME, parse_output=True, ) self.assertIsNotNone(json_output["id"]) port_id = json_output["id"] json_output = self.openstack( - 'router create ' + - self.ROUTER, + 'router create ' + self.ROUTER, parse_output=True, ) self.assertIsNotNone(json_output["id"]) self.addCleanup(self.openstack, 'router delete ' + self.ROUTER) - self.openstack( - 'router add port ' + - self.ROUTER + ' ' + - port_id - ) + self.openstack('router add port ' + self.ROUTER + ' ' + port_id) self.openstack( - 'router set ' + - '--external-gateway ' + self.EXTERNAL_NETWORK_NAME + ' ' + - self.ROUTER + 'router set ' + + '--external-gateway ' + + self.EXTERNAL_NETWORK_NAME + + ' ' + + self.ROUTER ) self.addCleanup( self.openstack, @@ -312,19 +309,14 @@ class FloatingIpTests(common.NetworkTests): 'router remove port ' + self.ROUTER + ' ' + port_id, ) - self.openstack( - 'floating ip set ' + - '--port ' + port_id + ' ' + - ip1 - ) + self.openstack('floating ip set ' + '--port ' + port_id + ' ' + ip1) self.addCleanup( self.openstack, 'floating ip unset --port ' + ip1, ) json_output = self.openstack( - 'floating ip show ' + - ip1, + 'floating ip show ' + ip1, parse_output=True, ) diff --git a/openstackclient/tests/functional/network/v2/test_ip_availability.py b/openstackclient/tests/functional/network/v2/test_ip_availability.py index 6697ed36..643f0355 100644 --- a/openstackclient/tests/functional/network/v2/test_ip_availability.py +++ b/openstackclient/tests/functional/network/v2/test_ip_availability.py @@ -26,15 +26,14 @@ class IPAvailabilityTests(common.NetworkTests): cls.NETWORK_NAME = uuid.uuid4().hex # Create a network for the subnet - cls.openstack( - 'network create ' + - cls.NETWORK_NAME - ) + cls.openstack('network create ' + cls.NETWORK_NAME) cmd_output = cls.openstack( - 'subnet create ' + - '--network ' + cls.NETWORK_NAME + ' ' + - '--subnet-range 10.10.10.0/24 ' + - cls.NAME, + 'subnet create ' + + '--network ' + + cls.NETWORK_NAME + + ' ' + + '--subnet-range 10.10.10.0/24 ' + + cls.NAME, parse_output=True, ) cls.assertOutput(cls.NAME, cmd_output['name']) @@ -43,13 +42,9 @@ class IPAvailabilityTests(common.NetworkTests): def tearDownClass(cls): try: if cls.haz_network: - raw_subnet = cls.openstack( - 'subnet delete ' + - cls.NAME - ) + raw_subnet = cls.openstack('subnet delete ' + cls.NAME) raw_network = cls.openstack( - 'network delete ' + - cls.NETWORK_NAME + 'network delete ' + cls.NETWORK_NAME ) cls.assertOutput('', raw_subnet) cls.assertOutput('', raw_network) @@ -66,7 +61,8 @@ class IPAvailabilityTests(common.NetworkTests): """Test ip availability list""" cmd_output = self.openstack( 'ip availability list', - parse_output=True,) + parse_output=True, + ) names = [x['Network Name'] for x in cmd_output] self.assertIn(self.NETWORK_NAME, names) @@ -74,7 +70,8 @@ class IPAvailabilityTests(common.NetworkTests): """Test ip availability show""" cmd_output = self.openstack( 'ip availability show ' + self.NETWORK_NAME, - parse_output=True,) + parse_output=True, + ) self.assertEqual( self.NETWORK_NAME, cmd_output['network_name'], diff --git a/openstackclient/tests/functional/network/v2/test_l3_conntrack_helper.py b/openstackclient/tests/functional/network/v2/test_l3_conntrack_helper.py index 2563bcf9..f899b041 100644 --- a/openstackclient/tests/functional/network/v2/test_l3_conntrack_helper.py +++ b/openstackclient/tests/functional/network/v2/test_l3_conntrack_helper.py @@ -17,7 +17,6 @@ from openstackclient.tests.functional.network.v2 import common class L3ConntrackHelperTests(common.NetworkTests): - def setUp(self): super(L3ConntrackHelperTests, self).setUp() # Nothing in this class works with Nova Network @@ -45,7 +44,8 @@ class L3ConntrackHelperTests(common.NetworkTests): output = self.openstack( 'network l3 conntrack helper create %(router)s ' '--helper %(helper)s --protocol %(protocol)s ' - '--port %(port)s ' % { + '--port %(port)s ' + % { 'router': router_id, 'helper': helper['helper'], 'protocol': helper['protocol'], @@ -63,15 +63,8 @@ class L3ConntrackHelperTests(common.NetworkTests): """Test create, delete multiple""" helpers = [ - { - 'helper': 'tftp', - 'protocol': 'udp', - 'port': 69 - }, { - 'helper': 'ftp', - 'protocol': 'tcp', - 'port': 21 - } + {'helper': 'tftp', 'protocol': 'udp', 'port': 69}, + {'helper': 'ftp', 'protocol': 'tcp', 'port': 21}, ] router_id = self._create_router() created_helpers = self._create_helpers(router_id, helpers) @@ -79,32 +72,18 @@ class L3ConntrackHelperTests(common.NetworkTests): raw_output = self.openstack( '--debug network l3 conntrack helper delete %(router)s ' - '%(ct_ids)s' % { - 'router': router_id, 'ct_ids': ct_ids}) + '%(ct_ids)s' % {'router': router_id, 'ct_ids': ct_ids} + ) self.assertOutput('', raw_output) def test_l3_conntrack_helper_list(self): helpers = [ - { - 'helper': 'tftp', - 'protocol': 'udp', - 'port': 69 - }, { - 'helper': 'ftp', - 'protocol': 'tcp', - 'port': 21 - } + {'helper': 'tftp', 'protocol': 'udp', 'port': 69}, + {'helper': 'ftp', 'protocol': 'tcp', 'port': 21}, ] expected_helpers = [ - { - 'Helper': 'tftp', - 'Protocol': 'udp', - 'Port': 69 - }, { - 'Helper': 'ftp', - 'Protocol': 'tcp', - 'Port': 21 - } + {'Helper': 'tftp', 'Protocol': 'udp', 'Port': 69}, + {'Helper': 'ftp', 'Protocol': 'tcp', 'Port': 21}, ] router_id = self._create_router() self._create_helpers(router_id, helpers) @@ -118,15 +97,13 @@ class L3ConntrackHelperTests(common.NetworkTests): self.assertIn(ct, expected_helpers) def test_l3_conntrack_helper_set_and_show(self): - helper = { - 'helper': 'tftp', - 'protocol': 'udp', - 'port': 69} + helper = {'helper': 'tftp', 'protocol': 'udp', 'port': 69} router_id = self._create_router() created_helper = self._create_helpers(router_id, [helper])[0] output = self.openstack( 'network l3 conntrack helper show %(router_id)s %(ct_id)s ' - '-f json' % { + '-f json' + % { 'router_id': router_id, 'ct_id': created_helper['id'], }, @@ -138,15 +115,19 @@ class L3ConntrackHelperTests(common.NetworkTests): raw_output = self.openstack( 'network l3 conntrack helper set %(router_id)s %(ct_id)s ' - '--port %(port)s ' % { + '--port %(port)s ' + % { 'router_id': router_id, 'ct_id': created_helper['id'], - 'port': helper['port'] + 1}) + 'port': helper['port'] + 1, + } + ) self.assertOutput('', raw_output) output = self.openstack( 'network l3 conntrack helper show %(router_id)s %(ct_id)s ' - '-f json' % { + '-f json' + % { 'router_id': router_id, 'ct_id': created_helper['id'], }, diff --git a/openstackclient/tests/functional/network/v2/test_local_ip.py b/openstackclient/tests/functional/network/v2/test_local_ip.py index b5672b6d..921dd13d 100644 --- a/openstackclient/tests/functional/network/v2/test_local_ip.py +++ b/openstackclient/tests/functional/network/v2/test_local_ip.py @@ -32,8 +32,7 @@ class LocalIPTests(common.NetworkTests): """Test create, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'local ip create ' + - name1, + 'local ip create ' + name1, parse_output=True, ) self.assertEqual( @@ -43,8 +42,7 @@ class LocalIPTests(common.NetworkTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'local ip create ' + - name2, + 'local ip create ' + name2, parse_output=True, ) self.assertEqual( @@ -83,8 +81,7 @@ class LocalIPTests(common.NetworkTests): name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'local ip create ' + - name1, + 'local ip create ' + name1, parse_output=True, ) self.addCleanup(self.openstack, 'local ip delete ' + name1) @@ -95,9 +92,7 @@ class LocalIPTests(common.NetworkTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'local ip create ' + - '--project ' + demo_project_id + - ' ' + name2, + 'local ip create ' + '--project ' + demo_project_id + ' ' + name2, parse_output=True, ) self.addCleanup(self.openstack, 'local ip delete ' + name2) @@ -117,8 +112,7 @@ class LocalIPTests(common.NetworkTests): # Test list --project cmd_output = self.openstack( - 'local ip list ' + - '--project ' + demo_project_id, + 'local ip list ' + '--project ' + demo_project_id, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -127,8 +121,7 @@ class LocalIPTests(common.NetworkTests): # Test list --name cmd_output = self.openstack( - 'local ip list ' + - '--name ' + name1, + 'local ip list ' + '--name ' + name1, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -140,9 +133,7 @@ class LocalIPTests(common.NetworkTests): name = uuid.uuid4().hex newname = name + "_" cmd_output = self.openstack( - 'local ip create ' + - '--description aaaa ' + - name, + 'local ip create ' + '--description aaaa ' + name, parse_output=True, ) self.addCleanup(self.openstack, 'local ip delete ' + newname) @@ -151,17 +142,18 @@ class LocalIPTests(common.NetworkTests): # Test set name and description raw_output = self.openstack( - 'local ip set ' + - '--name ' + newname + ' ' + - '--description bbbb ' + - name, + 'local ip set ' + + '--name ' + + newname + + ' ' + + '--description bbbb ' + + name, ) self.assertOutput('', raw_output) # Show the updated local ip cmd_output = self.openstack( - 'local ip show ' + - newname, + 'local ip show ' + newname, parse_output=True, ) self.assertEqual(newname, cmd_output['name']) diff --git a/openstackclient/tests/functional/network/v2/test_network.py b/openstackclient/tests/functional/network/v2/test_network.py index 20be2d1a..16886b62 100644 --- a/openstackclient/tests/functional/network/v2/test_network.py +++ b/openstackclient/tests/functional/network/v2/test_network.py @@ -34,9 +34,7 @@ class NetworkTests(common.NetworkTagTests): # Network create with minimum options name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'network create ' + - '--subnet 1.2.3.4/28 ' + - name1, + 'network create ' + '--subnet 1.2.3.4/28 ' + name1, parse_output=True, ) self.addCleanup(self.openstack, 'network delete ' + name1) @@ -54,10 +52,7 @@ class NetworkTests(common.NetworkTagTests): # Network create with more options name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'network create ' + - '--subnet 1.2.4.4/28 ' + - '--share ' + - name2, + 'network create ' + '--subnet 1.2.4.4/28 ' + '--share ' + name2, parse_output=True, ) self.addCleanup(self.openstack, 'network delete ' + name2) @@ -105,8 +100,7 @@ class NetworkTests(common.NetworkTagTests): # Network create with no options name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'network create ' + - name1, + 'network create ' + name1, parse_output=True, ) self.addCleanup(self.openstack, 'network delete ' + name1) @@ -136,9 +130,7 @@ class NetworkTests(common.NetworkTagTests): # Network create with options name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'network create ' + - '--project demo ' + - name2, + 'network create ' + '--project demo ' + name2, parse_output=True, ) self.addCleanup(self.openstack, 'network delete ' + name2) @@ -159,9 +151,7 @@ class NetworkTests(common.NetworkTagTests): name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'network create ' + - '--subnet 9.8.7.6/28 ' + - name1, + 'network create ' + '--subnet 9.8.7.6/28 ' + name1, parse_output=True, ) self.assertIsNotNone(cmd_output["id"]) @@ -172,9 +162,7 @@ class NetworkTests(common.NetworkTagTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'network create ' + - '--subnet 8.7.6.5/28 ' + - name2, + 'network create ' + '--subnet 8.7.6.5/28 ' + name2, parse_output=True, ) self.assertIsNotNone(cmd_output["id"]) @@ -190,9 +178,7 @@ class NetworkTests(common.NetworkTagTests): name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'network create ' + - '--description aaaa ' + - name1, + 'network create ' + '--description aaaa ' + name1, parse_output=True, ) self.assertIsNotNone(cmd_output["id"]) @@ -203,9 +189,7 @@ class NetworkTests(common.NetworkTagTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'network create ' + - '--description bbbb ' + - name2, + 'network create ' + '--description bbbb ' + name2, parse_output=True, ) self.assertIsNotNone(cmd_output["id"]) @@ -225,9 +209,7 @@ class NetworkTests(common.NetworkTagTests): else: network_options = '--subnet 3.4.5.6/28 ' cmd_output = self.openstack( - 'network create ' + - network_options + - name1, + 'network create ' + network_options + name1, parse_output=True, ) self.addCleanup(self.openstack, 'network delete %s' % name1) @@ -248,9 +230,7 @@ class NetworkTests(common.NetworkTagTests): cmd_output["router:external"], ) self.assertFalse(cmd_output["is_default"]) - self.assertTrue( - cmd_output["port_security_enabled"] - ) + self.assertTrue(cmd_output["port_security_enabled"]) else: self.assertEqual( '3.4.5.0/28', @@ -263,8 +243,7 @@ class NetworkTests(common.NetworkTagTests): else: network_options = '--subnet 4.5.6.7/28 ' cmd_output = self.openstack( - 'network create --share %s%s' % - (network_options, name2), + 'network create --share %s%s' % (network_options, name2), parse_output=True, ) self.addCleanup(self.openstack, 'network delete ' + name2) @@ -385,15 +364,13 @@ class NetworkTests(common.NetworkTagTests): # Cleanup # Remove Agent from Network self.openstack( - 'network agent remove network --dhcp %s %s' % - (agent_id, network_id) + 'network agent remove network --dhcp %s %s' + % (agent_id, network_id) ) # Assert col_name = [x["ID"] for x in cmd_output3] - self.assertIn( - network_id, col_name - ) + self.assertIn(network_id, col_name) def test_network_set(self): """Tests create options, set, show, delete""" @@ -408,8 +385,7 @@ class NetworkTests(common.NetworkTagTests): '--no-share ' '--internal ' '--no-default ' - '--enable-port-security %s' % - name, + '--enable-port-security %s' % name, parse_output=True, ) self.addCleanup(self.openstack, 'network delete %s' % name) @@ -429,9 +405,7 @@ class NetworkTests(common.NetworkTagTests): ) self.assertFalse(cmd_output["is_default"]) - self.assertTrue( - cmd_output["port_security_enabled"] - ) + self.assertTrue(cmd_output["port_security_enabled"]) raw_output = self.openstack( 'network set ' @@ -439,8 +413,7 @@ class NetworkTests(common.NetworkTagTests): '--disable ' '--share ' '--external ' - '--disable-port-security %s' % - name + '--disable-port-security %s' % name ) self.assertOutput('', raw_output) @@ -463,6 +436,4 @@ class NetworkTests(common.NetworkTagTests): cmd_output["router:external"], ) self.assertFalse(cmd_output["is_default"]) - self.assertFalse( - cmd_output["port_security_enabled"] - ) + self.assertFalse(cmd_output["port_security_enabled"]) diff --git a/openstackclient/tests/functional/network/v2/test_network_agent.py b/openstackclient/tests/functional/network/v2/test_network_agent.py index d3e6353e..6ff2c0f0 100644 --- a/openstackclient/tests/functional/network/v2/test_network_agent.py +++ b/openstackclient/tests/functional/network/v2/test_network_agent.py @@ -120,8 +120,7 @@ class NetworkAgentListTests(common.NetworkTests): # Add Agent to Network self.openstack( - 'network agent add network --dhcp %s %s' % - (agent_id, network_id) + 'network agent add network --dhcp %s %s' % (agent_id, network_id) ) # Test network agent list --network @@ -133,15 +132,13 @@ class NetworkAgentListTests(common.NetworkTests): # Cleanup # Remove Agent from Network self.openstack( - 'network agent remove network --dhcp %s %s' % - (agent_id, network_id) + 'network agent remove network --dhcp %s %s' + % (agent_id, network_id) ) # Assert col_name = [x["ID"] for x in cmd_output3] - self.assertIn( - agent_id, col_name - ) + self.assertIn(agent_id, col_name) def test_network_agent_list_routers(self): """Add agent to router, list agents on router, delete.""" @@ -152,7 +149,8 @@ class NetworkAgentListTests(common.NetworkTests): name = uuid.uuid4().hex cmd_output = self.openstack( 'router create %s' % name, - parse_output=True,) + parse_output=True, + ) self.addCleanup(self.openstack, 'router delete %s' % name) # Get router ID @@ -160,7 +158,8 @@ class NetworkAgentListTests(common.NetworkTests): # Get l3 agent id cmd_output = self.openstack( 'network agent list --agent-type l3', - parse_output=True,) + parse_output=True, + ) # Check at least one L3 agent is included in the response. self.assertTrue(cmd_output) @@ -168,21 +167,25 @@ class NetworkAgentListTests(common.NetworkTests): # Add router to agent self.openstack( - 'network agent add router --l3 %s %s' % (agent_id, router_id)) + 'network agent add router --l3 %s %s' % (agent_id, router_id) + ) # Test router list --agent cmd_output = self.openstack( 'network agent list --router %s' % router_id, - parse_output=True,) + parse_output=True, + ) agent_ids = [x['ID'] for x in cmd_output] self.assertIn(agent_id, agent_ids) # Remove router from agent self.openstack( - 'network agent remove router --l3 %s %s' % (agent_id, router_id)) + 'network agent remove router --l3 %s %s' % (agent_id, router_id) + ) cmd_output = self.openstack( 'network agent list --router %s' % router_id, - parse_output=True,) + parse_output=True, + ) agent_ids = [x['ID'] for x in cmd_output] self.assertNotIn(agent_id, agent_ids) diff --git a/openstackclient/tests/functional/network/v2/test_network_flavor.py b/openstackclient/tests/functional/network/v2/test_network_flavor.py index 2ac0daef..13dc0d5c 100644 --- a/openstackclient/tests/functional/network/v2/test_network_flavor.py +++ b/openstackclient/tests/functional/network/v2/test_network_flavor.py @@ -43,14 +43,17 @@ class NetworkFlavorTests(common.NetworkTests): ) service_profile_id = cmd_output2.get('id') - self.addCleanup(self.openstack, 'network flavor delete %s' % - flavor_id) - self.addCleanup(self.openstack, 'network flavor profile delete %s' % - service_profile_id) + self.addCleanup(self.openstack, 'network flavor delete %s' % flavor_id) + self.addCleanup( + self.openstack, + 'network flavor profile delete %s' % service_profile_id, + ) # Add flavor to service profile self.openstack( - 'network flavor add profile ' + - flavor_id + ' ' + service_profile_id + 'network flavor add profile ' + + flavor_id + + ' ' + + service_profile_id ) cmd_output4 = self.openstack( @@ -65,8 +68,10 @@ class NetworkFlavorTests(common.NetworkTests): # Cleanup # Remove flavor from service profile self.openstack( - 'network flavor remove profile ' + - flavor_id + ' ' + service_profile_id + 'network flavor remove profile ' + + flavor_id + + ' ' + + service_profile_id ) cmd_output6 = self.openstack( @@ -112,7 +117,8 @@ class NetworkFlavorTests(common.NetworkTests): cmd_output['description'], ) raw_output = self.openstack( - 'network flavor delete ' + name1 + " " + name2) + 'network flavor delete ' + name1 + " " + name2 + ) self.assertOutput('', raw_output) def test_network_flavor_list(self): @@ -160,7 +166,8 @@ class NetworkFlavorTests(common.NetworkTests): # Test list cmd_output = self.openstack( 'network flavor list ', - parse_output=True,) + parse_output=True, + ) self.assertIsNotNone(cmd_output) name_list = [item.get('Name') for item in cmd_output] @@ -197,7 +204,8 @@ class NetworkFlavorTests(common.NetworkTests): cmd_output = self.openstack( 'network flavor show ' + newname, - parse_output=True,) + parse_output=True, + ) self.assertEqual( newname, cmd_output['name'], @@ -222,7 +230,8 @@ class NetworkFlavorTests(common.NetworkTests): self.addCleanup(self.openstack, "network flavor delete " + name) cmd_output = self.openstack( 'network flavor show ' + name, - parse_output=True,) + parse_output=True, + ) self.assertEqual( name, cmd_output['name'], diff --git a/openstackclient/tests/functional/network/v2/test_network_flavor_profile.py b/openstackclient/tests/functional/network/v2/test_network_flavor_profile.py index 60fd949b..c6f84f82 100644 --- a/openstackclient/tests/functional/network/v2/test_network_flavor_profile.py +++ b/openstackclient/tests/functional/network/v2/test_network_flavor_profile.py @@ -27,9 +27,12 @@ class NetworkFlavorProfileTests(common.NetworkTests): def test_network_flavor_profile_create(self): json_output = self.openstack( - 'network flavor profile create ' + - '--description ' + self.DESCRIPTION + ' ' + - '--enable --metainfo ' + self.METAINFO, + 'network flavor profile create ' + + '--description ' + + self.DESCRIPTION + + ' ' + + '--enable --metainfo ' + + self.METAINFO, parse_output=True, ) ID = json_output.get('id') @@ -50,10 +53,13 @@ class NetworkFlavorProfileTests(common.NetworkTests): def test_network_flavor_profile_list(self): json_output = self.openstack( - 'network flavor profile create ' + - '--description ' + self.DESCRIPTION + ' ' + - '--enable ' + - '--metainfo ' + self.METAINFO, + 'network flavor profile create ' + + '--description ' + + self.DESCRIPTION + + ' ' + + '--enable ' + + '--metainfo ' + + self.METAINFO, parse_output=True, ) ID1 = json_output.get('id') @@ -69,10 +75,13 @@ class NetworkFlavorProfileTests(common.NetworkTests): ) json_output = self.openstack( - 'network flavor profile create ' + - '--description ' + self.DESCRIPTION + ' ' + - '--disable ' + - '--metainfo ' + self.METAINFO, + 'network flavor profile create ' + + '--description ' + + self.DESCRIPTION + + ' ' + + '--disable ' + + '--metainfo ' + + self.METAINFO, parse_output=True, ) ID2 = json_output.get('id') @@ -106,10 +115,13 @@ class NetworkFlavorProfileTests(common.NetworkTests): def test_network_flavor_profile_set(self): json_output_1 = self.openstack( - 'network flavor profile create ' + - '--description ' + self.DESCRIPTION + ' ' + - '--enable ' + - '--metainfo ' + self.METAINFO, + 'network flavor profile create ' + + '--description ' + + self.DESCRIPTION + + ' ' + + '--enable ' + + '--metainfo ' + + self.METAINFO, parse_output=True, ) ID = json_output_1.get('id') @@ -146,10 +158,13 @@ class NetworkFlavorProfileTests(common.NetworkTests): def test_network_flavor_profile_show(self): json_output_1 = self.openstack( - 'network flavor profile create ' + - '--description ' + self.DESCRIPTION + ' ' + - '--enable ' + - '--metainfo ' + self.METAINFO, + 'network flavor profile create ' + + '--description ' + + self.DESCRIPTION + + ' ' + + '--enable ' + + '--metainfo ' + + self.METAINFO, parse_output=True, ) ID = json_output_1.get('id') diff --git a/openstackclient/tests/functional/network/v2/test_network_meter.py b/openstackclient/tests/functional/network/v2/test_network_meter.py index ea9d289f..aa00e25b 100644 --- a/openstackclient/tests/functional/network/v2/test_network_meter.py +++ b/openstackclient/tests/functional/network/v2/test_network_meter.py @@ -38,9 +38,11 @@ class TestMeter(common.NetworkTests): name2 = uuid.uuid4().hex description = 'fakedescription' json_output = self.openstack( - 'network meter create ' + - ' --description ' + description + ' ' + - name1, + 'network meter create ' + + ' --description ' + + description + + ' ' + + name1, parse_output=True, ) self.assertEqual( @@ -55,9 +57,11 @@ class TestMeter(common.NetworkTests): ) json_output_2 = self.openstack( - 'network meter create ' + - '--description ' + description + ' ' + - name2, + 'network meter create ' + + '--description ' + + description + + ' ' + + name2, parse_output=True, ) self.assertEqual( @@ -80,16 +84,13 @@ class TestMeter(common.NetworkTests): """Test create, list filters, delete""" name1 = uuid.uuid4().hex json_output = self.openstack( - 'network meter create ' + - '--description Test1 ' + - '--share ' + - name1, + 'network meter create ' + + '--description Test1 ' + + '--share ' + + name1, parse_output=True, ) - self.addCleanup( - self.openstack, - 'network meter delete ' + name1 - ) + self.addCleanup(self.openstack, 'network meter delete ' + name1) self.assertEqual( 'Test1', @@ -99,10 +100,10 @@ class TestMeter(common.NetworkTests): name2 = uuid.uuid4().hex json_output_2 = self.openstack( - 'network meter create ' + - '--description Test2 ' + - '--no-share ' + - name2, + 'network meter create ' + + '--description Test2 ' + + '--no-share ' + + name2, parse_output=True, ) self.addCleanup(self.openstack, 'network meter delete ' + name2) @@ -125,9 +126,11 @@ class TestMeter(common.NetworkTests): name1 = uuid.uuid4().hex description = 'fakedescription' json_output = self.openstack( - 'network meter create ' + - ' --description ' + description + ' ' + - name1, + 'network meter create ' + + ' --description ' + + description + + ' ' + + name1, parse_output=True, ) meter_id = json_output.get('id') diff --git a/openstackclient/tests/functional/network/v2/test_network_meter_rule.py b/openstackclient/tests/functional/network/v2/test_network_meter_rule.py index ae1bb904..40838855 100644 --- a/openstackclient/tests/functional/network/v2/test_network_meter_rule.py +++ b/openstackclient/tests/functional/network/v2/test_network_meter_rule.py @@ -31,8 +31,7 @@ class TestMeterRule(common.NetworkTests): cls.METER_NAME = uuid.uuid4().hex json_output = cls.openstack( - 'network meter create ' + - cls.METER_NAME, + 'network meter create ' + cls.METER_NAME, parse_output=True, ) cls.METER_ID = json_output.get('id') @@ -42,8 +41,7 @@ class TestMeterRule(common.NetworkTests): try: if cls.haz_network: raw_output = cls.openstack( - 'network meter delete ' + - cls.METER_ID + 'network meter delete ' + cls.METER_ID ) cls.assertOutput('', raw_output) finally: @@ -58,57 +56,44 @@ class TestMeterRule(common.NetworkTests): def test_meter_rule_delete(self): """test create, delete""" json_output = self.openstack( - 'network meter rule create ' + - '--remote-ip-prefix 10.0.0.0/8 ' + - self.METER_ID, + 'network meter rule create ' + + '--remote-ip-prefix 10.0.0.0/8 ' + + self.METER_ID, parse_output=True, ) rule_id = json_output.get('id') re_ip = json_output.get('remote_ip_prefix') - self.addCleanup( - self.openstack, - 'network meter rule delete ' + rule_id - ) + self.addCleanup(self.openstack, 'network meter rule delete ' + rule_id) self.assertIsNotNone(re_ip) self.assertIsNotNone(rule_id) - self.assertEqual( - '10.0.0.0/8', re_ip - ) + self.assertEqual('10.0.0.0/8', re_ip) def test_meter_rule_list(self): """Test create, list, delete""" json_output = self.openstack( - 'network meter rule create ' + - '--remote-ip-prefix 10.0.0.0/8 ' + - self.METER_ID, + 'network meter rule create ' + + '--remote-ip-prefix 10.0.0.0/8 ' + + self.METER_ID, parse_output=True, ) rule_id_1 = json_output.get('id') self.addCleanup( - self.openstack, - 'network meter rule delete ' + rule_id_1 - ) - self.assertEqual( - '10.0.0.0/8', - json_output.get('remote_ip_prefix') + self.openstack, 'network meter rule delete ' + rule_id_1 ) + self.assertEqual('10.0.0.0/8', json_output.get('remote_ip_prefix')) json_output_1 = self.openstack( - 'network meter rule create ' + - '--remote-ip-prefix 11.0.0.0/8 ' + - self.METER_ID, + 'network meter rule create ' + + '--remote-ip-prefix 11.0.0.0/8 ' + + self.METER_ID, parse_output=True, ) rule_id_2 = json_output_1.get('id') self.addCleanup( - self.openstack, - 'network meter rule delete ' + rule_id_2 - ) - self.assertEqual( - '11.0.0.0/8', - json_output_1.get('remote_ip_prefix') + self.openstack, 'network meter rule delete ' + rule_id_2 ) + self.assertEqual('11.0.0.0/8', json_output_1.get('remote_ip_prefix')) json_output = self.openstack( 'network meter rule list', @@ -124,30 +109,21 @@ class TestMeterRule(common.NetworkTests): def test_meter_rule_show(self): """Test create, show, delete""" json_output = self.openstack( - 'network meter rule create ' + - '--remote-ip-prefix 10.0.0.0/8 ' + - '--egress ' + - self.METER_ID, + 'network meter rule create ' + + '--remote-ip-prefix 10.0.0.0/8 ' + + '--egress ' + + self.METER_ID, parse_output=True, ) rule_id = json_output.get('id') - self.assertEqual( - 'egress', - json_output.get('direction') - ) + self.assertEqual('egress', json_output.get('direction')) json_output = self.openstack( 'network meter rule show ' + rule_id, parse_output=True, ) - self.assertEqual( - '10.0.0.0/8', - json_output.get('remote_ip_prefix') - ) + self.assertEqual('10.0.0.0/8', json_output.get('remote_ip_prefix')) self.assertIsNotNone(rule_id) - self.addCleanup( - self.openstack, - 'network meter rule delete ' + rule_id - ) + self.addCleanup(self.openstack, 'network meter rule delete ' + rule_id) diff --git a/openstackclient/tests/functional/network/v2/test_network_ndp_proxy.py b/openstackclient/tests/functional/network/v2/test_network_ndp_proxy.py index 588b1f56..62eecf86 100644 --- a/openstackclient/tests/functional/network/v2/test_network_ndp_proxy.py +++ b/openstackclient/tests/functional/network/v2/test_network_ndp_proxy.py @@ -14,7 +14,6 @@ from openstackclient.tests.functional.network.v2 import common class L3NDPProxyTests(common.NetworkTests): - def setUp(self): super().setUp() # Nothing in this class works with Nova Network @@ -43,7 +42,8 @@ class L3NDPProxyTests(common.NetworkTests): json_output = self.openstack( 'subnet pool create %(subnet_p_name)s ' '--address-scope %(address_scope)s ' - '--pool-prefix 2001:db8::/96 --default-prefix-length 112' % { + '--pool-prefix 2001:db8::/96 --default-prefix-length 112' + % { 'subnet_p_name': self.SUBNET_P_NAME, 'address_scope': self.ADDRESS_SCOPE_ID, }, @@ -59,7 +59,8 @@ class L3NDPProxyTests(common.NetworkTests): self.EXT_NET_ID = json_output['id'] json_output = self.openstack( 'subnet create --ip-version 6 --subnet-pool ' - '%(subnet_pool)s --network %(net_id)s %(sub_name)s' % { + '%(subnet_pool)s --network %(net_id)s %(sub_name)s' + % { 'subnet_pool': self.SUBNET_POOL_ID, 'net_id': self.EXT_NET_ID, 'sub_name': self.EXT_SUB_NAME, @@ -75,9 +76,9 @@ class L3NDPProxyTests(common.NetworkTests): self.assertIsNotNone(json_output['id']) self.ROT_ID = json_output['id'] output = self.openstack( - 'router set %(router_id)s --external-gateway %(net_id)s' % { - 'router_id': self.ROT_ID, - 'net_id': self.EXT_NET_ID}) + 'router set %(router_id)s --external-gateway %(net_id)s' + % {'router_id': self.ROT_ID, 'net_id': self.EXT_NET_ID} + ) self.assertEqual('', output) output = self.openstack('router set --enable-ndp-proxy ' + self.ROT_ID) self.assertEqual('', output) @@ -94,7 +95,8 @@ class L3NDPProxyTests(common.NetworkTests): self.INT_NET_ID = json_output['id'] json_output = self.openstack( 'subnet create --ip-version 6 --subnet-pool ' - '%(subnet_pool)s --network %(net_id)s %(sub_name)s' % { + '%(subnet_pool)s --network %(net_id)s %(sub_name)s' + % { 'subnet_pool': self.SUBNET_POOL_ID, 'net_id': self.INT_NET_ID, 'sub_name': self.INT_SUB_NAME, @@ -105,7 +107,8 @@ class L3NDPProxyTests(common.NetworkTests): self.INT_SUB_ID = json_output['id'] json_output = self.openstack( 'port create --network %(net_id)s ' - '%(port_name)s' % { + '%(port_name)s' + % { 'net_id': self.INT_NET_ID, 'port_name': self.INT_PORT_NAME, }, @@ -115,28 +118,33 @@ class L3NDPProxyTests(common.NetworkTests): self.INT_PORT_ID = json_output['id'] self.INT_PORT_ADDRESS = json_output['fixed_ips'][0]['ip_address'] output = self.openstack( - 'router add subnet ' + self.ROT_ID + ' ' + self.INT_SUB_ID) + 'router add subnet ' + self.ROT_ID + ' ' + self.INT_SUB_ID + ) self.assertEqual('', output) def tearDown(self): for ndp_proxy in self.created_ndp_proxies: output = self.openstack( - 'router ndp proxy delete ' + ndp_proxy['id']) + 'router ndp proxy delete ' + ndp_proxy['id'] + ) self.assertEqual('', output) output = self.openstack('port delete ' + self.INT_PORT_ID) self.assertEqual('', output) output = self.openstack( - 'router set --disable-ndp-proxy ' + self.ROT_ID) + 'router set --disable-ndp-proxy ' + self.ROT_ID + ) self.assertEqual('', output) output = self.openstack( - 'router remove subnet ' + self.ROT_ID + ' ' + self.INT_SUB_ID) + 'router remove subnet ' + self.ROT_ID + ' ' + self.INT_SUB_ID + ) self.assertEqual('', output) output = self.openstack('subnet delete ' + self.INT_SUB_ID) self.assertEqual('', output) output = self.openstack('network delete ' + self.INT_NET_ID) self.assertEqual('', output) output = self.openstack( - 'router unset ' + self.ROT_ID + ' ' + '--external-gateway') + 'router unset ' + self.ROT_ID + ' ' + '--external-gateway' + ) self.assertEqual('', output) output = self.openstack('router delete ' + self.ROT_ID) self.assertEqual('', output) @@ -146,8 +154,9 @@ class L3NDPProxyTests(common.NetworkTests): self.assertEqual('', output) output = self.openstack('subnet pool delete ' + self.SUBNET_POOL_ID) self.assertEqual('', output) - output = self.openstack('address scope delete ' + - self.ADDRESS_SCOPE_ID) + output = self.openstack( + 'address scope delete ' + self.ADDRESS_SCOPE_ID + ) self.assertEqual('', output) super().tearDown() @@ -155,7 +164,8 @@ class L3NDPProxyTests(common.NetworkTests): for ndp_proxy in ndp_proxies: output = self.openstack( 'router ndp proxy create %(router)s --name %(name)s ' - '--port %(port)s --ip-address %(address)s' % { + '--port %(port)s --ip-address %(address)s' + % { 'router': ndp_proxy['router_id'], 'name': ndp_proxy['name'], 'port': ndp_proxy['port_id'], @@ -174,7 +184,7 @@ class L3NDPProxyTests(common.NetworkTests): 'name': self.getUniqueString(), 'router_id': self.ROT_ID, 'port_id': self.INT_PORT_ID, - 'address': self.INT_PORT_ADDRESS + 'address': self.INT_PORT_ADDRESS, } ] self._create_ndp_proxies(ndp_proxies) @@ -184,11 +194,13 @@ class L3NDPProxyTests(common.NetworkTests): 'name': self.getUniqueString(), 'router_id': self.ROT_ID, 'port_id': self.INT_PORT_ID, - 'address': self.INT_PORT_ADDRESS} + 'address': self.INT_PORT_ADDRESS, + } self._create_ndp_proxies([ndp_proxies]) ndp_proxy = self.openstack( 'router ndp proxy list', - parse_output=True,)[0] + parse_output=True, + )[0] self.assertEqual(ndp_proxies['name'], ndp_proxy['Name']) self.assertEqual(ndp_proxies['router_id'], ndp_proxy['Router ID']) self.assertEqual(ndp_proxies['address'], ndp_proxy['IP Address']) @@ -198,13 +210,15 @@ class L3NDPProxyTests(common.NetworkTests): 'name': self.getUniqueString(), 'router_id': self.ROT_ID, 'port_id': self.INT_PORT_ID, - 'address': self.INT_PORT_ADDRESS} + 'address': self.INT_PORT_ADDRESS, + } description = 'balala' self._create_ndp_proxies([ndp_proxies]) ndp_proxy_id = self.created_ndp_proxies[0]['id'] output = self.openstack( - 'router ndp proxy set --description %s %s' % ( - description, ndp_proxy_id)) + 'router ndp proxy set --description %s %s' + % (description, ndp_proxy_id) + ) self.assertEqual('', output) json_output = self.openstack( 'router ndp proxy show ' + ndp_proxy_id, diff --git a/openstackclient/tests/functional/network/v2/test_network_qos_policy.py b/openstackclient/tests/functional/network/v2/test_network_qos_policy.py index b603cf1f..492f6a0a 100644 --- a/openstackclient/tests/functional/network/v2/test_network_qos_policy.py +++ b/openstackclient/tests/functional/network/v2/test_network_qos_policy.py @@ -31,21 +31,18 @@ class NetworkQosPolicyTests(common.NetworkTests): # This is to check the output of qos policy delete policy_name = uuid.uuid4().hex self.openstack('network qos policy create ' + policy_name) - raw_output = self.openstack( - 'network qos policy delete ' + - policy_name - ) + raw_output = self.openstack('network qos policy delete ' + policy_name) self.assertEqual('', raw_output) def test_qos_policy_list(self): policy_name = uuid.uuid4().hex json_output = self.openstack( - 'network qos policy create ' + - policy_name, + 'network qos policy create ' + policy_name, parse_output=True, ) - self.addCleanup(self.openstack, - 'network qos policy delete ' + policy_name) + self.addCleanup( + self.openstack, 'network qos policy delete ' + policy_name + ) self.assertEqual(policy_name, json_output['name']) json_output = self.openstack( @@ -57,36 +54,30 @@ class NetworkQosPolicyTests(common.NetworkTests): def test_qos_policy_set(self): policy_name = uuid.uuid4().hex json_output = self.openstack( - 'network qos policy create ' + - policy_name, + 'network qos policy create ' + policy_name, parse_output=True, ) - self.addCleanup(self.openstack, - 'network qos policy delete ' + policy_name) + self.addCleanup( + self.openstack, 'network qos policy delete ' + policy_name + ) self.assertEqual(policy_name, json_output['name']) - self.openstack( - 'network qos policy set ' + - '--share ' + - policy_name - ) + self.openstack('network qos policy set ' + '--share ' + policy_name) json_output = self.openstack( - 'network qos policy show ' + - policy_name, + 'network qos policy show ' + policy_name, parse_output=True, ) self.assertTrue(json_output['shared']) self.openstack( - 'network qos policy set ' + - '--no-share ' + - '--no-default ' + - policy_name + 'network qos policy set ' + + '--no-share ' + + '--no-default ' + + policy_name ) json_output = self.openstack( - 'network qos policy show ' + - policy_name, + 'network qos policy show ' + policy_name, parse_output=True, ) self.assertFalse(json_output['shared']) diff --git a/openstackclient/tests/functional/network/v2/test_network_qos_rule.py b/openstackclient/tests/functional/network/v2/test_network_qos_rule.py index 0fe1854b..25455b13 100644 --- a/openstackclient/tests/functional/network/v2/test_network_qos_rule.py +++ b/openstackclient/tests/functional/network/v2/test_network_qos_rule.py @@ -29,31 +29,33 @@ class NetworkQosRuleTestsMinimumBandwidth(common.NetworkTests): self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex - self.openstack( - 'network qos policy create %s' % self.QOS_POLICY_NAME + self.openstack('network qos policy create %s' % self.QOS_POLICY_NAME) + self.addCleanup( + self.openstack, + 'network qos policy delete %s' % self.QOS_POLICY_NAME, ) - self.addCleanup(self.openstack, - 'network qos policy delete %s' % self.QOS_POLICY_NAME) cmd_output = self.openstack( 'network qos rule create ' '--type minimum-bandwidth ' '--min-kbps 2800 ' - '--egress %s' % - self.QOS_POLICY_NAME, + '--egress %s' % self.QOS_POLICY_NAME, parse_output=True, ) self.RULE_ID = cmd_output['id'] - self.addCleanup(self.openstack, - 'network qos rule delete %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID)) + self.addCleanup( + self.openstack, + 'network qos rule delete %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), + ) self.assertTrue(self.RULE_ID) def test_qos_rule_create_delete(self): # This is to check the output of qos rule delete policy_name = uuid.uuid4().hex self.openstack('network qos policy create %s' % policy_name) - self.addCleanup(self.openstack, - 'network qos policy delete %s' % policy_name) + self.addCleanup( + self.openstack, 'network qos policy delete %s' % policy_name + ) rule = self.openstack( 'network qos rule create ' '--type minimum-bandwidth ' @@ -62,30 +64,33 @@ class NetworkQosRuleTestsMinimumBandwidth(common.NetworkTests): parse_output=True, ) raw_output = self.openstack( - 'network qos rule delete %s %s' % - (policy_name, rule['id'])) + 'network qos rule delete %s %s' % (policy_name, rule['id']) + ) self.assertEqual('', raw_output) def test_qos_rule_list(self): cmd_output = self.openstack( 'network qos rule list %s' % self.QOS_POLICY_NAME, - parse_output=True,) + parse_output=True, + ) self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output]) def test_qos_rule_show(self): cmd_output = self.openstack( - 'network qos rule show %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID), + 'network qos rule show %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), parse_output=True, ) self.assertEqual(self.RULE_ID, cmd_output['id']) def test_qos_rule_set(self): - self.openstack('network qos rule set --min-kbps 7500 %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID)) + self.openstack( + 'network qos rule set --min-kbps 7500 %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID) + ) cmd_output = self.openstack( - 'network qos rule show %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID), + 'network qos rule show %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), parse_output=True, ) self.assertEqual(7500, cmd_output['min_kbps']) @@ -102,31 +107,33 @@ class NetworkQosRuleTestsMinimumPacketRate(common.NetworkTests): self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex - self.openstack( - 'network qos policy create %s' % self.QOS_POLICY_NAME + self.openstack('network qos policy create %s' % self.QOS_POLICY_NAME) + self.addCleanup( + self.openstack, + 'network qos policy delete %s' % self.QOS_POLICY_NAME, ) - self.addCleanup(self.openstack, - 'network qos policy delete %s' % self.QOS_POLICY_NAME) cmd_output = self.openstack( 'network qos rule create ' '--type minimum-packet-rate ' '--min-kpps 2800 ' - '--egress %s' % - self.QOS_POLICY_NAME, + '--egress %s' % self.QOS_POLICY_NAME, parse_output=True, ) self.RULE_ID = cmd_output['id'] - self.addCleanup(self.openstack, - 'network qos rule delete %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID)) + self.addCleanup( + self.openstack, + 'network qos rule delete %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), + ) self.assertTrue(self.RULE_ID) def test_qos_rule_create_delete(self): # This is to check the output of qos rule delete policy_name = uuid.uuid4().hex self.openstack('network qos policy create %s' % policy_name) - self.addCleanup(self.openstack, - 'network qos policy delete %s' % policy_name) + self.addCleanup( + self.openstack, 'network qos policy delete %s' % policy_name + ) rule = self.openstack( 'network qos rule create ' '--type minimum-packet-rate ' @@ -135,30 +142,33 @@ class NetworkQosRuleTestsMinimumPacketRate(common.NetworkTests): parse_output=True, ) raw_output = self.openstack( - 'network qos rule delete %s %s' % - (policy_name, rule['id'])) + 'network qos rule delete %s %s' % (policy_name, rule['id']) + ) self.assertEqual('', raw_output) def test_qos_rule_list(self): cmd_output = self.openstack( 'network qos rule list %s' % self.QOS_POLICY_NAME, - parse_output=True,) + parse_output=True, + ) self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output]) def test_qos_rule_show(self): cmd_output = self.openstack( - 'network qos rule show %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID), + 'network qos rule show %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), parse_output=True, ) self.assertEqual(self.RULE_ID, cmd_output['id']) def test_qos_rule_set(self): - self.openstack('network qos rule set --min-kpps 7500 --any %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID)) + self.openstack( + 'network qos rule set --min-kpps 7500 --any %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID) + ) cmd_output = self.openstack( - 'network qos rule show %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID), + 'network qos rule show %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), parse_output=True, ) self.assertEqual(7500, cmd_output['min_kpps']) @@ -175,30 +185,32 @@ class NetworkQosRuleTestsDSCPMarking(common.NetworkTests): self.skipTest("No Network service present") self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex - self.openstack( - 'network qos policy create %s' % self.QOS_POLICY_NAME + self.openstack('network qos policy create %s' % self.QOS_POLICY_NAME) + self.addCleanup( + self.openstack, + 'network qos policy delete %s' % self.QOS_POLICY_NAME, ) - self.addCleanup(self.openstack, - 'network qos policy delete %s' % self.QOS_POLICY_NAME) cmd_output = self.openstack( 'network qos rule create ' '--type dscp-marking ' - '--dscp-mark 8 %s' % - self.QOS_POLICY_NAME, + '--dscp-mark 8 %s' % self.QOS_POLICY_NAME, parse_output=True, ) self.RULE_ID = cmd_output['id'] - self.addCleanup(self.openstack, - 'network qos rule delete %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID)) + self.addCleanup( + self.openstack, + 'network qos rule delete %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), + ) self.assertTrue(self.RULE_ID) def test_qos_rule_create_delete(self): # This is to check the output of qos rule delete policy_name = uuid.uuid4().hex self.openstack('network qos policy create %s' % policy_name) - self.addCleanup(self.openstack, - 'network qos policy delete %s' % policy_name) + self.addCleanup( + self.openstack, 'network qos policy delete %s' % policy_name + ) rule = self.openstack( 'network qos rule create ' '--type dscp-marking ' @@ -206,30 +218,33 @@ class NetworkQosRuleTestsDSCPMarking(common.NetworkTests): parse_output=True, ) raw_output = self.openstack( - 'network qos rule delete %s %s' % - (policy_name, rule['id'])) + 'network qos rule delete %s %s' % (policy_name, rule['id']) + ) self.assertEqual('', raw_output) def test_qos_rule_list(self): cmd_output = self.openstack( 'network qos rule list %s' % self.QOS_POLICY_NAME, - parse_output=True,) + parse_output=True, + ) self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output]) def test_qos_rule_show(self): cmd_output = self.openstack( - 'network qos rule show %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID), + 'network qos rule show %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), parse_output=True, ) self.assertEqual(self.RULE_ID, cmd_output['id']) def test_qos_rule_set(self): - self.openstack('network qos rule set --dscp-mark 32 %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID)) + self.openstack( + 'network qos rule set --dscp-mark 32 %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID) + ) cmd_output = self.openstack( - 'network qos rule show %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID), + 'network qos rule show %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), parse_output=True, ) self.assertEqual(32, cmd_output['dscp_mark']) @@ -245,31 +260,33 @@ class NetworkQosRuleTestsBandwidthLimit(common.NetworkTests): self.skipTest("No Network service present") self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex - self.openstack( - 'network qos policy create %s' % self.QOS_POLICY_NAME + self.openstack('network qos policy create %s' % self.QOS_POLICY_NAME) + self.addCleanup( + self.openstack, + 'network qos policy delete %s' % self.QOS_POLICY_NAME, ) - self.addCleanup(self.openstack, - 'network qos policy delete %s' % self.QOS_POLICY_NAME) cmd_output = self.openstack( 'network qos rule create ' '--type bandwidth-limit ' '--max-kbps 10000 ' - '--egress %s' % - self.QOS_POLICY_NAME, + '--egress %s' % self.QOS_POLICY_NAME, parse_output=True, ) self.RULE_ID = cmd_output['id'] - self.addCleanup(self.openstack, - 'network qos rule delete %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID)) + self.addCleanup( + self.openstack, + 'network qos rule delete %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), + ) self.assertTrue(self.RULE_ID) def test_qos_rule_create_delete(self): # This is to check the output of qos rule delete policy_name = uuid.uuid4().hex self.openstack('network qos policy create %s' % policy_name) - self.addCleanup(self.openstack, - 'network qos policy delete %s' % policy_name) + self.addCleanup( + self.openstack, 'network qos policy delete %s' % policy_name + ) rule = self.openstack( 'network qos rule create ' '--type bandwidth-limit ' @@ -279,33 +296,34 @@ class NetworkQosRuleTestsBandwidthLimit(common.NetworkTests): parse_output=True, ) raw_output = self.openstack( - 'network qos rule delete %s %s' % - (policy_name, rule['id'])) + 'network qos rule delete %s %s' % (policy_name, rule['id']) + ) self.assertEqual('', raw_output) def test_qos_rule_list(self): cmd_output = self.openstack( - 'network qos rule list %s' % - self.QOS_POLICY_NAME, - parse_output=True,) + 'network qos rule list %s' % self.QOS_POLICY_NAME, + parse_output=True, + ) self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output]) def test_qos_rule_show(self): cmd_output = self.openstack( - 'network qos rule show %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID), + 'network qos rule show %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), parse_output=True, ) self.assertEqual(self.RULE_ID, cmd_output['id']) def test_qos_rule_set(self): - self.openstack('network qos rule set --max-kbps 15000 ' - '--max-burst-kbits 1800 ' - '--ingress %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID)) + self.openstack( + 'network qos rule set --max-kbps 15000 ' + '--max-burst-kbits 1800 ' + '--ingress %s %s' % (self.QOS_POLICY_NAME, self.RULE_ID) + ) cmd_output = self.openstack( - 'network qos rule show %s %s' % - (self.QOS_POLICY_NAME, self.RULE_ID), + 'network qos rule show %s %s' + % (self.QOS_POLICY_NAME, self.RULE_ID), parse_output=True, ) self.assertEqual(15000, cmd_output['max_kbps']) diff --git a/openstackclient/tests/functional/network/v2/test_network_qos_rule_type.py b/openstackclient/tests/functional/network/v2/test_network_qos_rule_type.py index 4ead65cc..77f0d71c 100644 --- a/openstackclient/tests/functional/network/v2/test_network_qos_rule_type.py +++ b/openstackclient/tests/functional/network/v2/test_network_qos_rule_type.py @@ -17,17 +17,17 @@ from openstackclient.tests.functional.network.v2 import common class NetworkQosRuleTypeTests(common.NetworkTests): - """Functional tests for Network QoS rule type. """ + """Functional tests for Network QoS rule type.""" - AVAILABLE_RULE_TYPES = ['dscp_marking', - 'bandwidth_limit'] + AVAILABLE_RULE_TYPES = ['dscp_marking', 'bandwidth_limit'] # NOTE(ralonsoh): this list was updated in Yoga (February 2022) - ALL_AVAILABLE_RULE_TYPES = ['dscp_marking', - 'bandwidth_limit', - 'minimum_bandwidth', - 'packet_rate_limit', - 'minimum_packet_rate', - ] + ALL_AVAILABLE_RULE_TYPES = [ + 'dscp_marking', + 'bandwidth_limit', + 'minimum_bandwidth', + 'packet_rate_limit', + 'minimum_packet_rate', + ] def setUp(self): super(NetworkQosRuleTypeTests, self).setUp() @@ -49,7 +49,7 @@ class NetworkQosRuleTypeTests(common.NetworkTests): cmd_output = self.openstack( 'network qos rule type list --all-supported -f json', - parse_output=True + parse_output=True, ) for rule_type in self.AVAILABLE_RULE_TYPES: self.assertIn(rule_type, [x['Type'] for x in cmd_output]) @@ -59,8 +59,7 @@ class NetworkQosRuleTypeTests(common.NetworkTests): self.skipTest('No "qos-rule-type-filter" extension present') cmd_output = self.openstack( - 'network qos rule type list --all-rules -f json', - parse_output=True + 'network qos rule type list --all-rules -f json', parse_output=True ) for rule_type in self.ALL_AVAILABLE_RULE_TYPES: self.assertIn(rule_type, [x['Type'] for x in cmd_output]) diff --git a/openstackclient/tests/functional/network/v2/test_network_rbac.py b/openstackclient/tests/functional/network/v2/test_network_rbac.py index cb66759a..e5130cd1 100644 --- a/openstackclient/tests/functional/network/v2/test_network_rbac.py +++ b/openstackclient/tests/functional/network/v2/test_network_rbac.py @@ -17,6 +17,7 @@ from openstackclient.tests.functional.network.v2 import common class NetworkRBACTests(common.NetworkTests): """Functional tests for network rbac""" + OBJECT_ID = None ID = None HEADERS = ['ID'] @@ -35,20 +36,20 @@ class NetworkRBACTests(common.NetworkTests): 'network create ' + self.NET_NAME, parse_output=True, ) - self.addCleanup(self.openstack, - 'network delete ' + cmd_output['id']) + self.addCleanup(self.openstack, 'network delete ' + cmd_output['id']) self.OBJECT_ID = cmd_output['id'] cmd_output = self.openstack( - 'network rbac create ' + - self.OBJECT_ID + - ' --action access_as_shared' + - ' --target-project admin' + - ' --type network', + 'network rbac create ' + + self.OBJECT_ID + + ' --action access_as_shared' + + ' --target-project admin' + + ' --type network', parse_output=True, ) - self.addCleanup(self.openstack, - 'network rbac delete ' + cmd_output['id']) + self.addCleanup( + self.openstack, 'network rbac delete ' + cmd_output['id'] + ) self.ID = cmd_output['id'] self.assertEqual(self.OBJECT_ID, cmd_output['object_id']) @@ -59,20 +60,27 @@ class NetworkRBACTests(common.NetworkTests): def test_network_rbac_show(self): cmd_output = self.openstack( 'network rbac show ' + self.ID, - parse_output=True,) + parse_output=True, + ) self.assertEqual(self.ID, cmd_output['id']) def test_network_rbac_set(self): project_id = self.openstack( 'project create ' + self.PROJECT_NAME, - parse_output=True,)['id'] - self.openstack('network rbac set ' + self.ID + - ' --target-project ' + self.PROJECT_NAME) + parse_output=True, + )['id'] + self.openstack( + 'network rbac set ' + + self.ID + + ' --target-project ' + + self.PROJECT_NAME + ) cmd_output_rbac = self.openstack( 'network rbac show ' + self.ID, parse_output=True, ) self.assertEqual(project_id, cmd_output_rbac['target_project_id']) raw_output_project = self.openstack( - 'project delete ' + self.PROJECT_NAME) + 'project delete ' + self.PROJECT_NAME + ) self.assertEqual('', raw_output_project) diff --git a/openstackclient/tests/functional/network/v2/test_network_segment.py b/openstackclient/tests/functional/network/v2/test_network_segment.py index 111c4dc3..f8b5aaf6 100644 --- a/openstackclient/tests/functional/network/v2/test_network_segment.py +++ b/openstackclient/tests/functional/network/v2/test_network_segment.py @@ -27,7 +27,8 @@ class NetworkSegmentTests(common.NetworkTests): # Create a network for the all subnet tests cmd_output = cls.openstack( - 'network create ' + cls.NETWORK_NAME, parse_output=True, + 'network create ' + cls.NETWORK_NAME, + parse_output=True, ) # Get network_id for assertEqual cls.NETWORK_ID = cmd_output["id"] @@ -37,8 +38,7 @@ class NetworkSegmentTests(common.NetworkTests): try: if cls.haz_network: raw_output = cls.openstack( - 'network delete ' + - cls.NETWORK_NAME + 'network delete ' + cls.NETWORK_NAME ) cls.assertOutput('', raw_output) finally: @@ -53,11 +53,13 @@ class NetworkSegmentTests(common.NetworkTests): def test_network_segment_create_delete(self): name = uuid.uuid4().hex json_output = self.openstack( - ' network segment create ' + - '--network ' + self.NETWORK_ID + ' ' + - '--network-type geneve ' + - '--segment 2055 ' + - name, + ' network segment create ' + + '--network ' + + self.NETWORK_ID + + ' ' + + '--network-type geneve ' + + '--segment 2055 ' + + name, parse_output=True, ) self.assertEqual( @@ -73,18 +75,19 @@ class NetworkSegmentTests(common.NetworkTests): def test_network_segment_list(self): name = uuid.uuid4().hex json_output = self.openstack( - ' network segment create ' + - '--network ' + self.NETWORK_ID + ' ' + - '--network-type geneve ' + - '--segment 2055 ' + - name, + ' network segment create ' + + '--network ' + + self.NETWORK_ID + + ' ' + + '--network-type geneve ' + + '--segment 2055 ' + + name, parse_output=True, ) network_segment_id = json_output.get('id') network_segment_name = json_output.get('name') self.addCleanup( - self.openstack, - 'network segment delete ' + network_segment_id + self.openstack, 'network segment delete ' + network_segment_id ) self.assertEqual( name, @@ -95,26 +98,23 @@ class NetworkSegmentTests(common.NetworkTests): 'network segment list', parse_output=True, ) - item_map = { - item.get('ID'): item.get('Name') for item in json_output - } + item_map = {item.get('ID'): item.get('Name') for item in json_output} self.assertIn(network_segment_id, item_map.keys()) self.assertIn(network_segment_name, item_map.values()) def test_network_segment_set_show(self): name = uuid.uuid4().hex json_output = self.openstack( - ' network segment create ' + - '--network ' + self.NETWORK_ID + ' ' + - '--network-type geneve ' + - '--segment 2055 ' + - name, + ' network segment create ' + + '--network ' + + self.NETWORK_ID + + ' ' + + '--network-type geneve ' + + '--segment 2055 ' + + name, parse_output=True, ) - self.addCleanup( - self.openstack, - 'network segment delete ' + name - ) + self.addCleanup(self.openstack, 'network segment delete ' + name) extension_output = self.openstack( "extension list ", @@ -133,15 +133,16 @@ class NetworkSegmentTests(common.NetworkTests): new_description = 'new_description' cmd_output = self.openstack( - 'network segment set ' + - '--description ' + new_description + ' ' + - name + 'network segment set ' + + '--description ' + + new_description + + ' ' + + name ) self.assertOutput('', cmd_output) json_output = self.openstack( - 'network segment show ' + - name, + 'network segment show ' + name, parse_output=True, ) self.assertEqual( diff --git a/openstackclient/tests/functional/network/v2/test_network_segment_range.py b/openstackclient/tests/functional/network/v2/test_network_segment_range.py index 5cdf5812..0dd67ead 100644 --- a/openstackclient/tests/functional/network/v2/test_network_segment_range.py +++ b/openstackclient/tests/functional/network/v2/test_network_segment_range.py @@ -35,16 +35,19 @@ class NetworkSegmentRangeTests(common.NetworkTests): # Make a project project_id = self.openstack( 'project create ' + self.PROJECT_NAME, - parse_output=True,)['id'] + parse_output=True, + )['id'] name = uuid.uuid4().hex json_output = self.openstack( - ' network segment range create ' + - '--private ' + - "--project " + self.PROJECT_NAME + " " + - '--network-type vxlan ' + - '--minimum 2005 ' + - '--maximum 2009 ' + - name, + ' network segment range create ' + + '--private ' + + "--project " + + self.PROJECT_NAME + + " " + + '--network-type vxlan ' + + '--minimum 2005 ' + + '--maximum 2009 ' + + name, parse_output=True, ) self.assertEqual( @@ -61,25 +64,26 @@ class NetworkSegmentRangeTests(common.NetworkTests): ) self.assertOutput('', raw_output) raw_output_project = self.openstack( - 'project delete ' + self.PROJECT_NAME) + 'project delete ' + self.PROJECT_NAME + ) self.assertEqual('', raw_output_project) def test_network_segment_range_list(self): name = uuid.uuid4().hex json_output = self.openstack( - ' network segment range create ' + - '--shared ' + - '--network-type geneve ' + - '--minimum 2013 ' + - '--maximum 2017 ' + - name, + ' network segment range create ' + + '--shared ' + + '--network-type geneve ' + + '--minimum 2013 ' + + '--maximum 2017 ' + + name, parse_output=True, ) network_segment_range_id = json_output.get('id') network_segment_range_name = json_output.get('name') self.addCleanup( self.openstack, - 'network segment range delete ' + network_segment_range_id + 'network segment range delete ' + network_segment_range_id, ) self.assertEqual( name, @@ -90,31 +94,29 @@ class NetworkSegmentRangeTests(common.NetworkTests): 'network segment range list', parse_output=True, ) - item_map = { - item.get('ID'): item.get('Name') for item in json_output - } + item_map = {item.get('ID'): item.get('Name') for item in json_output} self.assertIn(network_segment_range_id, item_map.keys()) self.assertIn(network_segment_range_name, item_map.values()) def test_network_segment_range_set_show(self): project_id = self.openstack( 'project create ' + self.PROJECT_NAME, - parse_output=True,)['id'] + parse_output=True, + )['id'] name = uuid.uuid4().hex json_output = self.openstack( - ' network segment range create ' + - '--private ' + - "--project " + self.PROJECT_NAME + " " + - '--network-type geneve ' + - '--minimum 2021 ' + - '--maximum 2025 ' + - name, + ' network segment range create ' + + '--private ' + + "--project " + + self.PROJECT_NAME + + " " + + '--network-type geneve ' + + '--minimum 2021 ' + + '--maximum 2025 ' + + name, parse_output=True, ) - self.addCleanup( - self.openstack, - 'network segment range delete ' + name - ) + self.addCleanup(self.openstack, 'network segment range delete ' + name) self.assertEqual( name, json_output["name"], @@ -127,14 +129,13 @@ class NetworkSegmentRangeTests(common.NetworkTests): new_minimum = 2020 new_maximum = 2029 cmd_output = self.openstack( - 'network segment range set --minimum {min} --maximum {max} {name}' - .format(min=new_minimum, max=new_maximum, name=name) + 'network segment range set --minimum {min} --maximum {max} ' + '{name}'.format(min=new_minimum, max=new_maximum, name=name) ) self.assertOutput('', cmd_output) json_output = self.openstack( - 'network segment range show ' + - name, + 'network segment range show ' + name, parse_output=True, ) self.assertEqual( @@ -147,5 +148,6 @@ class NetworkSegmentRangeTests(common.NetworkTests): ) raw_output_project = self.openstack( - 'project delete ' + self.PROJECT_NAME) + 'project delete ' + self.PROJECT_NAME + ) self.assertEqual('', raw_output_project) diff --git a/openstackclient/tests/functional/network/v2/test_network_service_provider.py b/openstackclient/tests/functional/network/v2/test_network_service_provider.py index 9d513564..dd1d26e2 100644 --- a/openstackclient/tests/functional/network/v2/test_network_service_provider.py +++ b/openstackclient/tests/functional/network/v2/test_network_service_provider.py @@ -37,5 +37,6 @@ class TestNetworkServiceProvider(common.NetworkTests): def test_network_service_provider_list(self): cmd_output = self.openstack( 'network service provider list', - parse_output=True,) + parse_output=True, + ) self.assertIn('L3_ROUTER_NAT', [x['Service Type'] for x in cmd_output]) diff --git a/openstackclient/tests/functional/network/v2/test_network_trunk.py b/openstackclient/tests/functional/network/v2/test_network_trunk.py index bbb77a0d..bb50164f 100644 --- a/openstackclient/tests/functional/network/v2/test_network_trunk.py +++ b/openstackclient/tests/functional/network/v2/test_network_trunk.py @@ -37,113 +37,122 @@ class NetworkTrunkTests(common.NetworkTests): self.openstack( 'subnet create %s ' - '--network %s --subnet-range 10.0.0.0/24' % ( - subnet_name, network_name)) - self.openstack('port create %s --network %s' % - (self.parent_port_name, network_name)) - self.addCleanup(self.openstack, 'port delete %s' % - self.parent_port_name) - json_out = self.openstack('port create %s --network %s -f json' % - (self.sub_port_name, network_name)) + '--network %s --subnet-range 10.0.0.0/24' + % (subnet_name, network_name) + ) + self.openstack( + 'port create %s --network %s' + % (self.parent_port_name, network_name) + ) + self.addCleanup( + self.openstack, 'port delete %s' % self.parent_port_name + ) + json_out = self.openstack( + 'port create %s --network %s -f json' + % (self.sub_port_name, network_name) + ) self.sub_port_id = json.loads(json_out)['id'] self.addCleanup(self.openstack, 'port delete %s' % self.sub_port_name) def test_network_trunk_create_delete(self): trunk_name = uuid.uuid4().hex - self.openstack('network trunk create %s --parent-port %s -f json ' % - (trunk_name, self.parent_port_name)) - raw_output = self.openstack( - 'network trunk delete ' + - trunk_name + self.openstack( + 'network trunk create %s --parent-port %s -f json ' + % (trunk_name, self.parent_port_name) ) + raw_output = self.openstack('network trunk delete ' + trunk_name) self.assertEqual('', raw_output) def test_network_trunk_list(self): trunk_name = uuid.uuid4().hex - json_output = json.loads(self.openstack( - 'network trunk create %s --parent-port %s -f json ' % - (trunk_name, self.parent_port_name))) - self.addCleanup(self.openstack, - 'network trunk delete ' + trunk_name) + json_output = json.loads( + self.openstack( + 'network trunk create %s --parent-port %s -f json ' + % (trunk_name, self.parent_port_name) + ) + ) + self.addCleanup(self.openstack, 'network trunk delete ' + trunk_name) self.assertEqual(trunk_name, json_output['name']) - json_output = json.loads(self.openstack( - 'network trunk list -f json' - )) + json_output = json.loads(self.openstack('network trunk list -f json')) self.assertIn(trunk_name, [tr['Name'] for tr in json_output]) def test_network_trunk_set_unset(self): trunk_name = uuid.uuid4().hex - json_output = json.loads(self.openstack( - 'network trunk create %s --parent-port %s -f json ' % - (trunk_name, self.parent_port_name))) - self.addCleanup(self.openstack, - 'network trunk delete ' + trunk_name) + json_output = json.loads( + self.openstack( + 'network trunk create %s --parent-port %s -f json ' + % (trunk_name, self.parent_port_name) + ) + ) + self.addCleanup(self.openstack, 'network trunk delete ' + trunk_name) self.assertEqual(trunk_name, json_output['name']) - self.openstack( - 'network trunk set ' - '--enable ' + - trunk_name - ) + self.openstack('network trunk set ' '--enable ' + trunk_name) - json_output = json.loads(self.openstack( - 'network trunk show -f json ' + - trunk_name - )) + json_output = json.loads( + self.openstack('network trunk show -f json ' + trunk_name) + ) self.assertTrue(json_output['is_admin_state_up']) # Add subport to trunk self.openstack( - 'network trunk set ' + - '--subport port=%s,segmentation-type=vlan,segmentation-id=42 ' % - (self.sub_port_name) + - trunk_name - ) - json_output = json.loads(self.openstack( - 'network trunk show -f json ' + - trunk_name - )) + 'network trunk set ' + + '--subport port=%s,segmentation-type=vlan,segmentation-id=42 ' + % (self.sub_port_name) + + trunk_name + ) + json_output = json.loads( + self.openstack('network trunk show -f json ' + trunk_name) + ) self.assertEqual( - [{ - 'port_id': self.sub_port_id, - 'segmentation_id': 42, - 'segmentation_type': 'vlan' - }], - json_output['sub_ports']) + [ + { + 'port_id': self.sub_port_id, + 'segmentation_id': 42, + 'segmentation_type': 'vlan', + } + ], + json_output['sub_ports'], + ) # Remove subport from trunk self.openstack( - 'network trunk unset ' + - trunk_name + - ' --subport ' + - self.sub_port_name - ) - json_output = json.loads(self.openstack( - 'network trunk show -f json ' + - trunk_name - )) - self.assertEqual( - [], - json_output['sub_ports']) + 'network trunk unset ' + + trunk_name + + ' --subport ' + + self.sub_port_name + ) + json_output = json.loads( + self.openstack('network trunk show -f json ' + trunk_name) + ) + self.assertEqual([], json_output['sub_ports']) def test_network_trunk_list_subports(self): trunk_name = uuid.uuid4().hex - json_output = json.loads(self.openstack( - 'network trunk create %s --parent-port %s ' - '--subport port=%s,segmentation-type=vlan,segmentation-id=42 ' - '-f json ' % - (trunk_name, self.parent_port_name, self.sub_port_name))) - self.addCleanup(self.openstack, - 'network trunk delete ' + trunk_name) + json_output = json.loads( + self.openstack( + 'network trunk create %s --parent-port %s ' + '--subport port=%s,segmentation-type=vlan,segmentation-id=42 ' + '-f json ' + % (trunk_name, self.parent_port_name, self.sub_port_name) + ) + ) + self.addCleanup(self.openstack, 'network trunk delete ' + trunk_name) self.assertEqual(trunk_name, json_output['name']) - json_output = json.loads(self.openstack( - 'network subport list --trunk %s -f json' % trunk_name)) + json_output = json.loads( + self.openstack( + 'network subport list --trunk %s -f json' % trunk_name + ) + ) self.assertEqual( - [{ - 'Port': self.sub_port_id, - 'Segmentation ID': 42, - 'Segmentation Type': 'vlan' - }], - json_output) + [ + { + 'Port': self.sub_port_id, + 'Segmentation ID': 42, + 'Segmentation Type': 'vlan', + } + ], + json_output, + ) diff --git a/openstackclient/tests/functional/network/v2/test_port.py b/openstackclient/tests/functional/network/v2/test_port.py index f5bc9c4a..b3d3a109 100644 --- a/openstackclient/tests/functional/network/v2/test_port.py +++ b/openstackclient/tests/functional/network/v2/test_port.py @@ -31,9 +31,7 @@ class PortTests(common.NetworkTagTests): cls.NETWORK_NAME = uuid.uuid4().hex # Create a network for the port tests - cls.openstack( - 'network create %s' % cls.NETWORK_NAME - ) + cls.openstack('network create %s' % cls.NETWORK_NAME) @classmethod def tearDownClass(cls): @@ -55,8 +53,7 @@ class PortTests(common.NetworkTagTests): def test_port_delete(self): """Test create, delete multiple""" json_output = self.openstack( - 'port create --network %s %s' % - (self.NETWORK_NAME, self.NAME), + 'port create --network %s %s' % (self.NETWORK_NAME, self.NAME), parse_output=True, ) id1 = json_output.get('id') @@ -65,8 +62,7 @@ class PortTests(common.NetworkTagTests): self.assertEqual(self.NAME, json_output.get('name')) json_output = self.openstack( - 'port create --network %s %sx' % - (self.NETWORK_NAME, self.NAME), + 'port create --network %s %sx' % (self.NETWORK_NAME, self.NAME), parse_output=True, ) id2 = json_output.get('id') @@ -81,8 +77,7 @@ class PortTests(common.NetworkTagTests): def test_port_list(self): """Test create defaults, list, delete""" json_output = self.openstack( - 'port create --network %s %s' % - (self.NETWORK_NAME, self.NAME), + 'port create --network %s %s' % (self.NETWORK_NAME, self.NAME), parse_output=True, ) id1 = json_output.get('id') @@ -93,8 +88,7 @@ class PortTests(common.NetworkTagTests): self.assertEqual(self.NAME, json_output.get('name')) json_output = self.openstack( - 'port create --network %s %sx' % - (self.NETWORK_NAME, self.NAME), + 'port create --network %s %sx' % (self.NETWORK_NAME, self.NAME), parse_output=True, ) id2 = json_output.get('id') @@ -109,8 +103,9 @@ class PortTests(common.NetworkTagTests): 'port list', parse_output=True, ) - item_map = {item.get('ID'): item.get('MAC Address') for item in - json_output} + item_map = { + item.get('ID'): item.get('MAC Address') for item in json_output + } self.assertIn(id1, item_map.keys()) self.assertIn(id2, item_map.keys()) self.assertIn(mac1, item_map.values()) @@ -130,8 +125,9 @@ class PortTests(common.NetworkTagTests): 'port list --mac-address %s' % mac2, parse_output=True, ) - item_map = {item.get('ID'): item.get('MAC Address') for item in - json_output} + item_map = { + item.get('ID'): item.get('MAC Address') for item in json_output + } self.assertNotIn(id1, item_map.keys()) self.assertIn(id2, item_map.keys()) self.assertNotIn(mac1, item_map.values()) @@ -155,8 +151,7 @@ class PortTests(common.NetworkTagTests): 'port create ' '--network %s ' '--description xyzpdq ' - '--disable %s' % - (self.NETWORK_NAME, name), + '--disable %s' % (self.NETWORK_NAME, name), parse_output=True, ) id1 = json_output.get('id') @@ -165,10 +160,7 @@ class PortTests(common.NetworkTagTests): self.assertEqual('xyzpdq', json_output.get('description')) self.assertEqual(False, json_output.get('admin_state_up')) - raw_output = self.openstack( - 'port set --enable %s' % - name - ) + raw_output = self.openstack('port set --enable %s' % name) self.assertOutput('', raw_output) json_output = self.openstack( @@ -183,7 +175,8 @@ class PortTests(common.NetworkTagTests): self.assertIsNotNone(json_output.get('mac_address')) raw_output = self.openstack( - 'port unset --security-group %s %s' % (sg_id, id1)) + 'port unset --security-group %s %s' % (sg_id, id1) + ) self.assertOutput('', raw_output) json_output = self.openstack( @@ -195,8 +188,7 @@ class PortTests(common.NetworkTagTests): def test_port_admin_set(self): """Test create, set (as admin), show, delete""" json_output = self.openstack( - 'port create ' - '--network %s %s' % (self.NETWORK_NAME, self.NAME), + 'port create ' '--network %s %s' % (self.NETWORK_NAME, self.NAME), parse_output=True, ) id_ = json_output.get('id') @@ -204,8 +196,8 @@ class PortTests(common.NetworkTagTests): raw_output = self.openstack( '--os-username admin ' - 'port set --mac-address 11:22:33:44:55:66 %s' % - self.NAME) + 'port set --mac-address 11:22:33:44:55:66 %s' % self.NAME + ) self.assertOutput('', raw_output) json_output = self.openstack( 'port show %s' % self.NAME, @@ -217,8 +209,7 @@ class PortTests(common.NetworkTagTests): """Test create, set, show, delete""" sg_name1 = uuid.uuid4().hex json_output = self.openstack( - 'security group create %s' % - sg_name1, + 'security group create %s' % sg_name1, parse_output=True, ) sg_id1 = json_output.get('id') @@ -226,8 +217,7 @@ class PortTests(common.NetworkTagTests): sg_name2 = uuid.uuid4().hex json_output = self.openstack( - 'security group create %s' % - sg_name2, + 'security group create %s' % sg_name2, parse_output=True, ) sg_id2 = json_output.get('id') @@ -237,8 +227,7 @@ class PortTests(common.NetworkTagTests): json_output = self.openstack( 'port create ' '--network %s ' - '--security-group %s %s' % - (self.NETWORK_NAME, sg_name1, name), + '--security-group %s %s' % (self.NETWORK_NAME, sg_name1, name), parse_output=True, ) id1 = json_output.get('id') @@ -247,9 +236,7 @@ class PortTests(common.NetworkTagTests): self.assertEqual([sg_id1], json_output.get('security_group_ids')) raw_output = self.openstack( - 'port set ' - '--security-group %s %s' % - (sg_name2, name) + 'port set ' '--security-group %s %s' % (sg_name2, name) ) self.assertOutput('', raw_output) @@ -260,25 +247,26 @@ class PortTests(common.NetworkTagTests): self.assertEqual(name, json_output.get('name')) # NOTE(amotoki): The order of the field is not predictable, self.assertIsInstance(json_output.get('security_group_ids'), list) - self.assertEqual(sorted([sg_id1, sg_id2]), - sorted(json_output.get('security_group_ids'))) + self.assertEqual( + sorted([sg_id1, sg_id2]), + sorted(json_output.get('security_group_ids')), + ) raw_output = self.openstack( - 'port unset --security-group %s %s' % (sg_id1, id1)) + 'port unset --security-group %s %s' % (sg_id1, id1) + ) self.assertOutput('', raw_output) json_output = self.openstack( 'port show %s' % name, parse_output=True, ) - self.assertEqual( - [sg_id2], - json_output.get('security_group_ids') - ) + self.assertEqual([sg_id2], json_output.get('security_group_ids')) def _create_resource_for_tag_test(self, name, args): return self.openstack( - '{} create --network {} {} {}' - .format(self.base_command, self.NETWORK_NAME, args, name), + '{} create --network {} {} {}'.format( + self.base_command, self.NETWORK_NAME, args, name + ), parse_output=True, ) diff --git a/openstackclient/tests/functional/network/v2/test_router.py b/openstackclient/tests/functional/network/v2/test_router.py index 07a5a633..fcd72d9f 100644 --- a/openstackclient/tests/functional/network/v2/test_router.py +++ b/openstackclient/tests/functional/network/v2/test_router.py @@ -31,8 +31,7 @@ class RouterTests(common.NetworkTagTests): name1 = uuid.uuid4().hex name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'router create ' + - name1, + 'router create ' + name1, parse_output=True, ) self.assertEqual( @@ -40,8 +39,7 @@ class RouterTests(common.NetworkTagTests): cmd_output["name"], ) cmd_output = self.openstack( - 'router create ' + - name2, + 'router create ' + name2, parse_output=True, ) self.assertEqual( @@ -49,8 +47,7 @@ class RouterTests(common.NetworkTagTests): cmd_output["name"], ) - del_output = self.openstack( - 'router delete ' + name1 + ' ' + name2) + del_output = self.openstack('router delete ' + name1 + ' ' + name2) self.assertOutput('', del_output) def test_router_list(self): @@ -80,9 +77,7 @@ class RouterTests(common.NetworkTagTests): name1 = uuid.uuid4().hex name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'router create ' + - '--disable ' + - name1, + 'router create ' + '--disable ' + name1, parse_output=True, ) @@ -100,9 +95,7 @@ class RouterTests(common.NetworkTagTests): cmd_output["project_id"], ) cmd_output = self.openstack( - 'router create ' + - '--project ' + demo_project_id + - ' ' + name2, + 'router create ' + '--project ' + demo_project_id + ' ' + name2, parse_output=True, ) @@ -122,8 +115,7 @@ class RouterTests(common.NetworkTagTests): # Test list --project cmd_output = self.openstack( - 'router list ' + - '--project ' + demo_project_id, + 'router list ' + '--project ' + demo_project_id, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -132,8 +124,7 @@ class RouterTests(common.NetworkTagTests): # Test list --disable cmd_output = self.openstack( - 'router list ' + - '--disable ', + 'router list ' + '--disable ', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -142,8 +133,7 @@ class RouterTests(common.NetworkTagTests): # Test list --name cmd_output = self.openstack( - 'router list ' + - '--name ' + name1, + 'router list ' + '--name ' + name1, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -152,8 +142,7 @@ class RouterTests(common.NetworkTagTests): # Test list --long cmd_output = self.openstack( - 'router list ' + - '--long ', + 'router list ' + '--long ', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -169,7 +158,8 @@ class RouterTests(common.NetworkTagTests): name = uuid.uuid4().hex cmd_output = self.openstack( 'router create ' + name, - parse_output=True,) + parse_output=True, + ) self.addCleanup(self.openstack, 'router delete ' + name) # Get router ID @@ -177,7 +167,8 @@ class RouterTests(common.NetworkTagTests): # Get l3 agent id cmd_output = self.openstack( 'network agent list --agent-type l3', - parse_output=True,) + parse_output=True, + ) # Check at least one L3 agent is included in the response. self.assertTrue(cmd_output) @@ -185,20 +176,24 @@ class RouterTests(common.NetworkTagTests): # Add router to agent self.openstack( - 'network agent add router --l3 ' + agent_id + ' ' + router_id) + 'network agent add router --l3 ' + agent_id + ' ' + router_id + ) cmd_output = self.openstack( 'router list --agent ' + agent_id, - parse_output=True,) + parse_output=True, + ) router_ids = [x['ID'] for x in cmd_output] self.assertIn(router_id, router_ids) # Remove router from agent self.openstack( - 'network agent remove router --l3 ' + agent_id + ' ' + router_id) + 'network agent remove router --l3 ' + agent_id + ' ' + router_id + ) cmd_output = self.openstack( 'router list --agent ' + agent_id, - parse_output=True,) + parse_output=True, + ) router_ids = [x['ID'] for x in cmd_output] self.assertNotIn(router_id, router_ids) @@ -208,9 +203,7 @@ class RouterTests(common.NetworkTagTests): name = uuid.uuid4().hex new_name = name + "_" cmd_output = self.openstack( - 'router create ' + - '--description aaaa ' + - name, + 'router create ' + '--description aaaa ' + name, parse_output=True, ) self.addCleanup(self.openstack, 'router delete ' + new_name) @@ -225,17 +218,17 @@ class RouterTests(common.NetworkTagTests): # Test set --disable cmd_output = self.openstack( - 'router set ' + - '--name ' + new_name + - ' --description bbbb ' + - '--disable ' + - name + 'router set ' + + '--name ' + + new_name + + ' --description bbbb ' + + '--disable ' + + name ) self.assertOutput('', cmd_output) cmd_output = self.openstack( - 'router show ' + - new_name, + 'router show ' + new_name, parse_output=True, ) self.assertEqual( @@ -256,13 +249,10 @@ class RouterTests(common.NetworkTagTests): # Test unset cmd_output = self.openstack( - 'router unset ' + - '--external-gateway ' + - new_name + 'router unset ' + '--external-gateway ' + new_name ) cmd_output = self.openstack( - 'router show ' + - new_name, + 'router show ' + new_name, parse_output=True, ) self.assertIsNone(cmd_output["external_gateway_info"]) @@ -272,16 +262,15 @@ class RouterTests(common.NetworkTagTests): return cmd_output = self.openstack( - 'router set ' + - '--distributed ' + - '--external-gateway public ' + - router_name + 'router set ' + + '--distributed ' + + '--external-gateway public ' + + router_name ) self.assertOutput('', cmd_output) cmd_output = self.openstack( - 'router show ' + - router_name, + 'router show ' + router_name, parse_output=True, ) self.assertTrue(cmd_output["distributed"]) @@ -297,38 +286,51 @@ class RouterTests(common.NetworkTagTests): self.openstack( 'subnet create %s ' - '--network %s --subnet-range 10.0.0.0/24' % ( - subnet_name, network_name)) + '--network %s --subnet-range 10.0.0.0/24' + % (subnet_name, network_name) + ) self.openstack('router create %s' % router_name) self.addCleanup(self.openstack, 'router delete %s' % router_name) self.openstack('router add subnet %s %s' % (router_name, subnet_name)) - self.addCleanup(self.openstack, 'router remove subnet %s %s' % ( - router_name, subnet_name)) - - out1 = self.openstack( - 'router add route %s ' - '--route destination=10.0.10.0/24,gateway=10.0.0.10' % - router_name, - parse_output=True,), + self.addCleanup( + self.openstack, + 'router remove subnet %s %s' % (router_name, subnet_name), + ) + + out1 = ( + self.openstack( + 'router add route %s ' + '--route destination=10.0.10.0/24,gateway=10.0.0.10' + % router_name, + parse_output=True, + ), + ) self.assertEqual(1, len(out1[0]['routes'])) self.addCleanup( - self.openstack, 'router set %s --no-route' % router_name) - - out2 = self.openstack( - 'router add route %s ' - '--route destination=10.0.10.0/24,gateway=10.0.0.10 ' - '--route destination=10.0.11.0/24,gateway=10.0.0.11' % - router_name, - parse_output=True,), + self.openstack, 'router set %s --no-route' % router_name + ) + + out2 = ( + self.openstack( + 'router add route %s ' + '--route destination=10.0.10.0/24,gateway=10.0.0.10 ' + '--route destination=10.0.11.0/24,gateway=10.0.0.11' + % router_name, + parse_output=True, + ), + ) self.assertEqual(2, len(out2[0]['routes'])) - out3 = self.openstack( - 'router remove route %s ' - '--route destination=10.0.11.0/24,gateway=10.0.0.11 ' - '--route destination=10.0.12.0/24,gateway=10.0.0.12' % - router_name, - parse_output=True,), + out3 = ( + self.openstack( + 'router remove route %s ' + '--route destination=10.0.11.0/24,gateway=10.0.0.11 ' + '--route destination=10.0.12.0/24,gateway=10.0.0.12' + % router_name, + parse_output=True, + ), + ) self.assertEqual(1, len(out3[0]['routes'])) diff --git a/openstackclient/tests/functional/network/v2/test_security_group.py b/openstackclient/tests/functional/network/v2/test_security_group.py index c9d929f5..571c01ee 100644 --- a/openstackclient/tests/functional/network/v2/test_security_group.py +++ b/openstackclient/tests/functional/network/v2/test_security_group.py @@ -27,12 +27,12 @@ class SecurityGroupTests(common.NetworkTests): self.NAME = uuid.uuid4().hex self.OTHER_NAME = uuid.uuid4().hex cmd_output = self.openstack( - 'security group create ' + - self.NAME, + 'security group create ' + self.NAME, parse_output=True, ) - self.addCleanup(self.openstack, - 'security group delete ' + cmd_output['id']) + self.addCleanup( + self.openstack, 'security group delete ' + cmd_output['id'] + ) self.assertEqual(self.NAME, cmd_output['name']) def test_security_group_list(self): @@ -42,8 +42,10 @@ class SecurityGroupTests(common.NetworkTests): def test_security_group_set(self): other_name = uuid.uuid4().hex raw_output = self.openstack( - 'security group set --description NSA --stateless --name ' + - other_name + ' ' + self.NAME + 'security group set --description NSA --stateless --name ' + + other_name + + ' ' + + self.NAME ) self.assertEqual('', raw_output) diff --git a/openstackclient/tests/functional/network/v2/test_security_group_rule.py b/openstackclient/tests/functional/network/v2/test_security_group_rule.py index d64fb420..6fdd041c 100644 --- a/openstackclient/tests/functional/network/v2/test_security_group_rule.py +++ b/openstackclient/tests/functional/network/v2/test_security_group_rule.py @@ -28,24 +28,26 @@ class SecurityGroupRuleTests(common.NetworkTests): # Create the security group to hold the rule cmd_output = self.openstack( - 'security group create ' + - self.SECURITY_GROUP_NAME, + 'security group create ' + self.SECURITY_GROUP_NAME, parse_output=True, ) - self.addCleanup(self.openstack, - 'security group delete ' + self.SECURITY_GROUP_NAME) + self.addCleanup( + self.openstack, 'security group delete ' + self.SECURITY_GROUP_NAME + ) self.assertEqual(self.SECURITY_GROUP_NAME, cmd_output['name']) # Create the security group rule. cmd_output = self.openstack( - 'security group rule create ' + - self.SECURITY_GROUP_NAME + ' ' + - '--protocol tcp --dst-port 80:80 ' + - '--ingress --ethertype IPv4 ', + 'security group rule create ' + + self.SECURITY_GROUP_NAME + + ' ' + + '--protocol tcp --dst-port 80:80 ' + + '--ingress --ethertype IPv4 ', parse_output=True, ) - self.addCleanup(self.openstack, - 'security group rule delete ' + cmd_output['id']) + self.addCleanup( + self.openstack, 'security group rule delete ' + cmd_output['id'] + ) self.SECURITY_GROUP_RULE_ID = cmd_output['id'] def test_security_group_rule_list(self): @@ -53,8 +55,9 @@ class SecurityGroupRuleTests(common.NetworkTests): 'security group rule list ' + self.SECURITY_GROUP_NAME, parse_output=True, ) - self.assertIn(self.SECURITY_GROUP_RULE_ID, - [rule['ID'] for rule in cmd_output]) + self.assertIn( + self.SECURITY_GROUP_RULE_ID, [rule['ID'] for rule in cmd_output] + ) def test_security_group_rule_show(self): cmd_output = self.openstack( diff --git a/openstackclient/tests/functional/network/v2/test_subnet.py b/openstackclient/tests/functional/network/v2/test_subnet.py index 041ec9f0..90eb7729 100644 --- a/openstackclient/tests/functional/network/v2/test_subnet.py +++ b/openstackclient/tests/functional/network/v2/test_subnet.py @@ -29,8 +29,7 @@ class SubnetTests(common.NetworkTagTests): # Create a network for the all subnet tests cmd_output = cls.openstack( - 'network create ' + - cls.NETWORK_NAME, + 'network create ' + cls.NETWORK_NAME, parse_output=True, ) # Get network_id for assertEqual @@ -41,8 +40,7 @@ class SubnetTests(common.NetworkTagTests): try: if cls.haz_network: raw_output = cls.openstack( - 'network delete ' + - cls.NETWORK_NAME + 'network delete ' + cls.NETWORK_NAME ) cls.assertOutput('', raw_output) finally: @@ -57,9 +55,9 @@ class SubnetTests(common.NetworkTagTests): def test_subnet_create_and_delete(self): """Test create, delete multiple""" name1 = uuid.uuid4().hex - cmd = ('subnet create --network ' + - self.NETWORK_NAME + - ' --subnet-range') + cmd = ( + 'subnet create --network ' + self.NETWORK_NAME + ' --subnet-range' + ) cmd_output = self._subnet_create(cmd, name1) self.assertEqual( name1, @@ -70,9 +68,9 @@ class SubnetTests(common.NetworkTagTests): cmd_output["network_id"], ) name2 = uuid.uuid4().hex - cmd = ('subnet create --network ' + - self.NETWORK_NAME + - ' --subnet-range') + cmd = ( + 'subnet create --network ' + self.NETWORK_NAME + ' --subnet-range' + ) cmd_output = self._subnet_create(cmd, name2) self.assertEqual( name2, @@ -83,17 +81,19 @@ class SubnetTests(common.NetworkTagTests): cmd_output["network_id"], ) - del_output = self.openstack( - 'subnet delete ' + name1 + ' ' + name2) + del_output = self.openstack('subnet delete ' + name1 + ' ' + name2) self.assertOutput('', del_output) def test_subnet_list(self): """Test create, list filter""" name1 = uuid.uuid4().hex name2 = uuid.uuid4().hex - cmd = ('subnet create ' + - '--network ' + self.NETWORK_NAME + - ' --dhcp --subnet-range') + cmd = ( + 'subnet create ' + + '--network ' + + self.NETWORK_NAME + + ' --dhcp --subnet-range' + ) cmd_output = self._subnet_create(cmd, name1) self.addCleanup(self.openstack, 'subnet delete ' + name1) @@ -114,10 +114,13 @@ class SubnetTests(common.NetworkTagTests): cmd_output["ip_version"], ) - cmd = ('subnet create ' + - '--network ' + self.NETWORK_NAME + - ' --ip-version 6 --no-dhcp ' + - '--subnet-range') + cmd = ( + 'subnet create ' + + '--network ' + + self.NETWORK_NAME + + ' --ip-version 6 --no-dhcp ' + + '--subnet-range' + ) cmd_output = self._subnet_create(cmd, name2, is_type_ipv4=False) self.addCleanup(self.openstack, 'subnet delete ' + name2) @@ -140,8 +143,7 @@ class SubnetTests(common.NetworkTagTests): # Test list --long cmd_output = self.openstack( - 'subnet list ' + - '--long ', + 'subnet list ' + '--long ', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -150,8 +152,7 @@ class SubnetTests(common.NetworkTagTests): # Test list --name cmd_output = self.openstack( - 'subnet list ' + - '--name ' + name1, + 'subnet list ' + '--name ' + name1, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -160,8 +161,7 @@ class SubnetTests(common.NetworkTagTests): # Test list --ip-version cmd_output = self.openstack( - 'subnet list ' + - '--ip-version 6', + 'subnet list ' + '--ip-version 6', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -170,8 +170,7 @@ class SubnetTests(common.NetworkTagTests): # Test list --network cmd_output = self.openstack( - 'subnet list ' + - '--network ' + self.NETWORK_ID, + 'subnet list ' + '--network ' + self.NETWORK_ID, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -180,8 +179,7 @@ class SubnetTests(common.NetworkTagTests): # Test list --no-dhcp cmd_output = self.openstack( - 'subnet list ' + - '--no-dhcp ', + 'subnet list ' + '--no-dhcp ', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -193,9 +191,12 @@ class SubnetTests(common.NetworkTagTests): name = uuid.uuid4().hex new_name = name + "_" - cmd = ('subnet create ' + - '--network ' + self.NETWORK_NAME + - ' --description aaaa --subnet-range') + cmd = ( + 'subnet create ' + + '--network ' + + self.NETWORK_NAME + + ' --description aaaa --subnet-range' + ) cmd_output = self._subnet_create(cmd, name) self.addCleanup(self.openstack, 'subnet delete ' + new_name) @@ -210,19 +211,19 @@ class SubnetTests(common.NetworkTagTests): # Test set --no-dhcp --name --gateway --description cmd_output = self.openstack( - 'subnet set ' + - '--name ' + new_name + - ' --description bbbb ' + - '--no-dhcp ' + - '--gateway 10.10.11.1 ' + - '--service-type network:floatingip_agent_gateway ' + - name + 'subnet set ' + + '--name ' + + new_name + + ' --description bbbb ' + + '--no-dhcp ' + + '--gateway 10.10.11.1 ' + + '--service-type network:floatingip_agent_gateway ' + + name ) self.assertOutput('', cmd_output) cmd_output = self.openstack( - 'subnet show ' + - new_name, + 'subnet show ' + new_name, parse_output=True, ) self.assertEqual( @@ -248,15 +249,14 @@ class SubnetTests(common.NetworkTagTests): # Test unset cmd_output = self.openstack( - 'subnet unset ' + - '--service-type network:floatingip_agent_gateway ' + - new_name + 'subnet unset ' + + '--service-type network:floatingip_agent_gateway ' + + new_name ) self.assertOutput('', cmd_output) cmd_output = self.openstack( - 'subnet show ' + - new_name, + 'subnet show ' + new_name, parse_output=True, ) self.assertEqual( @@ -271,23 +271,32 @@ class SubnetTests(common.NetworkTagTests): for i in range(4): # Make a random subnet if is_type_ipv4: - subnet = ".".join(map( - str, - (random.randint(0, 223) for _ in range(3)) - )) + ".0/26" + subnet = ( + ".".join( + map(str, (random.randint(0, 223) for _ in range(3))) + ) + + ".0/26" + ) else: - subnet = ":".join(map( - str, - (hex(random.randint(0, 65535))[2:] for _ in range(7)) - )) + ":0/112" + subnet = ( + ":".join( + map( + str, + ( + hex(random.randint(0, 65535))[2:] + for _ in range(7) + ), + ) + ) + + ":0/112" + ) try: cmd_output = self.openstack( - cmd + ' ' + subnet + ' ' + - name, + cmd + ' ' + subnet + ' ' + name, parse_output=True, ) except Exception: - if (i == 3): + if i == 3: # raise the exception at the last time raise pass @@ -297,7 +306,11 @@ class SubnetTests(common.NetworkTagTests): return cmd_output def _create_resource_for_tag_test(self, name, args): - cmd = ('subnet create --network ' + - self.NETWORK_NAME + ' ' + args + - ' --subnet-range') + cmd = ( + 'subnet create --network ' + + self.NETWORK_NAME + + ' ' + + args + + ' --subnet-range' + ) return self._subnet_create(cmd, name) diff --git a/openstackclient/tests/functional/network/v2/test_subnet_pool.py b/openstackclient/tests/functional/network/v2/test_subnet_pool.py index 8dc5e7a1..f7cb1d74 100644 --- a/openstackclient/tests/functional/network/v2/test_subnet_pool.py +++ b/openstackclient/tests/functional/network/v2/test_subnet_pool.py @@ -32,26 +32,14 @@ class SubnetPoolTests(common.NetworkTagTests): name1 = uuid.uuid4().hex cmd_output, pool_prefix = self._subnet_pool_create("", name1) - self.assertEqual( - name1, - cmd_output["name"] - ) - self.assertEqual( - [pool_prefix], - cmd_output["prefixes"] - ) + self.assertEqual(name1, cmd_output["name"]) + self.assertEqual([pool_prefix], cmd_output["prefixes"]) name2 = uuid.uuid4().hex cmd_output, pool_prefix = self._subnet_pool_create("", name2) - self.assertEqual( - name2, - cmd_output["name"] - ) - self.assertEqual( - [pool_prefix], - cmd_output["prefixes"] - ) + self.assertEqual(name2, cmd_output["name"]) + self.assertEqual([pool_prefix], cmd_output["prefixes"]) del_output = self.openstack( 'subnet pool delete ' + name1 + ' ' + name2, @@ -85,8 +73,7 @@ class SubnetPoolTests(common.NetworkTagTests): name2 = uuid.uuid4().hex cmd_output, pool_prefix = self._subnet_pool_create( - '--project ' + demo_project_id + - ' --no-share ', + '--project ' + demo_project_id + ' --no-share ', name1, ) self.addCleanup(self.openstack, 'subnet pool delete ' + name1) @@ -131,8 +118,7 @@ class SubnetPoolTests(common.NetworkTagTests): # Test list --project cmd_output = self.openstack( - 'subnet pool list ' + - '--project ' + demo_project_id, + 'subnet pool list ' + '--project ' + demo_project_id, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -141,8 +127,7 @@ class SubnetPoolTests(common.NetworkTagTests): # Test list --share cmd_output = self.openstack( - 'subnet pool list ' + - '--share', + 'subnet pool list ' + '--share', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -151,8 +136,7 @@ class SubnetPoolTests(common.NetworkTagTests): # Test list --name cmd_output = self.openstack( - 'subnet pool list ' + - '--name ' + name1, + 'subnet pool list ' + '--name ' + name1, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -161,8 +145,7 @@ class SubnetPoolTests(common.NetworkTagTests): # Test list --long cmd_output = self.openstack( - 'subnet pool list ' + - '--long ', + 'subnet pool list ' + '--long ', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -175,11 +158,11 @@ class SubnetPoolTests(common.NetworkTagTests): name = uuid.uuid4().hex new_name = name + "_" cmd_output, pool_prefix = self._subnet_pool_create( - '--default-prefix-length 16 ' + - '--min-prefix-length 16 ' + - '--max-prefix-length 32 ' + - '--description aaaa ' + - '--default-quota 10 ', + '--default-prefix-length 16 ' + + '--min-prefix-length 16 ' + + '--max-prefix-length 32 ' + + '--description aaaa ' + + '--default-quota 10 ', name, ) @@ -218,21 +201,21 @@ class SubnetPoolTests(common.NetworkTagTests): # Test set cmd_output = self.openstack( - 'subnet pool set ' + - '--name ' + new_name + - ' --description bbbb ' + - ' --pool-prefix 10.110.0.0/16 ' + - '--default-prefix-length 8 ' + - '--min-prefix-length 8 ' + - '--max-prefix-length 16 ' + - '--default-quota 20 ' + - name, + 'subnet pool set ' + + '--name ' + + new_name + + ' --description bbbb ' + + ' --pool-prefix 10.110.0.0/16 ' + + '--default-prefix-length 8 ' + + '--min-prefix-length 8 ' + + '--max-prefix-length 16 ' + + '--default-quota 20 ' + + name, ) self.assertOutput('', cmd_output) cmd_output = self.openstack( - 'subnet pool show ' + - new_name, + 'subnet pool show ' + new_name, parse_output=True, ) self.assertEqual( @@ -300,26 +283,42 @@ class SubnetPoolTests(common.NetworkTagTests): for i in range(4): # Create a random prefix if is_type_ipv4: - pool_prefix = ".".join(map( - str, - (random.randint(0, 223) for _ in range(2)), - )) + ".0.0/16" + pool_prefix = ( + ".".join( + map( + str, + (random.randint(0, 223) for _ in range(2)), + ) + ) + + ".0.0/16" + ) else: - pool_prefix = ":".join(map( - str, - (hex(random.randint(0, 65535))[2:] for _ in range(6)), - )) + ":0:0/96" + pool_prefix = ( + ":".join( + map( + str, + ( + hex(random.randint(0, 65535))[2:] + for _ in range(6) + ), + ) + ) + + ":0:0/96" + ) try: cmd_output = self.openstack( - 'subnet pool create ' + - cmd + ' ' + - '--pool-prefix ' + pool_prefix + ' ' + - name, + 'subnet pool create ' + + cmd + + ' ' + + '--pool-prefix ' + + pool_prefix + + ' ' + + name, parse_output=True, ) except Exception: - if (i == 3): + if i == 3: # Raise the exception the last time raise pass |