openstack/nova
Code Issues Proposed changes

Move config options from nova/api directory (5)

Browse Source 
This is the fifth and final patch moving config options from the
nova/api directory. In this patch, the deprecated options from the
legacy_v2 directory have been moved to nova/conf/legacy_v2.py. A
subsequent patch will enhance the help text for these options.

Blueprint centralize-config-options-newton

Change-Id: I3fdff0d3c0c2f36155ad4f7060395e788b78d150
This commit is contained in:
EdLeafe
2016-04-21 15:53:54 +00:00
parent e9a3bca866
commit b6dd96c342
84 changed files with 193 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/api/openstack/compute/legacy_v2/contrib/__init__.py
View File

@@ -19,24 +19,12 @@ It can't be called 'extensions' because that causes namespacing problems.
""" """
from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from nova.api.openstack import extensions from nova.api.openstack import extensions
import nova.conf
ext_opts = [ CONF = nova.conf.CONF
cfg.ListOpt('osapi_compute_ext_list',
default=[],
help='DEPRECATED: Specify list of extensions to load when '
'using osapi_compute_extension option with nova.api.'
'openstack.compute.legacy_v2.contrib.select_extensions '
'This option will be removed in the near future. '
'After that point you have to run all of the API.',
deprecated_for_removal=True),
]
CONF = cfg.CONF
CONF.register_opts(ext_opts)
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

15
nova/api/openstack/compute/legacy_v2/extensions.py
View File

@@ -13,27 +13,16 @@
# 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 oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from nova.api.openstack import extensions as base_extensions from nova.api.openstack import extensions as base_extensions
import nova.conf
from nova.i18n import _LW from nova.i18n import _LW
STANDARD_EXTENSIONS = ('nova.api.openstack.compute.legacy_v2.contrib.' + STANDARD_EXTENSIONS = ('nova.api.openstack.compute.legacy_v2.contrib.' +
'standard_extensions') 'standard_extensions')
ext_opts = [ CONF = nova.conf.CONF
cfg.MultiStrOpt(
'osapi_compute_extension',
default=[STANDARD_EXTENSIONS],
help='osapi compute extension to load. '
'This option will be removed in the near future. '
'After that point you have to run all of the API.',
deprecated_for_removal=True),
]
CONF = cfg.CONF
CONF.register_opts(ext_opts)
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

26
nova/api/opts.py
View File

@@ -1,26 +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.
import itertools
import nova.api.openstack.compute.legacy_v2.contrib
import nova.api.openstack.compute.legacy_v2.extensions
def list_opts():
return [
('DEFAULT',
itertools.chain(
nova.api.openstack.compute.legacy_v2.contrib.ext_opts,
nova.api.openstack.compute.legacy_v2.extensions.ext_opts,
)),
]

4
nova/conf/__init__.py
View File

@@ -53,7 +53,7 @@ from nova.conf import ipv6
from nova.conf import ironic from nova.conf import ironic
from nova.conf import key_manager from nova.conf import key_manager
# from nova.conf import keystone_authtoken # from nova.conf import keystone_authtoken
# from nova.conf import legacy_api from nova.conf import legacy_api
from nova.conf import libvirt from nova.conf import libvirt
from nova.conf import mks from nova.conf import mks
# from nova.conf import matchmaker_redis # from nova.conf import matchmaker_redis
@@ -128,7 +128,7 @@ ipv6.register_opts(CONF)
ironic.register_opts(CONF) ironic.register_opts(CONF)
key_manager.register_opts(CONF) key_manager.register_opts(CONF)
# keystone_authtoken.register_opts(CONF) # keystone_authtoken.register_opts(CONF)
# legacy_api.register_opts(CONF) legacy_api.register_opts(CONF)
libvirt.register_opts(CONF) libvirt.register_opts(CONF)
# matchmaker_redis.register_opts(CONF) # matchmaker_redis.register_opts(CONF)
# metadata.register_opts(CONF) # metadata.register_opts(CONF)

47
nova/conf/legacy_api.py Normal file
View File

@@ -0,0 +1,47 @@
# Copyright 2015 OpenStack Foundation
# 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 oslo_config import cfg
STANDARD_EXTENSIONS = ('nova.api.openstack.compute.legacy_v2.contrib.' +
'standard_extensions')
osapi_ext_list_opt = cfg.ListOpt('osapi_compute_ext_list',
default=[],
help='DEPRECATED: Specify list of extensions to load when '
'using osapi_compute_extension option with nova.api.'
'openstack.compute.legacy_v2.contrib.select_extensions '
'This option will be removed in the near future. '
'After that point you have to run all of the API.',
deprecated_for_removal=True)
osapi_comp_ext_opt = cfg.MultiStrOpt(
'osapi_compute_extension',
default=[STANDARD_EXTENSIONS],
help='The osapi compute extension to load. '
'This option will be removed in the near future. '
'After that point you have to run all of the API.',
deprecated_for_removal=True)
ALL_OPTS = [osapi_ext_list_opt] + [osapi_comp_ext_opt]
def register_opts(conf):
conf.register_opt(osapi_ext_list_opt)
conf.register_opt(osapi_comp_ext_opt)
def list_opts():
return {"DEFAULT": ALL_OPTS}

2
nova/tests/functional/api_sample_tests/api_sample_base.py
View File

@@ -25,8 +25,6 @@ from nova.tests.unit import fake_network
from nova.tests.unit import fake_utils from nova.tests.unit import fake_utils
CONF = nova.conf.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
# API samples heavily uses testscenarios. This allows us to use the # API samples heavily uses testscenarios. This allows us to use the
# same tests, with slight variations in configuration to ensure our # same tests, with slight variations in configuration to ensure our

7
nova/tests/functional/api_sample_tests/test_access_ips.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_admin_actions.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class AdminActionsSamplesJsonTest(test_servers.ServersSampleBase): class AdminActionsSamplesJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_admin_password.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class AdminPasswordJsonTest(test_servers.ServersSampleBase): class AdminPasswordJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_agents.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.db.sqlalchemy import models from nova.db.sqlalchemy import models
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class AgentsJsonTest(api_sample_base.ApiSampleTestBaseV21): class AgentsJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_aggregates.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_assisted_volume_snapshots.py
View File

@@ -12,14 +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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.api.openstack import fakes from nova.tests.unit.api.openstack import fakes
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class AssistedVolumeSnapshotsJsonTests(test_servers.ServersSampleBase): class AssistedVolumeSnapshotsJsonTests(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_attach_interfaces.py
View File

@@ -13,16 +13,13 @@
# 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 oslo_config import cfg import nova.conf
from nova import exception from nova import exception
from nova.network import api as network_api from nova.network import api as network_api
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit import fake_network_cache_model from nova.tests.unit import fake_network_cache_model
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class AttachInterfacesSampleJsonTest(test_servers.ServersSampleBase): class AttachInterfacesSampleJsonTest(test_servers.ServersSampleBase):

2
nova/tests/functional/api_sample_tests/test_availability_zone.py
View File

@@ -16,8 +16,6 @@ import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = nova.conf.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class AvailabilityZoneJsonTest(test_servers.ServersSampleBase): class AvailabilityZoneJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_baremetal_nodes.py
View File

@@ -14,13 +14,10 @@
import mock import mock
from oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FakeNode(object): class FakeNode(object):

7
nova/tests/functional/api_sample_tests/test_block_device_mapping_boot.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.api.openstack import fakes from nova.tests.unit.api.openstack import fakes
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class BlockDeviceMappingV1BootJsonTest(test_servers.ServersSampleBase): class BlockDeviceMappingV1BootJsonTest(test_servers.ServersSampleBase):

2
nova/tests/functional/api_sample_tests/test_cells.py
View File

@@ -23,8 +23,6 @@ from nova import exception
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = nova.conf.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class CellsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class CellsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_certificates.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit import fake_crypto from nova.tests.unit import fake_crypto
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class CertificatesSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): class CertificatesSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_cloudpipe.py
View File

