From 99bb69674dc1c0954b0185e0ad76eda21c1dcc67 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Fri, 5 Apr 2019 12:25:23 -0700 Subject: [PATCH] Switch member 2 to be built on the VIP subnet We need to test members being on the VIP subnet. This patch changes member 2, when not overriden, to be on the VIP subnet. Change-Id: I6181f44c22a39f1731484d6e6bc55538a2b93aec --- octavia_tempest_plugin/config.py | 8 +++-- octavia_tempest_plugin/tests/test_base.py | 44 +++-------------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/octavia_tempest_plugin/config.py b/octavia_tempest_plugin/config.py index 701eb8e6..3c0b379c 100644 --- a/octavia_tempest_plugin/config.py +++ b/octavia_tempest_plugin/config.py @@ -146,10 +146,14 @@ OctaviaGroup = [ default='fd7b:f9f7:0fff:4eca::/64', help='CIDR format subnet to use for the member 1 ipv6 subnet.'), cfg.StrOpt('member_2_ipv4_subnet_cidr', - default='10.2.2.0/24', + default='10.2.2.0/24', deprecated_for_removal=True, + deprecated_since='4/5/2019', + deprecated_reason='Member 2 is now built on the VIP subnet.', help='CIDR format subnet to use for the member 2 subnet.'), cfg.StrOpt('member_2_ipv6_subnet_cidr', - default='fd77:1457:4cf0:26a8::/64', + default='fd77:1457:4cf0:26a8::/64', deprecated_for_removal=True, + deprecated_since='4/5/2019', + deprecated_reason='Member 2 is now built on the VIP subnet.', help='CIDR format subnet to use for the member 1 ipv6 subnet.'), # Environment specific options # These are used to accomidate clouds with specific limitations diff --git a/octavia_tempest_plugin/tests/test_base.py b/octavia_tempest_plugin/tests/test_base.py index f8acc2b6..1e28f15a 100644 --- a/octavia_tempest_plugin/tests/test_base.py +++ b/octavia_tempest_plugin/tests/test_base.py @@ -376,58 +376,24 @@ class LoadBalancerBaseTest(test.BaseTestCase): cls.lb_mem_subnet_client.show_subnet, cls.lb_member_1_ipv6_subnet['id']) + # Note: We need to test with a member on the VIP network/subnet. # Create tenant member 2 network - network_kwargs = { - 'name': data_utils.rand_name("lb_member_2_network")} - if CONF.network_feature_enabled.port_security: - if CONF.load_balancer.enable_security_groups: - network_kwargs['port_security_enabled'] = True - else: - network_kwargs['port_security_enabled'] = False - result = cls.lb_mem_net_client.create_network(**network_kwargs) - cls.lb_member_2_net = result['network'] + cls.lb_member_2_net = cls.lb_member_vip_net LOG.info('lb_member_2_net: {}'.format(cls.lb_member_2_net)) - cls.addClassResourceCleanup( - waiters.wait_for_not_found, - cls._logging_delete_network, - cls.lb_mem_net_client.show_network, - cls.lb_member_2_net['id']) # Create tenant member 2 subnet - subnet_kwargs = { - 'name': data_utils.rand_name("lb_member_2_subnet"), - 'network_id': cls.lb_member_2_net['id'], - 'cidr': CONF.load_balancer.member_2_ipv4_subnet_cidr, - 'ip_version': 4} - result = cls.lb_mem_subnet_client.create_subnet(**subnet_kwargs) - cls.lb_member_2_subnet = result['subnet'] + cls.lb_member_2_subnet = cls.lb_member_vip_subnet LOG.info('lb_member_2_subnet: {}'.format(cls.lb_member_2_subnet)) - cls.addClassResourceCleanup( - waiters.wait_for_not_found, - cls._logging_delete_subnet, - cls.lb_mem_subnet_client.show_subnet, - cls.lb_member_2_subnet['id']) # Create tenant member 2 ipv6 subnet if CONF.load_balancer.test_with_ipv6: - subnet_kwargs = { - 'name': data_utils.rand_name("lb_member_2_ipv6_subnet"), - 'network_id': cls.lb_member_2_net['id'], - 'cidr': CONF.load_balancer.member_2_ipv6_subnet_cidr, - 'ip_version': 6} - result = cls.lb_mem_subnet_client.create_subnet(**subnet_kwargs) cls.lb_member_2_subnet_prefix = ( - CONF.load_balancer.member_2_ipv6_subnet_cidr.rpartition('/')[2] + CONF.load_balancer.vip_ipv6_subnet_cidr.rpartition('/')[2] ) assert(cls.lb_member_2_subnet_prefix.isdigit()) - cls.lb_member_2_ipv6_subnet = result['subnet'] + cls.lb_member_2_ipv6_subnet = cls.lb_member_vip_ipv6_subnet LOG.info('lb_member_2_ipv6_subnet: {}'.format( cls.lb_member_2_ipv6_subnet)) - cls.addClassResourceCleanup( - waiters.wait_for_not_found, - cls._logging_delete_subnet, - cls.lb_mem_subnet_client.show_subnet, - cls.lb_member_2_ipv6_subnet['id']) @classmethod def _setup_lb_network_kwargs(cls, lb_kwargs, ip_version=None,