Remove address scopes from supported extensions

This feature is not ready for prime time, but the cli code is
already landed and shipped.

In order to prevent users from getting mad about an uncooked feature,
let's disable it until it becomes more robust.

Tests must be disabled unconditionally because our CI API test framework
execute tests for 'all' extensions available.

Related-blueprint: address-scopes

Change-Id: I71dc333e210b1f4acf30569711b4442ed8a1dfc3

diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py
index 2b26e735f1ccc931092c136c259562bf3614370d..d9e567ed317cb6f4d54dfed7c50558eee00111f4 100644 (file)
--- a/neutron/plugins/ml2/plugin.py
+++ b/neutron/plugins/ml2/plugin.py
@@ -118,7 +118,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
                                     "multi-provider", "allowed-address-pairs",
                                     "extra_dhcp_opt", "subnet_allocation",
                                     "net-mtu", "vlan-transparent",
-                                    "address-scope", "dns-integration"]
+                                    "dns-integration"]
 
     @property
     def supported_extension_aliases(self):

diff --git a/neutron/tests/api/test_address_scopes.py b/neutron/tests/api/test_address_scopes.py
index a80319b39a34c89d5aa35240590b2a65f65a5251..d76382fc6092b3e7bba772d1e0236354d477473a 100644 (file)
--- a/neutron/tests/api/test_address_scopes.py
+++ b/neutron/tests/api/test_address_scopes.py
@@ -26,6 +26,12 @@ ADDRESS_SCOPE_NAME = 'smoke-address-scope'
 
 class AddressScopeTestBase(base.BaseNetworkTest):
 
+    @classmethod
+    def skip_checks(cls):
+        super(AddressScopeTestBase, cls).skip_checks()
+        msg = "Address-Scope extension not enabled."
+        raise cls.skipException(msg)
+
     @classmethod
     def resource_setup(cls):
         super(AddressScopeTestBase, cls).resource_setup()

diff --git a/neutron/tests/api/test_subnetpools.py b/neutron/tests/api/test_subnetpools.py
index 1bf4349177d12c99e37f50fcf2c987bb8e42cdab..dd627d9473623d2c7a0a38fd008807ca4e79f316 100644 (file)
--- a/neutron/tests/api/test_subnetpools.py
+++ b/neutron/tests/api/test_subnetpools.py
@@ -242,6 +242,7 @@ class SubnetPoolsTest(base.BaseNetworkTest):
     @test.attr(type='smoke')
     @test.idempotent_id('49b44c64-1619-4b29-b527-ffc3c3115dc4')
     def test_create_subnetpool_associate_address_scope(self):
