From c6065c7a4796ad0a679a13cb6bd2b3b5a271f5cb Mon Sep 17 00:00:00 2001 From: elajkat Date: Thu, 8 Sep 2022 14:43:52 +0200 Subject: [PATCH] Add address-scope to NDP proxy tests Related-Bug: #1987410 Change-Id: I61df81381803ca289f295ab8d7a8f495bb169447 --- .../network/v2/test_network_ndp_proxy.py | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) 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 e89197ad33..a10aef6b55 100644 --- a/openstackclient/tests/functional/network/v2/test_network_ndp_proxy.py +++ b/openstackclient/tests/functional/network/v2/test_network_ndp_proxy.py @@ -32,8 +32,26 @@ class L3NDPProxyTests(common.NetworkTests): self.INT_NET_NAME = self.getUniqueString() self.INT_SUB_NAME = self.getUniqueString() self.INT_PORT_NAME = self.getUniqueString() + self.ADDR_SCOPE_NAME = self.getUniqueString() + self.SUBNET_P_NAME = self.getUniqueString() self.created_ndp_proxies = [] + json_output = json.loads( + self.openstack( + 'address scope create -f json --ip-version 6 ' + '%(address_s_name)s' % { + 'address_s_name': self.ADDR_SCOPE_NAME})) + self.assertIsNotNone(json_output['id']) + self.ADDRESS_SCOPE_ID = json_output['id'] + json_output = json.loads( + self.openstack( + 'subnet pool create -f json %(subnet_p_name)s ' + '--address-scope %(address_scope)s ' + '--pool-prefix 2001:db8::/96 --default-prefix-length 112' % { + 'subnet_p_name': self.SUBNET_P_NAME, + 'address_scope': self.ADDRESS_SCOPE_ID})) + self.assertIsNotNone(json_output['id']) + self.SUBNET_POOL_ID = json_output['id'] json_output = json.loads( self.openstack('network create -f json ' '--external ' + self.EXT_NET_NAME)) @@ -41,8 +59,9 @@ class L3NDPProxyTests(common.NetworkTests): self.EXT_NET_ID = json_output['id'] json_output = json.loads( self.openstack( - 'subnet create -f json --ip-version 6 --subnet-range ' - '2002::1:0/112 --network %(net_id)s %(sub_name)s' % { + 'subnet create -f json --ip-version 6 --subnet-pool ' + '%(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})) self.assertIsNotNone(json_output['id']) @@ -68,8 +87,9 @@ class L3NDPProxyTests(common.NetworkTests): self.INT_NET_ID = json_output['id'] json_output = json.loads( self.openstack( - 'subnet create -f json --ip-version 6 --subnet-range ' - '2002::2:0/112 --network %(net_id)s %(sub_name)s' % { + 'subnet create -f json --ip-version 6 --subnet-pool ' + '%(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})) self.assertIsNotNone(json_output['id']) @@ -113,6 +133,11 @@ class L3NDPProxyTests(common.NetworkTests): self.assertEqual('', output) output = self.openstack('network delete ' + self.EXT_NET_ID) 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) + self.assertEqual('', output) super().tearDown() def _create_ndp_proxies(self, ndp_proxies):