diff --git a/nova/api/openstack/compute/access_ips.py b/nova/api/openstack/compute/access_ips.py index fb67fd8fc913..b75f73517562 100644 --- a/nova/api/openstack/compute/access_ips.py +++ b/nova/api/openstack/compute/access_ips.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.api.openstack.compute.schemas.v3 import access_ips +from nova.api.openstack.compute.schemas import access_ips from nova.api.openstack import extensions from nova.api.openstack import wsgi diff --git a/nova/api/openstack/compute/admin_actions.py b/nova/api/openstack/compute/admin_actions.py index 5aebefc51a98..6e011e20960f 100644 --- a/nova/api/openstack/compute/admin_actions.py +++ b/nova/api/openstack/compute/admin_actions.py @@ -15,7 +15,7 @@ from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import reset_server_state +from nova.api.openstack.compute.schemas import reset_server_state from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/admin_password.py b/nova/api/openstack/compute/admin_password.py index 8c1723cad291..576988464a0d 100644 --- a/nova/api/openstack/compute/admin_password.py +++ b/nova/api/openstack/compute/admin_password.py @@ -15,7 +15,7 @@ from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import admin_password +from nova.api.openstack.compute.schemas import admin_password from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/agents.py b/nova/api/openstack/compute/agents.py index 55ec793f2449..718c7bd173ab 100644 --- a/nova/api/openstack/compute/agents.py +++ b/nova/api/openstack/compute/agents.py @@ -15,7 +15,7 @@ import webob.exc -from nova.api.openstack.compute.schemas.v3 import agents as schema +from nova.api.openstack.compute.schemas import agents as schema from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/aggregates.py b/nova/api/openstack/compute/aggregates.py index 099a70cbe6f6..5440dcdddf2d 100644 --- a/nova/api/openstack/compute/aggregates.py +++ b/nova/api/openstack/compute/aggregates.py @@ -19,7 +19,7 @@ import datetime from webob import exc -from nova.api.openstack.compute.schemas.v3 import aggregates +from nova.api.openstack.compute.schemas import aggregates from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/assisted_volume_snapshots.py b/nova/api/openstack/compute/assisted_volume_snapshots.py index 4e060031fcdd..99e4921fa468 100644 --- a/nova/api/openstack/compute/assisted_volume_snapshots.py +++ b/nova/api/openstack/compute/assisted_volume_snapshots.py @@ -21,7 +21,7 @@ from oslo_serialization import jsonutils import six from webob import exc -from nova.api.openstack.compute.schemas.v3 import assisted_volume_snapshots +from nova.api.openstack.compute.schemas import assisted_volume_snapshots from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/attach_interfaces.py b/nova/api/openstack/compute/attach_interfaces.py index cdcae8e9096a..4b917514664c 100644 --- a/nova/api/openstack/compute/attach_interfaces.py +++ b/nova/api/openstack/compute/attach_interfaces.py @@ -19,7 +19,7 @@ import webob from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import attach_interfaces +from nova.api.openstack.compute.schemas import attach_interfaces from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/availability_zone.py b/nova/api/openstack/compute/availability_zone.py index 4d882c636a62..7e405b63846c 100644 --- a/nova/api/openstack/compute/availability_zone.py +++ b/nova/api/openstack/compute/availability_zone.py @@ -14,7 +14,7 @@ from oslo_config import cfg -from nova.api.openstack.compute.schemas.v3 import availability_zone as schema +from nova.api.openstack.compute.schemas import availability_zone as schema from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import availability_zones diff --git a/nova/api/openstack/compute/block_device_mapping.py b/nova/api/openstack/compute/block_device_mapping.py index 4a6f66768854..7b9038f9b769 100644 --- a/nova/api/openstack/compute/block_device_mapping.py +++ b/nova/api/openstack/compute/block_device_mapping.py @@ -17,7 +17,7 @@ from webob import exc -from nova.api.openstack.compute.schemas.v3 import block_device_mapping as \ +from nova.api.openstack.compute.schemas import block_device_mapping as \ schema_block_device_mapping from nova.api.openstack import extensions from nova import block_device diff --git a/nova/api/openstack/compute/block_device_mapping_v1.py b/nova/api/openstack/compute/block_device_mapping_v1.py index 1a1440bd7c9e..308b0c2bc036 100644 --- a/nova/api/openstack/compute/block_device_mapping_v1.py +++ b/nova/api/openstack/compute/block_device_mapping_v1.py @@ -18,7 +18,7 @@ from oslo_utils import strutils from webob import exc -from nova.api.openstack.compute.schemas.v3 import block_device_mapping_v1 as \ +from nova.api.openstack.compute.schemas import block_device_mapping_v1 as \ schema_block_device_mapping from nova.api.openstack import extensions from nova.i18n import _ diff --git a/nova/api/openstack/compute/cells.py b/nova/api/openstack/compute/cells.py index 6f0cba545ebd..b09b9809f3d2 100644 --- a/nova/api/openstack/compute/cells.py +++ b/nova/api/openstack/compute/cells.py @@ -23,7 +23,7 @@ import six from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import cells +from nova.api.openstack.compute.schemas import cells from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/cloudpipe.py b/nova/api/openstack/compute/cloudpipe.py index f719bf0a49a2..e465d5f4b7c5 100644 --- a/nova/api/openstack/compute/cloudpipe.py +++ b/nova/api/openstack/compute/cloudpipe.py @@ -19,7 +19,7 @@ from oslo_utils import fileutils from oslo_utils import timeutils from webob import exc -from nova.api.openstack.compute.schemas.v3 import cloudpipe +from nova.api.openstack.compute.schemas import cloudpipe from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/config_drive.py b/nova/api/openstack/compute/config_drive.py index be71619d9212..23bd1e0ea9ae 100644 --- a/nova/api/openstack/compute/config_drive.py +++ b/nova/api/openstack/compute/config_drive.py @@ -15,7 +15,7 @@ """Config Drive extension.""" -from nova.api.openstack.compute.schemas.v3 import config_drive as \ +from nova.api.openstack.compute.schemas import config_drive as \ schema_config_drive from nova.api.openstack import extensions from nova.api.openstack import wsgi diff --git a/nova/api/openstack/compute/console_output.py b/nova/api/openstack/compute/console_output.py index ab93ea18862d..60b40a3dcdd0 100644 --- a/nova/api/openstack/compute/console_output.py +++ b/nova/api/openstack/compute/console_output.py @@ -19,7 +19,7 @@ import re import webob from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import console_output +from nova.api.openstack.compute.schemas import console_output from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/create_backup.py b/nova/api/openstack/compute/create_backup.py index 42e6af2a32ad..2a2375de52f9 100644 --- a/nova/api/openstack/compute/create_backup.py +++ b/nova/api/openstack/compute/create_backup.py @@ -18,7 +18,7 @@ import os.path import webob from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import create_backup +from nova.api.openstack.compute.schemas import create_backup from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/disk_config.py b/nova/api/openstack/compute/disk_config.py index a8104ea523be..037c1ab78406 100644 --- a/nova/api/openstack/compute/disk_config.py +++ b/nova/api/openstack/compute/disk_config.py @@ -17,7 +17,7 @@ from oslo_utils import strutils from webob import exc -from nova.api.openstack.compute.schemas.v3 import disk_config +from nova.api.openstack.compute.schemas import disk_config from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.i18n import _ diff --git a/nova/api/openstack/compute/evacuate.py b/nova/api/openstack/compute/evacuate.py index bd05081ccb86..2a77cf579249 100644 --- a/nova/api/openstack/compute/evacuate.py +++ b/nova/api/openstack/compute/evacuate.py @@ -18,7 +18,7 @@ from oslo_utils import strutils from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import evacuate +from nova.api.openstack.compute.schemas import evacuate from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/fixed_ips.py b/nova/api/openstack/compute/fixed_ips.py index 1938cceef5c3..c81cfa736e80 100644 --- a/nova/api/openstack/compute/fixed_ips.py +++ b/nova/api/openstack/compute/fixed_ips.py @@ -15,7 +15,7 @@ import webob import webob.exc -from nova.api.openstack.compute.schemas.v3 import fixed_ips +from nova.api.openstack.compute.schemas import fixed_ips from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/flavor_access.py b/nova/api/openstack/compute/flavor_access.py index 4ca9b627c996..a5f5bcac2651 100644 --- a/nova/api/openstack/compute/flavor_access.py +++ b/nova/api/openstack/compute/flavor_access.py @@ -19,7 +19,7 @@ import webob from nova.api.openstack import api_version_request from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import flavor_access +from nova.api.openstack.compute.schemas import flavor_access from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/flavor_manage.py b/nova/api/openstack/compute/flavor_manage.py index f33981e3ed45..76d9bb181197 100644 --- a/nova/api/openstack/compute/flavor_manage.py +++ b/nova/api/openstack/compute/flavor_manage.py @@ -12,7 +12,7 @@ import webob -from nova.api.openstack.compute.schemas.v3 import flavor_manage +from nova.api.openstack.compute.schemas import flavor_manage from nova.api.openstack.compute.views import flavors as flavors_view from nova.api.openstack import extensions from nova.api.openstack import wsgi diff --git a/nova/api/openstack/compute/flavors_extraspecs.py b/nova/api/openstack/compute/flavors_extraspecs.py index efde98e04e62..0507244f27a6 100644 --- a/nova/api/openstack/compute/flavors_extraspecs.py +++ b/nova/api/openstack/compute/flavors_extraspecs.py @@ -17,7 +17,7 @@ import six import webob from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import flavors_extraspecs +from nova.api.openstack.compute.schemas import flavors_extraspecs from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/floating_ip_dns.py b/nova/api/openstack/compute/floating_ip_dns.py index 9b22e404ba85..95374c157804 100644 --- a/nova/api/openstack/compute/floating_ip_dns.py +++ b/nova/api/openstack/compute/floating_ip_dns.py @@ -18,7 +18,7 @@ from oslo_utils import netutils import webob from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import floating_ip_dns +from nova.api.openstack.compute.schemas import floating_ip_dns from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/floating_ips.py b/nova/api/openstack/compute/floating_ips.py index 3a04c061f45b..f912b3cb04fe 100644 --- a/nova/api/openstack/compute/floating_ips.py +++ b/nova/api/openstack/compute/floating_ips.py @@ -21,7 +21,7 @@ from oslo_utils import uuidutils import webob from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import floating_ips +from nova.api.openstack.compute.schemas import floating_ips from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/floating_ips_bulk.py b/nova/api/openstack/compute/floating_ips_bulk.py index fb0d220bd35d..e8f74c1415ce 100644 --- a/nova/api/openstack/compute/floating_ips_bulk.py +++ b/nova/api/openstack/compute/floating_ips_bulk.py @@ -17,7 +17,7 @@ from oslo_config import cfg import six import webob.exc -from nova.api.openstack.compute.schemas.v3 import floating_ips_bulk +from nova.api.openstack.compute.schemas import floating_ips_bulk from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/hosts.py b/nova/api/openstack/compute/hosts.py index 294badc0fcc2..cdb3de69f383 100644 --- a/nova/api/openstack/compute/hosts.py +++ b/nova/api/openstack/compute/hosts.py @@ -20,7 +20,7 @@ import six import webob.exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import hosts +from nova.api.openstack.compute.schemas import hosts from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/image_metadata.py b/nova/api/openstack/compute/image_metadata.py index ac8824230fe3..2523883f9adc 100644 --- a/nova/api/openstack/compute/image_metadata.py +++ b/nova/api/openstack/compute/image_metadata.py @@ -17,7 +17,7 @@ import six from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import image_metadata +from nova.api.openstack.compute.schemas import image_metadata from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/keypairs.py b/nova/api/openstack/compute/keypairs.py index 64d40dcf1f41..f1162570922b 100644 --- a/nova/api/openstack/compute/keypairs.py +++ b/nova/api/openstack/compute/keypairs.py @@ -18,7 +18,7 @@ import webob import webob.exc -from nova.api.openstack.compute.schemas.v3 import keypairs +from nova.api.openstack.compute.schemas import keypairs from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/migrate_server.py b/nova/api/openstack/compute/migrate_server.py index 4350548fc166..af3cf2167851 100644 --- a/nova/api/openstack/compute/migrate_server.py +++ b/nova/api/openstack/compute/migrate_server.py @@ -17,7 +17,7 @@ from oslo_utils import strutils from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import migrate_server +from nova.api.openstack.compute.schemas import migrate_server from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/multinic.py b/nova/api/openstack/compute/multinic.py index 7a8f222c757e..37027251030d 100644 --- a/nova/api/openstack/compute/multinic.py +++ b/nova/api/openstack/compute/multinic.py @@ -18,7 +18,7 @@ from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import multinic +from nova.api.openstack.compute.schemas import multinic from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/multiple_create.py b/nova/api/openstack/compute/multiple_create.py index 11f0d084148b..b2f20de9635c 100644 --- a/nova/api/openstack/compute/multiple_create.py +++ b/nova/api/openstack/compute/multiple_create.py @@ -15,7 +15,7 @@ from webob import exc -from nova.api.openstack.compute.schemas.v3 import multiple_create as \ +from nova.api.openstack.compute.schemas import multiple_create as \ schema_multiple_create from nova.api.openstack import extensions from nova.i18n import _ diff --git a/nova/api/openstack/compute/networks.py b/nova/api/openstack/compute/networks.py index b520ee7a4443..b9946d5936fb 100644 --- a/nova/api/openstack/compute/networks.py +++ b/nova/api/openstack/compute/networks.py @@ -18,7 +18,7 @@ import netaddr from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import networks as schema +from nova.api.openstack.compute.schemas import networks as schema from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/networks_associate.py b/nova/api/openstack/compute/networks_associate.py index 5f9e26dedc54..c007a744d308 100644 --- a/nova/api/openstack/compute/networks_associate.py +++ b/nova/api/openstack/compute/networks_associate.py @@ -13,7 +13,7 @@ from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import networks_associate +from nova.api.openstack.compute.schemas import networks_associate from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/personality.py b/nova/api/openstack/compute/personality.py index 7bcf35bec56e..614b3dadb12e 100644 --- a/nova/api/openstack/compute/personality.py +++ b/nova/api/openstack/compute/personality.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.api.openstack.compute.schemas.v3 import personality +from nova.api.openstack.compute.schemas import personality from nova.api.openstack import extensions ALIAS = "os-personality" diff --git a/nova/api/openstack/compute/preserve_ephemeral_rebuild.py b/nova/api/openstack/compute/preserve_ephemeral_rebuild.py index c23cedf3f0bd..300d791fb8d3 100644 --- a/nova/api/openstack/compute/preserve_ephemeral_rebuild.py +++ b/nova/api/openstack/compute/preserve_ephemeral_rebuild.py @@ -15,7 +15,7 @@ from oslo_utils import strutils -from nova.api.openstack.compute.schemas.v3 import preserve_ephemeral_rebuild +from nova.api.openstack.compute.schemas import preserve_ephemeral_rebuild from nova.api.openstack import extensions ALIAS = "os-preserve-ephemeral-rebuild" diff --git a/nova/api/openstack/compute/quota_classes.py b/nova/api/openstack/compute/quota_classes.py index 6c27694a55e3..3eb3d440081c 100644 --- a/nova/api/openstack/compute/quota_classes.py +++ b/nova/api/openstack/compute/quota_classes.py @@ -15,7 +15,7 @@ import six -from nova.api.openstack.compute.schemas.v3 import quota_classes +from nova.api.openstack.compute.schemas import quota_classes from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/quota_sets.py b/nova/api/openstack/compute/quota_sets.py index cda254fd75b2..5eb3cb3a4316 100644 --- a/nova/api/openstack/compute/quota_sets.py +++ b/nova/api/openstack/compute/quota_sets.py @@ -18,7 +18,7 @@ import six import six.moves.urllib.parse as urlparse import webob -from nova.api.openstack.compute.schemas.v3 import quota_sets +from nova.api.openstack.compute.schemas import quota_sets from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/remote_consoles.py b/nova/api/openstack/compute/remote_consoles.py index 8b1fe0a33a14..fafccbe1aaa8 100644 --- a/nova/api/openstack/compute/remote_consoles.py +++ b/nova/api/openstack/compute/remote_consoles.py @@ -15,7 +15,7 @@ import webob from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import remote_consoles +from nova.api.openstack.compute.schemas import remote_consoles from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/rescue.py b/nova/api/openstack/compute/rescue.py index 3ab3f498cec6..c10a2efbd39c 100644 --- a/nova/api/openstack/compute/rescue.py +++ b/nova/api/openstack/compute/rescue.py @@ -18,7 +18,7 @@ from oslo_config import cfg from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import rescue +from nova.api.openstack.compute.schemas import rescue from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/scheduler_hints.py b/nova/api/openstack/compute/scheduler_hints.py index c2c1119f6b0f..22f9a0923a01 100644 --- a/nova/api/openstack/compute/scheduler_hints.py +++ b/nova/api/openstack/compute/scheduler_hints.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.api.openstack.compute.schemas.v3 import scheduler_hints as schema +from nova.api.openstack.compute.schemas import scheduler_hints as schema from nova.api.openstack import extensions ALIAS = "os-scheduler-hints" diff --git a/nova/api/openstack/compute/schemas/v3/access_ips.py b/nova/api/openstack/compute/schemas/access_ips.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/access_ips.py rename to nova/api/openstack/compute/schemas/access_ips.py diff --git a/nova/api/openstack/compute/schemas/v3/admin_password.py b/nova/api/openstack/compute/schemas/admin_password.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/admin_password.py rename to nova/api/openstack/compute/schemas/admin_password.py diff --git a/nova/api/openstack/compute/schemas/v3/agents.py b/nova/api/openstack/compute/schemas/agents.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/agents.py rename to nova/api/openstack/compute/schemas/agents.py diff --git a/nova/api/openstack/compute/schemas/v3/aggregates.py b/nova/api/openstack/compute/schemas/aggregates.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/aggregates.py rename to nova/api/openstack/compute/schemas/aggregates.py diff --git a/nova/api/openstack/compute/schemas/v3/assisted_volume_snapshots.py b/nova/api/openstack/compute/schemas/assisted_volume_snapshots.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/assisted_volume_snapshots.py rename to nova/api/openstack/compute/schemas/assisted_volume_snapshots.py diff --git a/nova/api/openstack/compute/schemas/v3/attach_interfaces.py b/nova/api/openstack/compute/schemas/attach_interfaces.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/attach_interfaces.py rename to nova/api/openstack/compute/schemas/attach_interfaces.py diff --git a/nova/api/openstack/compute/schemas/v3/availability_zone.py b/nova/api/openstack/compute/schemas/availability_zone.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/availability_zone.py rename to nova/api/openstack/compute/schemas/availability_zone.py diff --git a/nova/api/openstack/compute/schemas/v3/block_device_mapping.py b/nova/api/openstack/compute/schemas/block_device_mapping.py similarity index 96% rename from nova/api/openstack/compute/schemas/v3/block_device_mapping.py rename to nova/api/openstack/compute/schemas/block_device_mapping.py index 282b0a03e308..ec20c944fc9d 100644 --- a/nova/api/openstack/compute/schemas/v3/block_device_mapping.py +++ b/nova/api/openstack/compute/schemas/block_device_mapping.py @@ -14,7 +14,7 @@ import copy -from nova.api.openstack.compute.schemas.v3 import block_device_mapping_v1 +from nova.api.openstack.compute.schemas import block_device_mapping_v1 from nova.api.validation import parameter_types diff --git a/nova/api/openstack/compute/schemas/v3/block_device_mapping_v1.py b/nova/api/openstack/compute/schemas/block_device_mapping_v1.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/block_device_mapping_v1.py rename to nova/api/openstack/compute/schemas/block_device_mapping_v1.py diff --git a/nova/api/openstack/compute/schemas/v3/cells.py b/nova/api/openstack/compute/schemas/cells.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/cells.py rename to nova/api/openstack/compute/schemas/cells.py diff --git a/nova/api/openstack/compute/schemas/v3/cloudpipe.py b/nova/api/openstack/compute/schemas/cloudpipe.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/cloudpipe.py rename to nova/api/openstack/compute/schemas/cloudpipe.py diff --git a/nova/api/openstack/compute/schemas/v3/config_drive.py b/nova/api/openstack/compute/schemas/config_drive.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/config_drive.py rename to nova/api/openstack/compute/schemas/config_drive.py diff --git a/nova/api/openstack/compute/schemas/v3/console_output.py b/nova/api/openstack/compute/schemas/console_output.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/console_output.py rename to nova/api/openstack/compute/schemas/console_output.py diff --git a/nova/api/openstack/compute/schemas/v3/create_backup.py b/nova/api/openstack/compute/schemas/create_backup.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/create_backup.py rename to nova/api/openstack/compute/schemas/create_backup.py diff --git a/nova/api/openstack/compute/schemas/v3/disk_config.py b/nova/api/openstack/compute/schemas/disk_config.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/disk_config.py rename to nova/api/openstack/compute/schemas/disk_config.py diff --git a/nova/api/openstack/compute/schemas/v3/evacuate.py b/nova/api/openstack/compute/schemas/evacuate.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/evacuate.py rename to nova/api/openstack/compute/schemas/evacuate.py diff --git a/nova/api/openstack/compute/schemas/v3/fixed_ips.py b/nova/api/openstack/compute/schemas/fixed_ips.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/fixed_ips.py rename to nova/api/openstack/compute/schemas/fixed_ips.py diff --git a/nova/api/openstack/compute/schemas/v3/flavor_access.py b/nova/api/openstack/compute/schemas/flavor_access.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/flavor_access.py rename to nova/api/openstack/compute/schemas/flavor_access.py diff --git a/nova/api/openstack/compute/schemas/v3/flavor_manage.py b/nova/api/openstack/compute/schemas/flavor_manage.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/flavor_manage.py rename to nova/api/openstack/compute/schemas/flavor_manage.py diff --git a/nova/api/openstack/compute/schemas/v3/flavors_extraspecs.py b/nova/api/openstack/compute/schemas/flavors_extraspecs.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/flavors_extraspecs.py rename to nova/api/openstack/compute/schemas/flavors_extraspecs.py diff --git a/nova/api/openstack/compute/schemas/v3/floating_ip_dns.py b/nova/api/openstack/compute/schemas/floating_ip_dns.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/floating_ip_dns.py rename to nova/api/openstack/compute/schemas/floating_ip_dns.py diff --git a/nova/api/openstack/compute/schemas/v3/floating_ips.py b/nova/api/openstack/compute/schemas/floating_ips.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/floating_ips.py rename to nova/api/openstack/compute/schemas/floating_ips.py diff --git a/nova/api/openstack/compute/schemas/v3/floating_ips_bulk.py b/nova/api/openstack/compute/schemas/floating_ips_bulk.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/floating_ips_bulk.py rename to nova/api/openstack/compute/schemas/floating_ips_bulk.py diff --git a/nova/api/openstack/compute/schemas/v3/hosts.py b/nova/api/openstack/compute/schemas/hosts.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/hosts.py rename to nova/api/openstack/compute/schemas/hosts.py diff --git a/nova/api/openstack/compute/schemas/v3/image_metadata.py b/nova/api/openstack/compute/schemas/image_metadata.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/image_metadata.py rename to nova/api/openstack/compute/schemas/image_metadata.py diff --git a/nova/api/openstack/compute/schemas/v3/keypairs.py b/nova/api/openstack/compute/schemas/keypairs.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/keypairs.py rename to nova/api/openstack/compute/schemas/keypairs.py diff --git a/nova/api/openstack/compute/schemas/v3/migrate_server.py b/nova/api/openstack/compute/schemas/migrate_server.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/migrate_server.py rename to nova/api/openstack/compute/schemas/migrate_server.py diff --git a/nova/api/openstack/compute/schemas/v3/multinic.py b/nova/api/openstack/compute/schemas/multinic.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/multinic.py rename to nova/api/openstack/compute/schemas/multinic.py diff --git a/nova/api/openstack/compute/schemas/v3/multiple_create.py b/nova/api/openstack/compute/schemas/multiple_create.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/multiple_create.py rename to nova/api/openstack/compute/schemas/multiple_create.py diff --git a/nova/api/openstack/compute/schemas/v3/networks.py b/nova/api/openstack/compute/schemas/networks.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/networks.py rename to nova/api/openstack/compute/schemas/networks.py diff --git a/nova/api/openstack/compute/schemas/v3/networks_associate.py b/nova/api/openstack/compute/schemas/networks_associate.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/networks_associate.py rename to nova/api/openstack/compute/schemas/networks_associate.py diff --git a/nova/api/openstack/compute/schemas/v3/personality.py b/nova/api/openstack/compute/schemas/personality.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/personality.py rename to nova/api/openstack/compute/schemas/personality.py diff --git a/nova/api/openstack/compute/schemas/v3/preserve_ephemeral_rebuild.py b/nova/api/openstack/compute/schemas/preserve_ephemeral_rebuild.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/preserve_ephemeral_rebuild.py rename to nova/api/openstack/compute/schemas/preserve_ephemeral_rebuild.py diff --git a/nova/api/openstack/compute/schemas/v3/quota_classes.py b/nova/api/openstack/compute/schemas/quota_classes.py similarity index 93% rename from nova/api/openstack/compute/schemas/v3/quota_classes.py rename to nova/api/openstack/compute/schemas/quota_classes.py index 1950842e5bb5..a9226e77b27c 100644 --- a/nova/api/openstack/compute/schemas/v3/quota_classes.py +++ b/nova/api/openstack/compute/schemas/quota_classes.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.api.openstack.compute.schemas.v3 import quota_sets +from nova.api.openstack.compute.schemas import quota_sets update = { 'type': 'object', diff --git a/nova/api/openstack/compute/schemas/v3/quota_sets.py b/nova/api/openstack/compute/schemas/quota_sets.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/quota_sets.py rename to nova/api/openstack/compute/schemas/quota_sets.py diff --git a/nova/api/openstack/compute/schemas/v3/remote_consoles.py b/nova/api/openstack/compute/schemas/remote_consoles.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/remote_consoles.py rename to nova/api/openstack/compute/schemas/remote_consoles.py diff --git a/nova/api/openstack/compute/schemas/v3/rescue.py b/nova/api/openstack/compute/schemas/rescue.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/rescue.py rename to nova/api/openstack/compute/schemas/rescue.py diff --git a/nova/api/openstack/compute/schemas/v3/reset_server_state.py b/nova/api/openstack/compute/schemas/reset_server_state.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/reset_server_state.py rename to nova/api/openstack/compute/schemas/reset_server_state.py diff --git a/nova/api/openstack/compute/schemas/v3/scheduler_hints.py b/nova/api/openstack/compute/schemas/scheduler_hints.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/scheduler_hints.py rename to nova/api/openstack/compute/schemas/scheduler_hints.py diff --git a/nova/api/openstack/compute/schemas/v3/security_groups.py b/nova/api/openstack/compute/schemas/security_groups.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/security_groups.py rename to nova/api/openstack/compute/schemas/security_groups.py diff --git a/nova/api/openstack/compute/schemas/v3/server_external_events.py b/nova/api/openstack/compute/schemas/server_external_events.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/server_external_events.py rename to nova/api/openstack/compute/schemas/server_external_events.py diff --git a/nova/api/openstack/compute/schemas/v3/server_groups.py b/nova/api/openstack/compute/schemas/server_groups.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/server_groups.py rename to nova/api/openstack/compute/schemas/server_groups.py diff --git a/nova/api/openstack/compute/schemas/v3/server_metadata.py b/nova/api/openstack/compute/schemas/server_metadata.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/server_metadata.py rename to nova/api/openstack/compute/schemas/server_metadata.py diff --git a/nova/api/openstack/compute/schemas/v3/servers.py b/nova/api/openstack/compute/schemas/servers.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/servers.py rename to nova/api/openstack/compute/schemas/servers.py diff --git a/nova/api/openstack/compute/schemas/v3/services.py b/nova/api/openstack/compute/schemas/services.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/services.py rename to nova/api/openstack/compute/schemas/services.py diff --git a/nova/api/openstack/compute/schemas/v3/tenant_networks.py b/nova/api/openstack/compute/schemas/tenant_networks.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/tenant_networks.py rename to nova/api/openstack/compute/schemas/tenant_networks.py diff --git a/nova/api/openstack/compute/schemas/v3/user_data.py b/nova/api/openstack/compute/schemas/user_data.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/user_data.py rename to nova/api/openstack/compute/schemas/user_data.py diff --git a/nova/api/openstack/compute/schemas/v3/__init__.py b/nova/api/openstack/compute/schemas/v3/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/nova/api/openstack/compute/schemas/v3/volumes.py b/nova/api/openstack/compute/schemas/volumes.py similarity index 100% rename from nova/api/openstack/compute/schemas/v3/volumes.py rename to nova/api/openstack/compute/schemas/volumes.py diff --git a/nova/api/openstack/compute/security_groups.py b/nova/api/openstack/compute/security_groups.py index 49199b0b7730..be26fab64dc3 100644 --- a/nova/api/openstack/compute/security_groups.py +++ b/nova/api/openstack/compute/security_groups.py @@ -20,7 +20,7 @@ from oslo_serialization import jsonutils from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import security_groups as \ +from nova.api.openstack.compute.schemas import security_groups as \ schema_security_groups from nova.api.openstack import extensions from nova.api.openstack import wsgi diff --git a/nova/api/openstack/compute/server_external_events.py b/nova/api/openstack/compute/server_external_events.py index 1907eccb0e93..a821df7026ee 100644 --- a/nova/api/openstack/compute/server_external_events.py +++ b/nova/api/openstack/compute/server_external_events.py @@ -15,7 +15,7 @@ from oslo_log import log as logging import webob -from nova.api.openstack.compute.schemas.v3 import server_external_events +from nova.api.openstack.compute.schemas import server_external_events from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/server_groups.py b/nova/api/openstack/compute/server_groups.py index 6f3782eff5c9..3740bc7fa426 100644 --- a/nova/api/openstack/compute/server_groups.py +++ b/nova/api/openstack/compute/server_groups.py @@ -20,7 +20,7 @@ import webob from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import server_groups as schema +from nova.api.openstack.compute.schemas import server_groups as schema from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/server_metadata.py b/nova/api/openstack/compute/server_metadata.py index 9409a51e004e..23572dde7709 100644 --- a/nova/api/openstack/compute/server_metadata.py +++ b/nova/api/openstack/compute/server_metadata.py @@ -17,7 +17,7 @@ import six from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import server_metadata +from nova.api.openstack.compute.schemas import server_metadata from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 6487e9840449..480f4ab94650 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -30,7 +30,7 @@ from webob import exc from nova.api.openstack import api_version_request from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import servers as schema_servers +from nova.api.openstack.compute.schemas import servers as schema_servers from nova.api.openstack.compute.views import servers as views_servers from nova.api.openstack import extensions from nova.api.openstack import wsgi diff --git a/nova/api/openstack/compute/services.py b/nova/api/openstack/compute/services.py index 6bbc11818895..1718ca06c7c6 100644 --- a/nova/api/openstack/compute/services.py +++ b/nova/api/openstack/compute/services.py @@ -15,7 +15,7 @@ import webob.exc from nova.api.openstack import api_version_request -from nova.api.openstack.compute.schemas.v3 import services +from nova.api.openstack.compute.schemas import services from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/tenant_networks.py b/nova/api/openstack/compute/tenant_networks.py index edb17a56eae8..c3c18387fc53 100644 --- a/nova/api/openstack/compute/tenant_networks.py +++ b/nova/api/openstack/compute/tenant_networks.py @@ -21,7 +21,7 @@ from oslo_log import log as logging import six from webob import exc -from nova.api.openstack.compute.schemas.v3 import tenant_networks as schema +from nova.api.openstack.compute.schemas import tenant_networks as schema from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/api/openstack/compute/user_data.py b/nova/api/openstack/compute/user_data.py index 3ed61e80d173..9fff38c19b06 100644 --- a/nova/api/openstack/compute/user_data.py +++ b/nova/api/openstack/compute/user_data.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.api.openstack.compute.schemas.v3 import user_data as schema_user_data +from nova.api.openstack.compute.schemas import user_data as schema_user_data from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/volumes.py b/nova/api/openstack/compute/volumes.py index f0202a31698c..4051a944307e 100644 --- a/nova/api/openstack/compute/volumes.py +++ b/nova/api/openstack/compute/volumes.py @@ -19,7 +19,7 @@ from oslo_utils import strutils from webob import exc from nova.api.openstack import common -from nova.api.openstack.compute.schemas.v3 import volumes as volumes_schema +from nova.api.openstack.compute.schemas import volumes as volumes_schema from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation diff --git a/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py index df16f028e1e4..aca872661684 100644 --- a/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py @@ -40,9 +40,9 @@ from nova.api.openstack.compute import disk_config from nova.api.openstack.compute import extension_info from nova.api.openstack.compute import ips from nova.api.openstack.compute import keypairs -from nova.api.openstack.compute.schemas.v3 import disk_config \ +from nova.api.openstack.compute.schemas import disk_config \ as disk_config_schema -from nova.api.openstack.compute.schemas.v3 import servers as servers_schema +from nova.api.openstack.compute.schemas import servers as servers_schema from nova.api.openstack.compute import servers from nova.api.openstack.compute import views from nova.api.openstack import extensions