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
This commit is contained in:
parent
003c868da7
commit
3e032fd45b
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 _
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 _
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 _
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
@ -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',
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue