Remove 'v3' directory for v2.1 json-schemas

This is step 4 of the remove v3 process. It moves the v2.1
json-schemas out of v3 directory, and also corrects all the
references.

Change-Id: Ibf88c38df951ed755b7431846cca7496f861c1dd
Partial-Bug: #1462901

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
 

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

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

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

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

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

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

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

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

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 _

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

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

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

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

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

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 _

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

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

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

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

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

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

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

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

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

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

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

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

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

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 _

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

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

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"

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"

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

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

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

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

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"

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
 
 

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',

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

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

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

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

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

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

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

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
 
 

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

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