openstack
/
neutron
Code Issues Proposed changes

use default subnetpool api def from lib 

The default subnetpools extension's API definition was added to
neutron-lib with Ib841f3727e758c0c19c9a4a0acd221ecb4081313. This patch
consumes the API definition from lib.

NeutronLibImpact

Change-Id: I48a1a637e9c45499916ade61cc9f38de3278e67e
changes/46/513846/1
Boden R 2017-10-20 14:44:10 -06:00
parent 98cfd561de
commit 2c52a790a4
2 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
neutron/extensions/default_subnetpools.py
View File

@ -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

3
neutron/tests/unit/extensions/test_default_subnetpools.py
View File

@ -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(