+        self.skipTest("until extension address-scope is re-enabled")
         address_scope = self.create_address_scope(
             name=data_utils.rand_name('smoke-address-scope'))
         name, pool_id = self._create_subnetpool(
@@ -254,6 +255,7 @@ class SubnetPoolsTest(base.BaseNetworkTest):
     @test.attr(type='smoke')
     @test.idempotent_id('910b6393-db24-4f6f-87dc-b36892ad6c8c')
     def test_update_subnetpool_associate_address_scope(self):
+        self.skipTest("until extension address-scope is re-enabled")
         address_scope = self.create_address_scope(
             name=data_utils.rand_name('smoke-address-scope'))
         name, pool_id = self._create_subnetpool(self.client)
@@ -270,6 +272,7 @@ class SubnetPoolsTest(base.BaseNetworkTest):
     @test.attr(type='smoke')
     @test.idempotent_id('18302e80-46a3-4563-82ac-ccd1dd57f652')
     def test_update_subnetpool_associate_another_address_scope(self):
+        self.skipTest("until extension address-scope is re-enabled")
         address_scope = self.create_address_scope(
             name=data_utils.rand_name('smoke-address-scope'))
         another_address_scope = self.create_address_scope(
@@ -292,6 +295,7 @@ class SubnetPoolsTest(base.BaseNetworkTest):
     @test.attr(type='smoke')
     @test.idempotent_id('f8970048-e41b-42d6-934b-a1297b07706a')
     def test_update_subnetpool_disassociate_address_scope(self):
+        self.skipTest("until extension address-scope is re-enabled")
         address_scope = self.create_address_scope(
             name=data_utils.rand_name('smoke-address-scope'))
         name, pool_id = self._create_subnetpool(

diff --git a/neutron/tests/api/test_subnetpools_negative.py b/neutron/tests/api/test_subnetpools_negative.py
index 76e9ff51a474aaeda8d77640998eaca6f76e16fb..2823e504875286b8aa5302069b1933ddc9dc9af7 100644 (file)
--- a/neutron/tests/api/test_subnetpools_negative.py
+++ b/neutron/tests/api/test_subnetpools_negative.py
@@ -144,6 +144,7 @@ class SubnetPoolsNegativeTestJSON(base.BaseNetworkTest):
     @test.attr(type=['negative', 'smoke'])
     @test.idempotent_id('9589e332-638e-476e-81bd-013d964aa3cb')
     def test_create_subnetpool_associate_invalid_address_scope(self):
+        self.skipTest("until extension address-scope is re-enabled")
         subnetpool_data = copy.deepcopy(self._subnetpool_data)
         subnetpool_data['subnetpool']['address_scope_id'] = 'foo-addr-scope'
         self.assertRaises(lib_exc.BadRequest, self.client.create_subnetpool,
@@ -152,6 +153,7 @@ class SubnetPoolsNegativeTestJSON(base.BaseNetworkTest):
     @test.attr(type=['negative', 'smoke'])
     @test.idempotent_id('3b6c5942-485d-4964-a560-55608af020b5')
     def test_create_subnetpool_associate_non_exist_address_scope(self):
+        self.skipTest("until extension address-scope is re-enabled")
         subnetpool_data = copy.deepcopy(self._subnetpool_data)
         non_exist_address_scope_id = str(uuid.uuid4())
         subnetpool_data['subnetpool']['address_scope_id'] = (
@@ -162,6 +164,7 @@ class SubnetPoolsNegativeTestJSON(base.BaseNetworkTest):
     @test.attr(type=['negative', 'smoke'])
     @test.idempotent_id('2dfb4269-8657-485a-a053-b022e911456e')
     def test_create_subnetpool_associate_address_scope_prefix_intersect(self):
+        self.skipTest("until extension address-scope is re-enabled")
         address_scope = self.create_address_scope(
             name=data_utils.rand_name('smoke-address-scope'))
         addr_scope_id = address_scope['id']
@@ -178,6 +181,7 @@ class SubnetPoolsNegativeTestJSON(base.BaseNetworkTest):
     @test.attr(type=['negative', 'smoke'])
     @test.idempotent_id('83a19a13-5384-42e2-b579-43fc69c80914')
     def test_create_sp_associate_address_scope_multiple_prefix_intersect(self):
+        self.skipTest("until extension address-scope is re-enabled")
         address_scope = self.create_address_scope(
             name=data_utils.rand_name('smoke-address-scope'))
         addr_scope_id = address_scope['id']
@@ -198,6 +202,7 @@ class SubnetPoolsNegativeTestJSON(base.BaseNetworkTest):
     @test.attr(type=['negative', 'smoke'])
     @test.idempotent_id('f06d8e7b-908b-4e94-b570-8156be6a4bf1')
     def test_create_subnetpool_associate_address_scope_of_other_owner(self):
+        self.skipTest("until extension address-scope is re-enabled")
         address_scope = self.create_address_scope(
             name=data_utils.rand_name('smoke-address-scope'), is_admin=True)
         address_scope_id = address_scope['id']
@@ -209,6 +214,7 @@ class SubnetPoolsNegativeTestJSON(base.BaseNetworkTest):
     @test.attr(type=['negative', 'smoke'])
     @test.idempotent_id('3396ec6c-cb80-4ebe-b897-84e904580bdf')
     def test_tenant_create_subnetpool_associate_shared_address_scope(self):
+        self.skipTest("until extension address-scope is re-enabled")
         address_scope = self.create_address_scope(
             name=data_utils.rand_name('smoke-address-scope'), is_admin=True,
             shared=True)
@@ -221,6 +227,7 @@ class SubnetPoolsNegativeTestJSON(base.BaseNetworkTest):
     @test.attr(type='smoke')
     @test.idempotent_id('6d3d9ad5-32d4-4d63-aa00-8c62f73e2881')
     def test_update_subnetpool_associate_address_scope_of_other_owner(self):
+        self.skipTest("until extension address-scope is re-enabled")
         address_scope = self.create_address_scope(
             name=data_utils.rand_name('smoke-address-scope'), is_admin=True)
         address_scope_id = address_scope['id']
@@ -261,6 +268,7 @@ class SubnetPoolsNegativeTestJSON(base.BaseNetworkTest):
     @test.attr(type=['negative', 'smoke'])
     @test.idempotent_id('96006292-7214-40e0-a471-153fb76e6b31')
     def test_update_subnetpool_prefix_intersect(self):
+        self.skipTest("until extension address-scope is re-enabled")
         pool_1_prefix = [u'20.0.0.0/18']
         pool_2_prefix = [u'20.10.0.0/24']
         pool_1_updated_prefix = [u'20.0.0.0/12']
@@ -270,6 +278,7 @@ class SubnetPoolsNegativeTestJSON(base.BaseNetworkTest):
     @test.attr(type=['negative', 'smoke'])
     @test.idempotent_id('4d3f8a79-c530-4e59-9acf-6c05968adbfe')
     def test_update_subnetpool_multiple_prefix_intersect(self):
+        self.skipTest("until extension address-scope is re-enabled")
         pool_1_prefixes = [u'20.0.0.0/18', u'30.0.0.0/18']
         pool_2_prefixes = [u'20.10.0.0/24', u'40.0.0.0/18', '50.0.0.0/18']
         pool_1_updated_prefixes = [u'20.0.0.0/18', u'30.0.0.0/18',
@@ -280,6 +289,7 @@ class SubnetPoolsNegativeTestJSON(base.BaseNetworkTest):
     @test.attr(type=['negative', 'smoke'])
     @test.idempotent_id('7438e49e-1351-45d8-937b-892059fb97f5')
     def test_tenant_update_sp_prefix_associated_with_shared_addr_scope(self):
+        self.skipTest("until extension address-scope is re-enabled")
         address_scope = self.create_address_scope(
             name=data_utils.rand_name('smoke-address-scope'), is_admin=True,
             shared=True)