@@ -14,16 +14,13 @@
import uuid as uuid_lib import uuid as uuid_lib
from oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('vpn_image_id', 'nova.cloudpipe.pipelib') CONF.import_opt('vpn_image_id', 'nova.cloudpipe.pipelib')
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class CloudPipeSampleTest(api_sample_base.ApiSampleTestBaseV21): class CloudPipeSampleTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_config_drive.py
View File

@@ -13,15 +13,12 @@
# 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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.api.openstack import fakes from nova.tests.unit.api.openstack import fakes
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ConfigDriveSampleJsonTest(test_servers.ServersSampleBase): class ConfigDriveSampleJsonTest(test_servers.ServersSampleBase):

6
nova/tests/functional/api_sample_tests/test_console_auth_tokens.py
View File

@@ -14,14 +14,12 @@
import re import re
from oslo_config import cfg
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ConsoleAuthTokensSampleJsonTests(test_servers.ServersSampleBase): class ConsoleAuthTokensSampleJsonTests(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_console_output.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ConsoleOutputSampleJsonTest(test_servers.ServersSampleBase): class ConsoleOutputSampleJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_create_backup.py
View File

@@ -13,16 +13,13 @@
# 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 oslo_config import cfg
import mock import mock
import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class CreateBackupSamplesJsonTest(test_servers.ServersSampleBase): class CreateBackupSamplesJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_deferred_delete.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class DeferredDeleteSampleJsonTests(test_servers.ServersSampleBase): class DeferredDeleteSampleJsonTests(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_disk_config.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class DiskConfigJsonTest(test_servers.ServersSampleBase): class DiskConfigJsonTest(test_servers.ServersSampleBase):

6
nova/tests/functional/api_sample_tests/test_evacuate.py
View File

@@ -14,13 +14,11 @@
# under the License. # under the License.
import mock import mock
from oslo_config import cfg
import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class EvacuateJsonTest(test_servers.ServersSampleBase): class EvacuateJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_extended_availability_zone.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ExtendedAvailabilityZoneJsonTests(test_servers.ServersSampleBase): class ExtendedAvailabilityZoneJsonTests(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_extended_server_attributes.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ExtendedServerAttributesJsonTest(test_servers.ServersSampleBase): class ExtendedServerAttributesJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_extended_status.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ExtendedStatusSampleJsonTests(test_servers.ServersSampleBase): class ExtendedStatusSampleJsonTests(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_extended_volumes.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.api.openstack import fakes from nova.tests.unit.api.openstack import fakes
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ExtendedVolumesSampleJsonTests(test_servers.ServersSampleBase): class ExtendedVolumesSampleJsonTests(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_fixed_ips.py
View File

@@ -12,16 +12,13 @@
# 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 oslo_config import cfg import nova.conf
from nova import exception from nova import exception
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.objects import test_network from nova.tests.unit.objects import test_network
from nova.tests.unit import utils as test_utils from nova.tests.unit import utils as test_utils
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FixedIpTest(test_servers.ServersSampleBase): class FixedIpTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_flavor_access.py
View File

@@ -12,13 +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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FlavorAccessTestsBase(api_sample_base.ApiSampleTestBaseV21): class FlavorAccessTestsBase(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FlavorExtraSpecsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): class FlavorExtraSpecsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_flavor_manage.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FlavorManageSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): class FlavorManageSampleJsonTests(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_flavor_rxtx.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FlavorRxtxJsonTest(api_sample_base.ApiSampleTestBaseV21): class FlavorRxtxJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_flavors.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FlavorsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class FlavorsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_floating_ip_dns.py
View File

@@ -12,13 +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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FloatingIpDNSTest(api_sample_base.ApiSampleTestBaseV21): class FloatingIpDNSTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_floating_ip_pools.py
View File

@@ -12,13 +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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FloatingIPPoolsSampleTests(api_sample_base.ApiSampleTestBaseV21): class FloatingIPPoolsSampleTests(api_sample_base.ApiSampleTestBaseV21):

2
nova/tests/functional/api_sample_tests/test_floating_ips.py
View File

@@ -18,8 +18,6 @@ from nova import context
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = nova.conf.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FloatingIpsTest(api_sample_base.ApiSampleTestBaseV21): class FloatingIpsTest(api_sample_base.ApiSampleTestBaseV21):

2
nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py
View File

@@ -18,8 +18,6 @@ from nova import context
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = nova.conf.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FloatingIpsBulkTest(api_sample_base.ApiSampleTestBaseV21): class FloatingIpsBulkTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_fping.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.api.openstack.compute import test_fping from nova.tests.unit.api.openstack.compute import test_fping
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class FpingSampleJsonTests(test_servers.ServersSampleBase): class FpingSampleJsonTests(test_servers.ServersSampleBase):

2
nova/tests/functional/api_sample_tests/test_hide_server_addresses.py
View File

@@ -18,8 +18,6 @@ import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = nova.conf.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServersSampleHideAddressesJsonTest(test_servers.ServersSampleJsonTest): class ServersSampleHideAddressesJsonTest(test_servers.ServersSampleJsonTest):

7
nova/tests/functional/api_sample_tests/test_hosts.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class HostsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class HostsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

6
nova/tests/functional/api_sample_tests/test_hypervisors.py
View File

@@ -14,15 +14,13 @@
# under the License. # under the License.
import mock import mock
from oslo_config import cfg
from nova.cells import utils as cells_utils from nova.cells import utils as cells_utils
import nova.conf
from nova import objects from nova import objects
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class HypervisorsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): class HypervisorsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_images.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ImagesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class ImagesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

6
nova/tests/functional/api_sample_tests/test_instance_actions.py
View File

@@ -15,17 +15,15 @@
import copy import copy
from oslo_config import cfg
import six import six
import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit import fake_instance from nova.tests.unit import fake_instance
from nova.tests.unit import fake_server_actions from nova.tests.unit import fake_server_actions
from nova.tests.unit import utils as test_utils from nova.tests.unit import utils as test_utils
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServerActionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class ServerActionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py
View File

@@ -15,13 +15,10 @@
import urllib import urllib
from oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class InstanceUsageAuditLogJsonTest(api_sample_base.ApiSampleTestBaseV21): class InstanceUsageAuditLogJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_keypairs.py
View File

@@ -15,15 +15,12 @@
import uuid import uuid
from oslo_config import cfg import nova.conf
from nova.objects import keypair as keypair_obj from nova.objects import keypair as keypair_obj
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit import fake_crypto from nova.tests.unit import fake_crypto
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_limits.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class LimitsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class LimitsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_lock_server.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class LockServerSamplesJsonTest(test_servers.ServersSampleBase): class LockServerSamplesJsonTest(test_servers.ServersSampleBase):

6
nova/tests/functional/api_sample_tests/test_migrate_server.py
View File

@@ -14,14 +14,12 @@
# under the License. # under the License.
import mock import mock
from oslo_config import cfg
from oslo_utils import versionutils from oslo_utils import versionutils
import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class MigrateServerSamplesJsonTest(test_servers.ServersSampleBase): class MigrateServerSamplesJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_migrations.py
View File

@@ -15,15 +15,12 @@
import datetime import datetime
from oslo_config import cfg import nova.conf
from nova import context from nova import context
from nova import objects from nova import objects
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
# NOTE(ShaoHe Feng) here I can not use uuidsentinel, it generate a random # NOTE(ShaoHe Feng) here I can not use uuidsentinel, it generate a random

7
nova/tests/functional/api_sample_tests/test_multinic.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class MultinicSampleJsonTest(test_servers.ServersSampleBase): class MultinicSampleJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_multiple_create.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class MultipleCreateJsonTest(test_servers.ServersSampleBase): class MultipleCreateJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_networks.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit.api.openstack.compute import test_networks from nova.tests.unit.api.openstack.compute import test_networks
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class NetworksJsonTests(api_sample_base.ApiSampleTestBaseV21): class NetworksJsonTests(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_networks_associate.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class NetworksAssociateJsonTests(api_sample_base.ApiSampleTestBaseV21): class NetworksAssociateJsonTests(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_pause_server.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class PauseServerSamplesJsonTest(test_servers.ServersSampleBase): class PauseServerSamplesJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_preserve_ephemeral_rebuild.py
View File

@@ -12,15 +12,12 @@
# 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 oslo_config import cfg
from nova.compute import api as compute_api from nova.compute import api as compute_api
import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class PreserveEphemeralOnRebuildJsonTest(test_servers.ServersSampleBase): class PreserveEphemeralOnRebuildJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_quota_classes.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class QuotaClassesSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): class QuotaClassesSampleJsonTests(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_quota_sets.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class QuotaSetsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): class QuotaSetsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_remote_consoles.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ConsolesSampleJsonTests(test_servers.ServersSampleBase): class ConsolesSampleJsonTests(test_servers.ServersSampleBase):

8
nova/tests/functional/api_sample_tests/test_rescue.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = nova.conf.CONF
CONF = cfg.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class RescueJsonTest(test_servers.ServersSampleBase): class RescueJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_scheduler_hints.py
View File

@@ -15,14 +15,11 @@
import uuid import uuid
from oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class SchedulerHintsJsonTest(api_sample_base.ApiSampleTestBaseV21): class SchedulerHintsJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_security_group_default_rules.py
View File

@@ -12,13 +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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class SecurityGroupDefaultRulesSampleJsonTest( class SecurityGroupDefaultRulesSampleJsonTest(

7
nova/tests/functional/api_sample_tests/test_security_groups.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
import nova.tests.functional.api_samples_test_base as astb import nova.tests.functional.api_samples_test_base as astb
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
def fake_get(*args, **kwargs): def fake_get(*args, **kwargs):

7
nova/tests/functional/api_sample_tests/test_server_diagnostics.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServerDiagnosticsSamplesJsonTest(test_servers.ServersSampleBase): class ServerDiagnosticsSamplesJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_server_external_events.py
View File

@@ -12,13 +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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServerExternalEventsSamplesJsonTest(test_servers.ServersSampleBase): class ServerExternalEventsSamplesJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_server_groups.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServerGroupsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class ServerGroupsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_server_metadata.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServersMetadataJsonTest(test_servers.ServersSampleBase): class ServersMetadataJsonTest(test_servers.ServersSampleBase):

6
nova/tests/functional/api_sample_tests/test_server_password.py
View File

@@ -13,13 +13,11 @@
# under the License. # under the License.
import mock import mock
from oslo_config import cfg
import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServerPasswordSampleJsonTests(test_servers.ServersSampleBase): class ServerPasswordSampleJsonTests(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_server_usage.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServerUsageSampleJsonTest(test_servers.ServersSampleBase): class ServerUsageSampleJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_servers.py
View File

@@ -13,14 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21): class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_servers_ips.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServersIpsJsonTest(test_servers.ServersSampleBase): class ServersIpsJsonTest(test_servers.ServersSampleBase):

6
nova/tests/functional/api_sample_tests/test_services.py
View File

@@ -13,16 +13,14 @@
# 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 oslo_config import cfg
from oslo_utils import fixture as utils_fixture from oslo_utils import fixture as utils_fixture
import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit.api.openstack.compute import test_services from nova.tests.unit.api.openstack.compute import test_services
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ServicesJsonTest(api_sample_base.ApiSampleTestBaseV21): class ServicesJsonTest(api_sample_base.ApiSampleTestBaseV21):

2
nova/tests/functional/api_sample_tests/test_shelve.py
View File

@@ -18,8 +18,6 @@ import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = nova.conf.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class ShelveJsonTest(test_servers.ServersSampleBase): class ShelveJsonTest(test_servers.ServersSampleBase):

6
nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py
View File

@@ -15,15 +15,13 @@
import datetime import datetime
import urllib import urllib
from oslo_config import cfg
from oslo_utils import timeutils from oslo_utils import timeutils
import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
import nova.tests.functional.api_samples_test_base as astb import nova.tests.functional.api_samples_test_base as astb
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class SimpleTenantUsageSampleJsonTest(test_servers.ServersSampleBase): class SimpleTenantUsageSampleJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_suspend_server.py
View File

@@ -12,13 +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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class SuspendServerSamplesJsonTest(test_servers.ServersSampleBase): class SuspendServerSamplesJsonTest(test_servers.ServersSampleBase):

9
nova/tests/functional/api_sample_tests/test_tenant_networks.py
View File

@@ -14,17 +14,12 @@
# under the License. # under the License.
from oslo_config import cfg
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('enable_network_quota',
'nova.api.openstack.compute.legacy_v2.contrib.'
'os_tenant_networks')
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class TenantNetworksJsonTests(api_sample_base.ApiSampleTestBaseV21): class TenantNetworksJsonTests(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_used_limits.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class UsedLimitsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): class UsedLimitsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21):

6
nova/tests/functional/api_sample_tests/test_user_data.py
View File

@@ -14,14 +14,12 @@
# under the License. # under the License.
import base64 import base64
from oslo_config import cfg
import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit.image import fake from nova.tests.unit.image import fake
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class UserDataJsonTest(api_sample_base.ApiSampleTestBaseV21): class UserDataJsonTest(api_sample_base.ApiSampleTestBaseV21):

7
nova/tests/functional/api_sample_tests/test_virtual_interfaces.py
View File

@@ -13,13 +13,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 oslo_config import cfg import nova.conf
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class VirtualInterfacesJsonTest(test_servers.ServersSampleBase): class VirtualInterfacesJsonTest(test_servers.ServersSampleBase):

7
nova/tests/functional/api_sample_tests/test_volumes.py
View File

@@ -13,10 +13,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 oslo_config import cfg
import datetime import datetime
import nova.conf
from nova import context from nova import context
from nova import objects from nova import objects
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
@@ -25,9 +24,7 @@ from nova.tests.unit.api.openstack import fakes
from nova.tests.unit import fake_block_device from nova.tests.unit import fake_block_device
from nova.tests.unit import fake_instance from nova.tests.unit import fake_instance
CONF = cfg.CONF CONF = nova.conf.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.legacy_v2.extensions')
class SnapshotsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): class SnapshotsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21):

5
nova/tests/unit/api/openstack/compute/test_server_password.py
View File

@@ -15,8 +15,6 @@
import mock import mock
from oslo_config import cfg
from nova.api.metadata import password from nova.api.metadata import password
from nova.api.openstack.compute import server_password \ from nova.api.openstack.compute import server_password \
as server_password_v21 as server_password_v21
@@ -27,9 +25,6 @@ from nova.tests.unit.api.openstack import fakes
from nova.tests.unit import fake_instance from nova.tests.unit import fake_instance
CONF = cfg.CONF
class ServerPasswordTestV21(test.NoDBTestCase): class ServerPasswordTestV21(test.NoDBTestCase):
content_type = 'application/json' content_type = 'application/json'
server_password = server_password_v21 server_password = server_password_v21

1
setup.cfg
View File

@@ -28,7 +28,6 @@ packages =
oslo.config.opts = oslo.config.opts =
nova = nova.opts:list_opts nova = nova.opts:list_opts
nova.conf = nova.conf.opts:list_opts nova.conf = nova.conf.opts:list_opts
nova.api = nova.api.opts:list_opts
nova.cells = nova.cells.opts:list_opts nova.cells = nova.cells.opts:list_opts
nova.compute = nova.compute.opts:list_opts nova.compute = nova.compute.opts:list_opts
nova.network.neutronv2 = nova.network.neutronv2.api:list_opts nova.network.neutronv2 = nova.network.neutronv2.api:list_opts