Use ExtensionDescriptor from neutron-lib

ExtensionDescriptor has been rehomed to neutron-lib and is being
removed from neutron core.

See https://review.openstack.org/398113

Depends-On: I5a111e0033e518e39b3042f047ee9eebba77a0d5

Change-Id: I0f8b11bebed9bbb06273c0f9257ec1916e0201ea
This commit is contained in:
Henry Gessau 2016-11-25 16:01:33 -05:00 committed by Gary Kotton
parent f9c790b423
commit 37487161bd
16 changed files with 22 additions and 21 deletions

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.api import extensions from neutron_lib.api import extensions
# Attribute Map # Attribute Map
ADV_SERVICE_PROVIDERS = 'advanced_service_providers' ADV_SERVICE_PROVIDERS = 'advanced_service_providers'

View File

@ -15,11 +15,9 @@
# under the License. # under the License.
# #
from neutron_lib.api import extensions
from neutron_lib.db import constants as db_const from neutron_lib.db import constants as db_const
from neutron.api import extensions
# The attributes map is here for 2 reasons: # The attributes map is here for 2 reasons:
# 1) allow posting id for the different objects we are importing # 1) allow posting id for the different objects we are importing
# 2) make sure security-group named 'default' is also copied # 2) make sure security-group named 'default' is also copied

View File

@ -12,8 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.api import extensions from neutron_lib.api import extensions
from neutron_lib import constants from neutron_lib import constants
DHCP_MTU = 'dhcp_mtu' DHCP_MTU = 'dhcp_mtu'

View File

@ -14,8 +14,7 @@
import re import re
from neutron.api import extensions from neutron_lib.api import extensions
from neutron_lib.api import validators from neutron_lib.api import validators
from neutron_lib import constants from neutron_lib import constants
from neutron_lib.db import constants as db_const from neutron_lib.db import constants as db_const

View File

@ -16,6 +16,8 @@
# #
from neutron.api import extensions from neutron.api import extensions
from neutron.api.v2 import base from neutron.api.v2 import base
from neutron_lib.api import extensions as api_extensions
from neutron_lib.plugins import directory from neutron_lib.plugins import directory
@ -36,7 +38,7 @@ RESOURCE_ATTRIBUTE_MAP = {
} }
class Lsn(extensions.ExtensionDescriptor): class Lsn(api_extensions.ExtensionDescriptor):
"""Enable LSN configuration for Neutron NSX networks.""" """Enable LSN configuration for Neutron NSX networks."""
@classmethod @classmethod

View File

@ -12,9 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.api import extensions
from neutron_lib.api import converters from neutron_lib.api import converters
from neutron_lib.api import extensions
from neutron_lib import constants from neutron_lib import constants

View File

@ -17,9 +17,9 @@ import abc
from oslo_config import cfg from oslo_config import cfg
from neutron.api import extensions
from neutron.api.v2 import resource_helper from neutron.api.v2 import resource_helper
from neutron_lib.api import extensions
from neutron_lib.api import validators from neutron_lib.api import validators
from neutron_lib import constants from neutron_lib import constants
from neutron_lib.db import constants as db_const from neutron_lib.db import constants as db_const

View File

@ -15,8 +15,8 @@
import abc import abc
from neutron.api import extensions
from neutron.api.v2 import resource_helper from neutron.api.v2 import resource_helper
from neutron_lib.api import extensions
from neutron_lib import exceptions as nexception from neutron_lib import exceptions as nexception
from vmware_nsx._i18n import _ from vmware_nsx._i18n import _

View File

@ -12,9 +12,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.api import extensions
from neutron.extensions import securitygroup from neutron.extensions import securitygroup
from neutron_lib.api import converters from neutron_lib.api import converters
from neutron_lib.api import extensions
from neutron_lib import constants from neutron_lib import constants
from neutron_lib import exceptions as nexception from neutron_lib import exceptions as nexception

View File

@ -20,6 +20,7 @@ from neutron.api import extensions
from neutron.api.v2 import base from neutron.api.v2 import base
from neutron_lib.api import converters from neutron_lib.api import converters
from neutron_lib.api import extensions as api_extensions
from neutron_lib.db import constants as db_const from neutron_lib.db import constants as db_const
from neutron_lib import exceptions as nexception from neutron_lib import exceptions as nexception
from neutron_lib.plugins import directory from neutron_lib.plugins import directory
@ -166,7 +167,7 @@ EXTENDED_ATTRIBUTES_2_0 = {
} }
class Qos_queue(extensions.ExtensionDescriptor): class Qos_queue(api_extensions.ExtensionDescriptor):
"""Port Queue extension.""" """Port Queue extension."""
@classmethod @classmethod

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.api import extensions from neutron_lib.api import extensions
from neutron_lib import constants from neutron_lib import constants

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.api import extensions from neutron_lib.api import extensions
from neutron_lib import constants from neutron_lib import constants

View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.api import extensions
from neutron.extensions import securitygroup from neutron.extensions import securitygroup
from neutron_lib.api import extensions
from neutron_lib import constants from neutron_lib import constants
LOCAL_IP_PREFIX = 'local_ip_prefix' LOCAL_IP_PREFIX = 'local_ip_prefix'

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.api import extensions
from neutron_lib.api import converters from neutron_lib.api import converters
from neutron_lib.api import extensions
LOGGING = 'logging' LOGGING = 'logging'

View File

@ -12,9 +12,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.api import extensions from neutron_lib.api import extensions
from neutron_lib import exceptions as nexception from neutron_lib import exceptions as nexception
from vmware_nsx._i18n import _
POLICY = 'policy' POLICY = 'policy'
RESOURCE_ATTRIBUTE_MAP = { RESOURCE_ATTRIBUTE_MAP = {

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.api import extensions
from neutron_lib.api import converters from neutron_lib.api import converters
from neutron_lib.api import extensions
# Attribute Map # Attribute Map
VNIC_INDEX = 'vnic_index' VNIC_INDEX = 'vnic_index'