From 2ab909173532fdd6538eb4669444296f56234a80 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 18 Sep 2015 08:28:34 +0900 Subject: [PATCH] SubnetPoolsTest: Skip IPv6 tests appropriately Rename a class variable so that it will be checked by the base class. Certain tests were not being run correctly due to subclasses incorrectly overriding a base class variable. This change names the variable correctly in the subclasses to fix the problem. Closes-Bug: #1497188 Change-Id: I97756b91cbec297ade7efcc8986a038a184b3a84 --- neutron/tests/api/test_subnetpools.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neutron/tests/api/test_subnetpools.py b/neutron/tests/api/test_subnetpools.py index dd627d947..3b4df7fbe 100644 --- a/neutron/tests/api/test_subnetpools.py +++ b/neutron/tests/api/test_subnetpools.py @@ -31,7 +31,7 @@ class SubnetPoolsTest(base.BaseNetworkTest): min_prefixlen = '28' max_prefixlen = '31' - ip_version = 4 + _ip_version = 4 subnet_cidr = u'10.11.12.0/31' new_prefix = u'10.11.15.0/24' larger_prefix = u'10.11.0.0/16' @@ -192,7 +192,7 @@ class SubnetPoolsTest(base.BaseNetworkTest): kwargs.update(subnet_values) body = self.client.create_subnet( network_id=network_id, - ip_version=self.ip_version, + ip_version=self._ip_version, **kwargs) subnet = body['subnet'] self.addCleanup(self.client.delete_subnetpool, pool_id) @@ -314,7 +314,7 @@ class SubnetPoolsTestV6(SubnetPoolsTest): min_prefixlen = '48' max_prefixlen = '64' - ip_version = 6 + _ip_version = 6 subnet_cidr = '2001:db8:3::/64' new_prefix = u'2001:db8:5::/64' larger_prefix = u'2001:db8::/32' -- 2.45.2