From 27b2d05435c9250f6aa36fdfc1be806fcaa646d7 Mon Sep 17 00:00:00 2001 From: Boden R Date: Wed, 8 Nov 2017 11:22:21 -0700 Subject: [PATCH] use network az api def from neutron-lib The network availability zone extension's API definition was rehomed into neutron-lib with commit I1d4ded9959c05c65b04b118b1c31b8e6db652e67 This patch consumes the API definition by removing the code now living in neutron and using the APIExtensionDescriptor parent class for the extension. NeutronLibImpact Change-Id: Iaefc875091e17527e8721539d051606c496f985f --- .../extensions/network_availability_zone.py | 40 ++----------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/neutron/extensions/network_availability_zone.py b/neutron/extensions/network_availability_zone.py index 98998f2c19b..111eb3a44f5 100644 --- a/neutron/extensions/network_availability_zone.py +++ b/neutron/extensions/network_availability_zone.py @@ -14,49 +14,15 @@ import abc -from neutron_lib.api.definitions import availability_zone as az_def +from neutron_lib.api.definitions import network_availability_zone as apidef from neutron_lib.api import extensions import six -EXTENDED_ATTRIBUTES_2_0 = { - 'networks': { - az_def.COLLECTION_NAME: {'allow_post': False, 'allow_put': False, - 'is_visible': True}, - az_def.AZ_HINTS: { - 'allow_post': True, 'allow_put': False, 'is_visible': True, - 'validate': {'type:availability_zone_hint_list': None}, - 'default': []}}, -} - - -class Network_availability_zone(extensions.ExtensionDescriptor): +class Network_availability_zone(extensions.APIExtensionDescriptor): """Network availability zone extension.""" - @classmethod - def get_name(cls): - return "Network Availability Zone" - - @classmethod - def get_alias(cls): - return "network_availability_zone" - - @classmethod - def get_description(cls): - return "Availability zone support for network." - - @classmethod - def get_updated(cls): - return "2015-01-01T10:00:00-00:00" - - def get_required_extensions(self): - return ["availability_zone"] - - def get_extended_resources(self, version): - if version == "2.0": - return EXTENDED_ATTRIBUTES_2_0 - else: - return {} + api_definition = apidef @six.add_metaclass(abc.ABCMeta)