Merge "use default subnetpool api def from lib"

neutron/extensions/default_subnetpools.py

@@ -11,47 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron_lib.api import converters
-from neutron_lib.api.definitions import subnet as subnet_def
+from neutron_lib.api.definitions import default_subnetpools as api_def
 from neutron_lib.api import extensions
-from neutron_lib import constants
 
 
-EXTENDED_ATTRIBUTES_2_0 = {
-    subnet_def.COLLECTION_NAME: {
-        'use_default_subnetpool': {'allow_post': True,
-                                   'allow_put': False,
-                                   'default': False,
-                                   'convert_to': converters.convert_to_boolean,
-                                   'is_visible': False, },
-    },
-}
-
-
-class Default_subnetpools(extensions.ExtensionDescriptor):
+class Default_subnetpools(extensions.APIExtensionDescriptor):
     """Extension class supporting default subnetpools."""
-
-    @classmethod
-    def get_name(cls):
-        return "Default Subnetpools"
-
-    @classmethod
-    def get_alias(cls):
-        return "default-subnetpools"
-
-    @classmethod
-    def get_description(cls):
-        return "Provides ability to mark and use a subnetpool as the default"
-
-    @classmethod
-    def get_updated(cls):
-        return "2016-02-18T18:00:00-00:00"
-
-    def get_required_extensions(self):
-        return [constants.SUBNET_ALLOCATION_EXT_ALIAS]
-
-    def get_extended_resources(self, version):
-        if version == "2.0":
-            return EXTENDED_ATTRIBUTES_2_0
-        else:
-            return {}
+    api_definition = api_def

neutron/tests/unit/extensions/test_default_subnetpools.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 import netaddr
+from neutron_lib.api.definitions import default_subnetpools as api_def
 from neutron_lib import constants
 from oslo_config import cfg
 import webob.exc
@@ -41,7 +42,7 @@ class DefaultSubnetpoolsExtensionTestPlugin(
     """Test plugin to mixin the default subnet pools extension.
     """
 
-    supported_extension_aliases = ["default-subnetpools", "subnet_allocation"]
+    supported_extension_aliases = [api_def.ALIAS, "subnet_allocation"]
 
 
 class DefaultSubnetpoolsExtensionTestCase(