Merge "Add 'project_default' attribute to Network"
This commit is contained in:
commit
c9a094a9e6
|
@ -67,6 +67,7 @@ from neutron_lib.api.definitions import port_resource_request
|
|||
from neutron_lib.api.definitions import port_security
|
||||
from neutron_lib.api.definitions import portbindings
|
||||
from neutron_lib.api.definitions import portbindings_extended
|
||||
from neutron_lib.api.definitions import project_default_networks
|
||||
from neutron_lib.api.definitions import project_id
|
||||
from neutron_lib.api.definitions import provider_net
|
||||
from neutron_lib.api.definitions import qos
|
||||
|
@ -158,6 +159,7 @@ _ALL_API_DEFINITIONS = {
|
|||
port_security,
|
||||
portbindings,
|
||||
portbindings_extended,
|
||||
project_default_networks,
|
||||
project_id,
|
||||
provider_net,
|
||||
qos,
|
||||
|
|
|
@ -82,6 +82,7 @@ KNOWN_EXTENSIONS = (
|
|||
'availability_zone',
|
||||
'binding',
|
||||
'data-plane-status',
|
||||
'project-default-networks',
|
||||
'default-subnetpools',
|
||||
'dhcp_agent_scheduler',
|
||||
'dns-domain-ports',
|
||||
|
|
|
@ -0,0 +1,79 @@
|
|||
# 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.
|
||||
|
||||
from neutron_lib.api import converters
|
||||
from neutron_lib.api.definitions import network
|
||||
|
||||
|
||||
PROJECT_DEFAULT = 'project_default'
|
||||
|
||||
# The alias of the extension.
|
||||
ALIAS = 'project-default-networks'
|
||||
|
||||
# Whether or not this extension is simply signaling behavior to the user
|
||||
# or it actively modifies the attribute map.
|
||||
IS_SHIM_EXTENSION = False
|
||||
|
||||
# Whether the extension is marking the adoption of standardattr model for
|
||||
# legacy resources, or introducing new standardattr attributes. False or
|
||||
# None if the standardattr model is adopted since the introduction of
|
||||
# resource extension.
|
||||
# If this is True, the alias for the extension should be prefixed with
|
||||
# 'standard-attr-'.
|
||||
IS_STANDARD_ATTR_EXTENSION = False
|
||||
|
||||
# The name of the extension.
|
||||
NAME = 'Default network for project'
|
||||
|
||||
# The description of the extension.
|
||||
DESCRIPTION = "Support specifying networks as default networks for projects"
|
||||
|
||||
# A timestamp of when the extension was introduced.
|
||||
UPDATED_TIMESTAMP = "2018-07-03T10:00:00-00:00"
|
||||
|
||||
# The name of the resource introduced or being extended.
|
||||
RESOURCE_NAME = network.RESOURCE_NAME
|
||||
|
||||
# The plural for the resource introduced or being extended.
|
||||
COLLECTION_NAME = network.COLLECTION_NAME
|
||||
|
||||
# The resource attribute map for the extension.
|
||||
RESOURCE_ATTRIBUTE_MAP = {
|
||||
COLLECTION_NAME: {
|
||||
PROJECT_DEFAULT: {
|
||||
'allow_post': True, 'allow_put': True,
|
||||
'default': False,
|
||||
'convert_to': converters.convert_to_boolean,
|
||||
'is_visible': True
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# The subresource attribute map for the extension.
|
||||
SUB_RESOURCE_ATTRIBUTE_MAP = {
|
||||
}
|
||||
|
||||
# The action map.
|
||||
ACTION_MAP = {
|
||||
}
|
||||
|
||||
# The action status.
|
||||
ACTION_STATUS = {
|
||||
}
|
||||
|
||||
# The list of required extensions.
|
||||
REQUIRED_EXTENSIONS = [
|
||||
]
|
||||
|
||||
# The list of optional extensions.
|
||||
OPTIONAL_EXTENSIONS = [
|
||||
]
|
|
@ -0,0 +1,21 @@
|
|||
# Copyright (c) 2017 NEC Corporation. All rights reserved.
|
||||
#
|
||||
# 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.
|
||||
|
||||
from neutron_lib.api.definitions import project_default_networks as dn
|
||||
from neutron_lib.tests.unit.api.definitions import base
|
||||
|
||||
|
||||
class DefaultNetworksDefinitionTestCase(base.DefinitionBaseTestCase):
|
||||
extension_module = dn
|
||||
extension_attributes = (dn.PROJECT_DEFAULT,)
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
The ``project-default-networks`` extension is now available and adds a new
|
||||
attribute ``project_default`` into the ``network`` resource.
|
||||
This attribute will be used to indicate if a network is a project
|
||||
default network.
|
Loading…
Reference in New Issue