From 73d291af707e1f9ba5766a3942c029ff52bc204b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Mon, 18 Mar 2019 22:43:27 +0100 Subject: [PATCH] Remove local segment-peer-subnet host-route apidef A version of neutron lib with this api defenition is now available. Remove the local implementation and use the one in neutron-lib. Change-Id: I385eeb81929c6e8a799f9029220ed9f7ab642cad --- .../_segments_peer_subnet_host_routes_lib.py | 32 ------------------- .../segments_peer_subnet_host_routes.py | 4 +-- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 neutron/extensions/_segments_peer_subnet_host_routes_lib.py diff --git a/neutron/extensions/_segments_peer_subnet_host_routes_lib.py b/neutron/extensions/_segments_peer_subnet_host_routes_lib.py deleted file mode 100644 index d0e53bb2ad5..00000000000 --- a/neutron/extensions/_segments_peer_subnet_host_routes_lib.py +++ /dev/null @@ -1,32 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -TODO(hjensas): This module should be deleted once neutron-lib containing -Change-Id: Ibd1b565a04a6d979b6e56ca5469af644894d6b4c is released. -""" - -from neutron_lib.api.definitions import segment - - -ALIAS = 'segments-peer-subnet-host-routes' -IS_SHIM_EXTENSION = True -IS_STANDARD_ATTR_EXTENSION = False -NAME = 'Segments peer-subnet host routes' -DESCRIPTION = 'Add host routes to subnets on a routed network (segments)' -UPDATED_TIMESTAMP = '2018-06-12T10:00:00-00:00' -RESOURCE_ATTRIBUTE_MAP = {} -SUB_RESOURCE_ATTRIBUTE_MAP = {} -ACTION_MAP = {} -REQUIRED_EXTENSIONS = [segment.ALIAS] -OPTIONAL_EXTENSIONS = [] -ACTION_STATUS = {} diff --git a/neutron/extensions/segments_peer_subnet_host_routes.py b/neutron/extensions/segments_peer_subnet_host_routes.py index 32855e79628..61d81be9d71 100644 --- a/neutron/extensions/segments_peer_subnet_host_routes.py +++ b/neutron/extensions/segments_peer_subnet_host_routes.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. -from neutron.extensions import _segments_peer_subnet_host_routes_lib as apidef +from neutron_lib.api.definitions import segments_peer_subnet_host_routes from neutron_lib.api import extensions class Segments_peer_subnet_host_routes(extensions.APIExtensionDescriptor): - api_definition = apidef + api_definition = segments_peer_subnet_host_routes