From 89cd6a0c493e26b5a9e017c99d731464292abbaf Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Fri, 7 Nov 2014 14:27:03 +0100 Subject: [PATCH] move all tests to nova/tests/unit As part of the split of functional and unit tests we need to isolate the unit tests into a separate directory for having multiple test targets in a sane way. Part of bp:functional-tests-for-nova Change-Id: Id42ba373c1bda6a312b673ab2b489ca56da8c628 --- nova/test.py | 4 +- nova/tests/__init__.py | 49 ------------------ nova/tests/{ => unit}/CA/cacert.pem | 0 nova/tests/{ => unit}/CA/private/cakey.pem | 0 nova/tests/{ => unit}/README.rst | 0 nova/tests/unit/__init__.py | 49 ++++++++++++++++++ nova/tests/{ => unit}/api/__init__.py | 0 nova/tests/{ => unit}/api/ec2/__init__.py | 0 .../api/ec2/public_key/dummy.fingerprint | 0 .../{ => unit}/api/ec2/public_key/dummy.pub | 0 nova/tests/{ => unit}/api/ec2/test_api.py | 2 +- .../{ => unit}/api/ec2/test_apirequest.py | 0 .../{ => unit}/api/ec2/test_cinder_cloud.py | 14 ++--- nova/tests/{ => unit}/api/ec2/test_cloud.py | 18 +++---- .../{ => unit}/api/ec2/test_ec2_validate.py | 8 +-- .../tests/{ => unit}/api/ec2/test_ec2utils.py | 0 .../{ => unit}/api/ec2/test_error_response.py | 0 nova/tests/{ => unit}/api/ec2/test_faults.py | 0 .../{ => unit}/api/ec2/test_middleware.py | 0 .../{ => unit}/api/openstack/__init__.py | 0 nova/tests/{ => unit}/api/openstack/common.py | 0 .../api/openstack/compute/__init__.py | 0 .../api/openstack/compute/contrib/__init__.py | 0 .../compute/contrib/test_admin_actions.py | 4 +- .../compute/contrib/test_admin_password.py | 2 +- .../openstack/compute/contrib/test_agents.py | 0 .../compute/contrib/test_aggregates.py | 4 +- .../compute/contrib/test_attach_interfaces.py | 2 +- .../compute/contrib/test_availability_zone.py | 10 ++-- .../compute/contrib/test_baremetal_nodes.py | 2 +- .../contrib/test_block_device_mapping.py | 6 +-- .../contrib/test_block_device_mapping_v1.py | 4 +- .../openstack/compute/contrib/test_cells.py | 4 +- .../compute/contrib/test_certificates.py | 2 +- .../compute/contrib/test_cloudpipe.py | 6 +-- .../compute/contrib/test_cloudpipe_update.py | 4 +- .../compute/contrib/test_config_drive.py | 6 +-- .../contrib/test_console_auth_tokens.py | 2 +- .../compute/contrib/test_console_output.py | 4 +- .../compute/contrib/test_consoles.py | 2 +- .../compute/contrib/test_createserverext.py | 2 +- .../compute/contrib/test_deferred_delete.py | 2 +- .../compute/contrib/test_disk_config.py | 10 ++-- .../compute/contrib/test_evacuate.py | 4 +- .../test_extended_availability_zone.py | 4 +- .../test_extended_evacuate_find_host.py | 4 +- .../contrib/test_extended_hypervisors.py | 4 +- .../compute/contrib/test_extended_ips.py | 4 +- .../compute/contrib/test_extended_ips_mac.py | 4 +- .../test_extended_rescue_with_image.py | 0 .../test_extended_server_attributes.py | 2 +- .../compute/contrib/test_extended_status.py | 4 +- .../test_extended_virtual_interfaces_net.py | 2 +- .../compute/contrib/test_extended_volumes.py | 6 +-- .../compute/contrib/test_fixed_ips.py | 4 +- .../compute/contrib/test_flavor_access.py | 2 +- .../compute/contrib/test_flavor_disabled.py | 2 +- .../compute/contrib/test_flavor_manage.py | 2 +- .../compute/contrib/test_flavor_rxtx.py | 2 +- .../compute/contrib/test_flavor_swap.py | 2 +- .../compute/contrib/test_flavorextradata.py | 2 +- .../contrib/test_flavors_extra_specs.py | 4 +- .../compute/contrib/test_floating_ip_dns.py | 2 +- .../compute/contrib/test_floating_ip_pools.py | 2 +- .../compute/contrib/test_floating_ips.py | 4 +- .../compute/contrib/test_floating_ips_bulk.py | 2 +- .../openstack/compute/contrib/test_fping.py | 2 +- .../contrib/test_hide_server_addresses.py | 4 +- .../openstack/compute/contrib/test_hosts.py | 4 +- .../compute/contrib/test_hypervisor_status.py | 2 +- .../compute/contrib/test_hypervisors.py | 2 +- .../compute/contrib/test_image_size.py | 2 +- .../compute/contrib/test_instance_actions.py | 6 +-- .../contrib/test_instance_usage_audit_log.py | 4 +- .../compute/contrib/test_keypairs.py | 4 +- .../compute/contrib/test_migrate_server.py | 4 +- .../compute/contrib/test_migrations.py | 0 .../compute/contrib/test_multinic.py | 2 +- .../compute/contrib/test_networks.py | 6 +-- .../contrib/test_neutron_security_groups.py | 4 +- .../compute/contrib/test_quota_classes.py | 2 +- .../openstack/compute/contrib/test_quotas.py | 2 +- .../openstack/compute/contrib/test_rescue.py | 2 +- .../compute/contrib/test_scheduler_hints.py | 6 +-- .../test_security_group_default_rules.py | 2 +- .../compute/contrib/test_security_groups.py | 6 +-- .../contrib/test_server_diagnostics.py | 2 +- .../contrib/test_server_external_events.py | 0 .../contrib/test_server_group_quotas.py | 2 +- .../compute/contrib/test_server_groups.py | 4 +- .../compute/contrib/test_server_password.py | 4 +- .../compute/contrib/test_server_start_stop.py | 2 +- .../compute/contrib/test_server_usage.py | 4 +- .../compute/contrib/test_services.py | 4 +- .../openstack/compute/contrib/test_shelve.py | 4 +- .../contrib/test_simple_tenant_usage.py | 2 +- .../compute/contrib/test_snapshots.py | 2 +- .../compute/contrib/test_tenant_networks.py | 2 +- .../compute/contrib/test_used_limits.py | 0 .../contrib/test_virtual_interfaces.py | 2 +- .../openstack/compute/contrib/test_volumes.py | 6 +-- .../openstack/compute/extensions/__init__.py | 0 .../compute/extensions/foxinsocks.py | 0 .../api/openstack/compute/plugins/__init__.py | 0 .../openstack/compute/plugins/v3/__init__.py | 0 .../plugins/v3/admin_only_action_common.py | 2 +- .../compute/plugins/v3/test_access_ips.py | 4 +- .../plugins/v3/test_console_auth_tokens.py | 2 +- .../compute/plugins/v3/test_consoles.py | 4 +- .../compute/plugins/v3/test_create_backup.py | 4 +- .../plugins/v3/test_extended_volumes.py | 6 +-- .../compute/plugins/v3/test_extension_info.py | 2 +- .../compute/plugins/v3/test_lock_server.py | 4 +- .../compute/plugins/v3/test_migrations.py | 0 .../plugins/v3/test_multiple_create.py | 6 +-- .../compute/plugins/v3/test_pause_server.py | 4 +- .../openstack/compute/plugins/v3/test_pci.py | 4 +- .../compute/plugins/v3/test_server_actions.py | 8 +-- .../plugins/v3/test_server_external_events.py | 0 .../plugins/v3/test_server_password.py | 4 +- .../compute/plugins/v3/test_servers.py | 13 ++--- .../compute/plugins/v3/test_services.py | 4 +- .../compute/plugins/v3/test_suspend_server.py | 4 +- .../compute/plugins/v3/test_user_data.py | 6 +-- .../api/openstack/compute/schemas/__init__.py | 0 .../openstack/compute/schemas/test_schemas.py | 0 .../schemas/v1.1/flavors/invalid/mixed.xml | 0 .../schemas/v1.1/flavors/invalid/partial.xml | 0 .../schemas/v1.1/flavors/invalid/partial2.xml | 0 .../schemas/v1.1/flavors/valid/empty.xml | 0 .../schemas/v1.1/flavors/valid/full.xml | 0 .../schemas/v1.1/flavors/valid/refs.xml | 0 .../schemas/v1.1/images/invalid/mixed.xml | 0 .../v1.1/images/invalid/no-metadata.xml | 0 .../schemas/v1.1/images/invalid/partial.xml | 0 .../schemas/v1.1/images/invalid/partial2.xml | 0 .../schemas/v1.1/images/valid/empty.xml | 0 .../schemas/v1.1/images/valid/full.xml | 0 .../schemas/v1.1/images/valid/refs.xml | 0 .../schemas/v1.1/servers/invalid/mixed.xml | 0 .../schemas/v1.1/servers/invalid/partial.xml | 0 .../schemas/v1.1/servers/invalid/partial2.xml | 0 .../schemas/v1.1/servers/invalid/partial3.xml | 0 .../schemas/v1.1/servers/valid/detailed.xml | 0 .../schemas/v1.1/servers/valid/empty.xml | 0 .../schemas/v1.1/servers/valid/full.xml | 0 .../schemas/v1.1/servers/valid/refs.xml | 0 .../api/openstack/compute/test_api.py | 2 +- .../api/openstack/compute/test_auth.py | 2 +- .../api/openstack/compute/test_consoles.py | 4 +- .../api/openstack/compute/test_extensions.py | 6 +-- .../api/openstack/compute/test_flavors.py | 4 +- .../openstack/compute/test_image_metadata.py | 8 +-- .../api/openstack/compute/test_images.py | 6 +-- .../api/openstack/compute/test_limits.py | 4 +- .../openstack/compute/test_server_actions.py | 12 ++--- .../openstack/compute/test_server_metadata.py | 4 +- .../api/openstack/compute/test_servers.py | 17 +++--- .../api/openstack/compute/test_urlmap.py | 8 +-- .../openstack/compute/test_v21_extensions.py | 0 .../api/openstack/compute/test_v3_auth.py | 2 +- .../openstack/compute/test_v3_extensions.py | 0 .../api/openstack/compute/test_versions.py | 6 +-- nova/tests/{ => unit}/api/openstack/fakes.py | 6 +-- .../{ => unit}/api/openstack/test_common.py | 2 +- .../{ => unit}/api/openstack/test_faults.py | 0 .../{ => unit}/api/openstack/test_mapper.py | 2 +- .../{ => unit}/api/openstack/test_wsgi.py | 4 +- .../{ => unit}/api/openstack/test_xmlutil.py | 2 +- nova/tests/{ => unit}/api/test_auth.py | 0 .../{ => unit}/api/test_compute_req_id.py | 0 nova/tests/{ => unit}/api/test_validator.py | 0 nova/tests/{ => unit}/api/test_wsgi.py | 0 nova/tests/{ => unit}/bundle/1mb.manifest.xml | 0 .../1mb.no_kernel_or_ramdisk.manifest.xml | 0 nova/tests/{ => unit}/bundle/1mb.part.0 | Bin nova/tests/{ => unit}/bundle/1mb.part.1 | 0 nova/tests/{ => unit}/cast_as_call.py | 0 nova/tests/{ => unit}/cells/__init__.py | 0 nova/tests/{ => unit}/cells/fakes.py | 2 +- .../{ => unit}/cells/test_cells_filters.py | 2 +- .../{ => unit}/cells/test_cells_manager.py | 4 +- .../{ => unit}/cells/test_cells_messaging.py | 4 +- .../{ => unit}/cells/test_cells_rpc_driver.py | 2 +- .../{ => unit}/cells/test_cells_rpcapi.py | 2 +- .../{ => unit}/cells/test_cells_scheduler.py | 10 ++-- .../cells/test_cells_state_manager.py | 0 .../{ => unit}/cells/test_cells_utils.py | 0 .../{ => unit}/cells/test_cells_weights.py | 0 nova/tests/{ => unit}/cert/__init__.py | 0 nova/tests/{ => unit}/cert/test_rpcapi.py | 0 nova/tests/{ => unit}/cmd/__init__.py | 0 nova/tests/{ => unit}/cmd/test_idmapshift.py | 0 nova/tests/{ => unit}/compute/__init__.py | 0 .../{ => unit}/compute/eventlet_utils.py | 0 .../compute/fake_resource_tracker.py | 0 .../{ => unit}/compute/monitors/__init__.py | 0 .../compute/monitors/test_cpu_monitor.py | 0 .../compute/monitors/test_monitors.py | 4 +- nova/tests/{ => unit}/compute/test_arch.py | 0 nova/tests/{ => unit}/compute/test_claims.py | 2 +- nova/tests/{ => unit}/compute/test_compute.py | 26 +++++----- .../{ => unit}/compute/test_compute_api.py | 14 ++--- .../{ => unit}/compute/test_compute_cells.py | 4 +- .../{ => unit}/compute/test_compute_mgr.py | 10 ++-- .../{ => unit}/compute/test_compute_utils.py | 16 +++--- .../{ => unit}/compute/test_compute_xen.py | 6 +-- nova/tests/{ => unit}/compute/test_flavors.py | 0 .../tests/{ => unit}/compute/test_host_api.py | 6 +-- nova/tests/{ => unit}/compute/test_hvtype.py | 0 .../tests/{ => unit}/compute/test_keypairs.py | 6 +-- .../{ => unit}/compute/test_multiple_nodes.py | 0 .../compute/test_resource_tracker.py | 10 ++-- .../{ => unit}/compute/test_resources.py | 2 +- nova/tests/{ => unit}/compute/test_rpcapi.py | 4 +- nova/tests/{ => unit}/compute/test_shelve.py | 4 +- nova/tests/{ => unit}/compute/test_stats.py | 0 nova/tests/{ => unit}/compute/test_tracker.py | 0 nova/tests/{ => unit}/compute/test_virtapi.py | 0 nova/tests/{ => unit}/compute/test_vmmode.py | 0 nova/tests/{ => unit}/conductor/__init__.py | 0 .../{ => unit}/conductor/tasks/__init__.py | 0 .../conductor/tasks/test_live_migrate.py | 2 +- .../{ => unit}/conductor/test_conductor.py | 14 ++--- nova/tests/{ => unit}/conf_fixture.py | 6 +-- nova/tests/{ => unit}/console/__init__.py | 0 nova/tests/{ => unit}/console/test_console.py | 0 nova/tests/{ => unit}/console/test_rpcapi.py | 0 nova/tests/{ => unit}/console/test_serial.py | 0 nova/tests/{ => unit}/console/test_type.py | 0 .../{ => unit}/console/test_websocketproxy.py | 0 nova/tests/{ => unit}/consoleauth/__init__.py | 0 .../consoleauth/test_consoleauth.py | 0 .../{ => unit}/consoleauth/test_rpcapi.py | 0 nova/tests/{ => unit}/db/__init__.py | 0 nova/tests/{ => unit}/db/fakes.py | 0 nova/tests/{ => unit}/db/test_db_api.py | 2 +- .../{ => unit}/db/test_migration_utils.py | 2 +- nova/tests/{ => unit}/db/test_migrations.conf | 0 nova/tests/{ => unit}/db/test_migrations.py | 0 nova/tests/{ => unit}/db/test_sqlite.py | 0 nova/tests/{ => unit}/fake_block_device.py | 0 nova/tests/{ => unit}/fake_crypto.py | 0 nova/tests/{ => unit}/fake_hosts.py | 2 +- nova/tests/{ => unit}/fake_instance.py | 0 nova/tests/{ => unit}/fake_ldap.py | 0 .../{ => unit}/fake_loadables/__init__.py | 0 .../fake_loadables/fake_loadable1.py | 2 +- .../fake_loadables/fake_loadable2.py | 2 +- nova/tests/{ => unit}/fake_network.py | 6 +-- .../{ => unit}/fake_network_cache_model.py | 0 nova/tests/{ => unit}/fake_notifier.py | 0 nova/tests/{ => unit}/fake_policy.py | 0 nova/tests/{ => unit}/fake_processutils.py | 0 nova/tests/{ => unit}/fake_server_actions.py | 0 nova/tests/{ => unit}/fake_utils.py | 0 nova/tests/{ => unit}/fake_volume.py | 0 nova/tests/{ => unit}/functional/__init__.py | 0 nova/tests/{ => unit}/image/__init__.py | 0 nova/tests/{ => unit}/image/abs.tar.gz | Bin nova/tests/{ => unit}/image/fake.py | 0 nova/tests/{ => unit}/image/rel.tar.gz | Bin nova/tests/{ => unit}/image/test_fake.py | 6 +-- nova/tests/{ => unit}/image/test_glance.py | 0 nova/tests/{ => unit}/image/test_s3.py | 2 +- .../{ => unit}/image/test_transfer_modules.py | 0 nova/tests/{ => unit}/image_fixtures.py | 0 nova/tests/{ => unit}/integrated/__init__.py | 0 .../{ => unit}/integrated/api/__init__.py | 0 .../tests/{ => unit}/integrated/api/client.py | 2 +- .../NMN/multinic-add-fixed-ip-req.json.tpl | 0 .../NMN/multinic-add-fixed-ip-req.xml.tpl | 0 .../NMN/multinic-remove-fixed-ip-req.json.tpl | 0 .../NMN/multinic-remove-fixed-ip-req.xml.tpl | 0 .../api_samples/NMN/server-post-req.json.tpl | 0 .../api_samples/NMN/server-post-req.xml.tpl | 0 .../api_samples/NMN/server-post-resp.json.tpl | 0 .../api_samples/NMN/server-post-resp.xml.tpl | 0 .../OS-DCF/image-get-resp.json.tpl | 0 .../api_samples/OS-DCF/image-get-resp.xml.tpl | 0 .../OS-DCF/image-list-resp.json.tpl | 0 .../OS-DCF/image-list-resp.xml.tpl | 0 .../OS-DCF/list-servers-detail-get.json.tpl | 0 .../OS-DCF/list-servers-detail-get.xml.tpl | 0 .../OS-DCF/server-action-rebuild-req.json.tpl | 0 .../OS-DCF/server-action-rebuild-req.xml.tpl | 0 .../server-action-rebuild-resp.json.tpl | 0 .../OS-DCF/server-action-rebuild-resp.xml.tpl | 0 .../OS-DCF/server-get-resp.json.tpl | 0 .../OS-DCF/server-get-resp.xml.tpl | 0 .../OS-DCF/server-post-req.json.tpl | 0 .../OS-DCF/server-post-req.xml.tpl | 0 .../OS-DCF/server-post-resp.json.tpl | 0 .../OS-DCF/server-post-resp.xml.tpl | 0 .../OS-DCF/server-resize-post-req.json.tpl | 0 .../OS-DCF/server-resize-post-req.xml.tpl | 0 .../OS-DCF/server-update-put-req.json.tpl | 0 .../OS-DCF/server-update-put-req.xml.tpl | 0 .../OS-DCF/server-update-put-resp.json.tpl | 0 .../OS-DCF/server-update-put-resp.xml.tpl | 0 .../OS-EXT-AZ/server-get-resp.json.tpl | 0 .../OS-EXT-AZ/server-get-resp.xml.tpl | 0 .../OS-EXT-AZ/server-post-req.json.tpl | 0 .../OS-EXT-AZ/server-post-req.xml.tpl | 0 .../OS-EXT-AZ/server-post-resp.json.tpl | 0 .../OS-EXT-AZ/server-post-resp.xml.tpl | 0 .../OS-EXT-AZ/servers-detail-resp.json.tpl | 0 .../OS-EXT-AZ/servers-detail-resp.xml.tpl | 0 .../OS-EXT-IMG-SIZE/image-get-resp.json.tpl | 0 .../OS-EXT-IMG-SIZE/image-get-resp.xml.tpl | 0 .../images-details-get-resp.json.tpl | 0 .../images-details-get-resp.xml.tpl | 0 .../OS-EXT-IPS-MAC/server-get-resp.json.tpl | 0 .../OS-EXT-IPS-MAC/server-get-resp.xml.tpl | 0 .../OS-EXT-IPS-MAC/server-post-req.json.tpl | 0 .../OS-EXT-IPS-MAC/server-post-req.xml.tpl | 0 .../OS-EXT-IPS-MAC/server-post-resp.json.tpl | 0 .../OS-EXT-IPS-MAC/server-post-resp.xml.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../servers-detail-resp.xml.tpl | 0 .../OS-EXT-IPS/server-get-resp.json.tpl | 0 .../OS-EXT-IPS/server-get-resp.xml.tpl | 0 .../OS-EXT-IPS/server-post-req.json.tpl | 0 .../OS-EXT-IPS/server-post-req.xml.tpl | 0 .../OS-EXT-IPS/server-post-resp.json.tpl | 0 .../OS-EXT-IPS/server-post-resp.xml.tpl | 0 .../OS-EXT-IPS/servers-detail-resp.json.tpl | 0 .../OS-EXT-IPS/servers-detail-resp.xml.tpl | 0 .../OS-EXT-SRV-ATTR/server-get-resp.json.tpl | 0 .../OS-EXT-SRV-ATTR/server-get-resp.xml.tpl | 0 .../OS-EXT-SRV-ATTR/server-post-req.json.tpl | 0 .../OS-EXT-SRV-ATTR/server-post-req.xml.tpl | 0 .../OS-EXT-SRV-ATTR/server-post-resp.json.tpl | 0 .../OS-EXT-SRV-ATTR/server-post-resp.xml.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../servers-detail-resp.xml.tpl | 0 .../OS-EXT-STS/server-get-resp.json.tpl | 0 .../OS-EXT-STS/server-get-resp.xml.tpl | 0 .../OS-EXT-STS/server-post-req.json.tpl | 0 .../OS-EXT-STS/server-post-req.xml.tpl | 0 .../OS-EXT-STS/server-post-resp.json.tpl | 0 .../OS-EXT-STS/server-post-resp.xml.tpl | 0 .../OS-EXT-STS/servers-detail-resp.json.tpl | 0 .../OS-EXT-STS/servers-detail-resp.xml.tpl | 0 .../OS-EXT-VIF-NET/server-post-req.json.tpl | 0 .../OS-EXT-VIF-NET/server-post-req.xml.tpl | 0 .../OS-EXT-VIF-NET/server-post-resp.json.tpl | 0 .../OS-EXT-VIF-NET/server-post-resp.xml.tpl | 0 .../OS-EXT-VIF-NET/vifs-list-resp.json.tpl | 0 .../OS-EXT-VIF-NET/vifs-list-resp.xml.tpl | 0 .../flavor-detail-get-resp.json.tpl | 0 .../flavor-detail-get-resp.xml.tpl | 0 .../flavor-show-get-resp.json.tpl | 0 .../flavor-show-get-resp.xml.tpl | 0 .../flavors-extra-data-get-resp.json.tpl | 0 .../flavors-extra-data-get-resp.xml.tpl | 0 .../flavors-extra-data-list-resp.json.tpl | 0 .../flavors-extra-data-list-resp.xml.tpl | 0 .../flavors-extra-data-post-req.json.tpl | 0 .../flavors-extra-data-post-req.xml.tpl | 0 .../flavors-extra-data-post-resp.json.tpl | 0 .../flavors-extra-data-post-resp.xml.tpl | 0 .../scheduler-hints-post-req.json.tpl | 0 .../scheduler-hints-post-req.xml.tpl | 0 .../scheduler-hints-post-resp.json.tpl | 0 .../scheduler-hints-post-resp.xml.tpl | 0 .../OS-SRV-USG/server-get-resp.json.tpl | 0 .../OS-SRV-USG/server-get-resp.xml.tpl | 0 .../OS-SRV-USG/server-post-req.json.tpl | 0 .../OS-SRV-USG/server-post-req.xml.tpl | 0 .../OS-SRV-USG/server-post-resp.json.tpl | 0 .../OS-SRV-USG/server-post-resp.xml.tpl | 0 .../OS-SRV-USG/servers-detail-resp.json.tpl | 0 .../OS-SRV-USG/servers-detail-resp.xml.tpl | 0 .../integrated/api_samples/README.rst | 2 +- .../extensions-get-resp.json.tpl | 0 .../extensions-get-resp.xml.tpl | 0 .../all_extensions/flavor-get-resp.json.tpl | 0 .../all_extensions/flavor-get-resp.xml.tpl | 0 .../all_extensions/flavors-list-resp.json.tpl | 0 .../all_extensions/flavors-list-resp.xml.tpl | 0 .../server-action-changepassword.json.tpl | 0 .../server-action-changepassword.xml.tpl | 0 .../server-action-confirmresize.json.tpl | 0 .../server-action-confirmresize.xml.tpl | 0 .../server-action-createimage.json.tpl | 0 .../server-action-createimage.xml.tpl | 0 .../server-action-reboot.json.tpl | 0 .../server-action-reboot.xml.tpl | 0 .../server-action-rebuild-resp.json.tpl | 0 .../server-action-rebuild-resp.xml.tpl | 0 .../server-action-rebuild.json.tpl | 0 .../server-action-rebuild.xml.tpl | 0 .../server-action-resize.json.tpl | 0 .../server-action-resize.xml.tpl | 0 .../server-action-revertresize.json.tpl | 0 .../server-action-revertresize.xml.tpl | 0 .../all_extensions/server-get-resp.json.tpl | 0 .../all_extensions/server-get-resp.xml.tpl | 0 .../all_extensions/server-post-req.json.tpl | 0 .../all_extensions/server-post-req.xml.tpl | 0 .../all_extensions/server-post-resp.json.tpl | 0 .../all_extensions/server-post-resp.xml.tpl | 0 .../servers-details-resp.json.tpl | 0 .../servers-details-resp.xml.tpl | 0 .../all_extensions/servers-list-resp.json.tpl | 0 .../all_extensions/servers-list-resp.xml.tpl | 0 .../api_samples/flavor-get-resp.json.tpl | 0 .../api_samples/flavor-get-resp.xml.tpl | 0 .../api_samples/flavors-list-resp.json.tpl | 0 .../api_samples/flavors-list-resp.xml.tpl | 0 .../api_samples/image-get-resp.json.tpl | 0 .../api_samples/image-get-resp.xml.tpl | 0 .../api_samples/image-meta-key-get.json.tpl | 0 .../api_samples/image-meta-key-get.xml.tpl | 0 .../image-meta-key-put-req.json.tpl | 0 .../image-meta-key-put-req.xml.tpl | 0 .../image-meta-key-put-resp.json.tpl | 0 .../image-meta-key-put-resp.xml.tpl | 0 .../image-metadata-get-resp.json.tpl | 0 .../image-metadata-get-resp.xml.tpl | 0 .../image-metadata-post-req.json.tpl | 0 .../image-metadata-post-req.xml.tpl | 0 .../image-metadata-post-resp.json.tpl | 0 .../image-metadata-post-resp.xml.tpl | 0 .../image-metadata-put-req.json.tpl | 0 .../image-metadata-put-req.xml.tpl | 0 .../image-metadata-put-resp.json.tpl | 0 .../image-metadata-put-resp.xml.tpl | 0 .../api_samples/image-metadata-resp.json.tpl | 0 .../images-details-get-resp.json.tpl | 0 .../images-details-get-resp.xml.tpl | 0 .../api_samples/images-details-resp.json.tpl | 0 .../api_samples/images-details-resp.xml.tpl | 0 .../api_samples/images-list-get-resp.json.tpl | 0 .../api_samples/images-list-get-resp.xml.tpl | 0 .../api_samples/images-list-resp.json.tpl | 0 .../api_samples/images-list-resp.xml.tpl | 0 .../api_samples/limit-get-resp.json.tpl | 0 .../api_samples/limit-get-resp.xml.tpl | 0 .../admin-actions-backup-server.json.tpl | 0 .../admin-actions-backup-server.xml.tpl | 0 ...admin-actions-inject-network-info.json.tpl | 0 .../admin-actions-inject-network-info.xml.tpl | 0 .../admin-actions-live-migrate.json.tpl | 0 .../admin-actions-live-migrate.xml.tpl | 0 .../admin-actions-lock-server.json.tpl | 0 .../admin-actions-lock-server.xml.tpl | 0 .../admin-actions-migrate.json.tpl | 0 .../admin-actions-migrate.xml.tpl | 0 .../admin-actions-pause.json.tpl | 0 .../admin-actions-pause.xml.tpl | 0 .../admin-actions-reset-network.json.tpl | 0 .../admin-actions-reset-network.xml.tpl | 0 .../admin-actions-reset-server-state.json.tpl | 0 .../admin-actions-reset-server-state.xml.tpl | 0 .../admin-actions-reset-state.json.tpl | 0 .../admin-actions-reset-state.xml.tpl | 0 .../admin-actions-resume.json.tpl | 0 .../admin-actions-resume.xml.tpl | 0 .../admin-actions-suspend.json.tpl | 0 .../admin-actions-suspend.xml.tpl | 0 .../admin-actions-unlock-server.json.tpl | 0 .../admin-actions-unlock-server.xml.tpl | 0 .../admin-actions-unpause.json.tpl | 0 .../admin-actions-unpause.xml.tpl | 0 .../os-admin-actions/server-post-req.json.tpl | 0 .../os-admin-actions/server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../os-admin-actions/server-post-resp.xml.tpl | 0 .../os-agents/agent-post-req.json.tpl | 0 .../os-agents/agent-post-req.xml.tpl | 0 .../os-agents/agent-post-resp.json.tpl | 0 .../os-agents/agent-post-resp.xml.tpl | 0 .../os-agents/agent-update-put-req.json.tpl | 0 .../os-agents/agent-update-put-req.xml.tpl | 0 .../os-agents/agent-update-put-resp.json.tpl | 0 .../os-agents/agent-update-put-resp.xml.tpl | 0 .../os-agents/agents-get-resp.json.tpl | 0 .../os-agents/agents-get-resp.xml.tpl | 0 .../aggregate-add-host-post-req.json.tpl | 0 .../aggregate-add-host-post-req.xml.tpl | 0 .../aggregate-metadata-post-req.json.tpl | 0 .../aggregate-metadata-post-req.xml.tpl | 0 .../os-aggregates/aggregate-post-req.json.tpl | 0 .../os-aggregates/aggregate-post-req.xml.tpl | 0 .../aggregate-post-resp.json.tpl | 0 .../os-aggregates/aggregate-post-resp.xml.tpl | 0 .../aggregate-remove-host-post-req.json.tpl | 0 .../aggregate-remove-host-post-req.xml.tpl | 0 .../aggregate-update-post-req.json.tpl | 0 .../aggregate-update-post-req.xml.tpl | 0 .../aggregate-update-post-resp.json.tpl | 0 .../aggregate-update-post-resp.xml.tpl | 0 .../aggregates-add-host-post-resp.json.tpl | 0 .../aggregates-add-host-post-resp.xml.tpl | 0 .../aggregates-get-resp.json.tpl | 0 .../os-aggregates/aggregates-get-resp.xml.tpl | 0 .../aggregates-list-get-resp.json.tpl | 0 .../aggregates-list-get-resp.xml.tpl | 0 .../aggregates-metadata-post-resp.json.tpl | 0 .../aggregates-metadata-post-resp.xml.tpl | 0 .../aggregates-remove-host-post-resp.json.tpl | 0 .../aggregates-remove-host-post-resp.xml.tpl | 0 .../os-aggregates/server-post-req.json.tpl | 0 .../os-aggregates/server-post-req.xml.tpl | 0 .../os-aggregates/server-post-resp.json.tpl | 0 .../os-aggregates/server-post-resp.xml.tpl | 0 .../snapshot-create-assisted-req.json.tpl | 0 .../snapshot-create-assisted-req.xml.tpl | 0 .../snapshot-create-assisted-resp.json.tpl | 0 .../snapshot-create-assisted-resp.xml.tpl | 0 .../attach-interfaces-create-req.json.tpl | 0 .../attach-interfaces-create-req.xml.tpl | 0 .../attach-interfaces-create-resp.json.tpl | 0 .../attach-interfaces-create-resp.xml.tpl | 0 .../attach-interfaces-list-resp.json.tpl | 0 .../attach-interfaces-list-resp.xml.tpl | 0 .../attach-interfaces-show-resp.json.tpl | 0 .../attach-interfaces-show-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../availability-zone-details-resp.json.tpl | 0 .../availability-zone-details-resp.xml.tpl | 0 .../availability-zone-get-resp.json.tpl | 0 .../availability-zone-get-resp.xml.tpl | 0 .../availability-zone-post-req.json.tpl | 0 .../availability-zone-post-req.xml.tpl | 0 .../availability-zone-post-resp.json.tpl | 0 .../availability-zone-post-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../cells-capacities-resp.json.tpl | 0 .../cells-capacities-resp.xml.tpl | 0 .../os-cells/cells-get-resp.json.tpl | 0 .../os-cells/cells-get-resp.xml.tpl | 0 .../os-cells/cells-list-empty-resp.json.tpl | 0 .../os-cells/cells-list-empty-resp.xml.tpl | 0 .../os-cells/cells-list-resp.json.tpl | 0 .../os-cells/cells-list-resp.xml.tpl | 0 .../certificate-create-req.json.tpl | 0 .../certificate-create-req.xml.tpl | 0 .../certificate-create-resp.json.tpl | 0 .../certificate-create-resp.xml.tpl | 0 .../certificate-get-root-resp.json.tpl | 0 .../certificate-get-root-resp.xml.tpl | 0 .../cloud-pipe-update-req.json.tpl | 0 .../cloud-pipe-update-req.xml.tpl | 0 .../cloud-pipe-create-req.json.tpl | 0 .../cloud-pipe-create-req.xml.tpl | 0 .../cloud-pipe-create-resp.json.tpl | 0 .../cloud-pipe-create-resp.xml.tpl | 0 .../os-cloudpipe/cloud-pipe-get-resp.json.tpl | 0 .../os-cloudpipe/cloud-pipe-get-resp.xml.tpl | 0 .../server-config-drive-get-resp.json.tpl | 0 .../server-config-drive-get-resp.xml.tpl | 0 .../os-config-drive/server-post-req.json.tpl | 0 .../os-config-drive/server-post-req.xml.tpl | 0 .../os-config-drive/server-post-resp.json.tpl | 0 .../os-config-drive/server-post-resp.xml.tpl | 0 ...servers-config-drive-details-resp.json.tpl | 0 .../servers-config-drive-details-resp.xml.tpl | 0 ...get-console-connect-info-get-resp.json.tpl | 0 .../get-console-connect-info-get-resp.xml.tpl | 0 .../get-rdp-console-post-req.json.tpl | 0 .../get-rdp-console-post-req.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../console-output-post-req.json.tpl | 0 .../console-output-post-req.xml.tpl | 0 .../console-output-post-resp.json.tpl | 0 .../console-output-post-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../os-console-output/server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../get-rdp-console-post-req.json.tpl | 0 .../get-rdp-console-post-req.xml.tpl | 0 .../get-rdp-console-post-resp.json.tpl | 0 .../get-rdp-console-post-resp.xml.tpl | 0 .../get-serial-console-post-req.json.tpl | 0 .../get-serial-console-post-req.xml.tpl | 0 .../get-serial-console-post-resp.json.tpl | 0 .../get-serial-console-post-resp.xml.tpl | 0 .../get-spice-console-post-req.json.tpl | 0 .../get-spice-console-post-req.xml.tpl | 0 .../get-spice-console-post-resp.json.tpl | 0 .../get-spice-console-post-resp.xml.tpl | 0 .../get-vnc-console-post-req.json.tpl | 0 .../get-vnc-console-post-req.xml.tpl | 0 .../get-vnc-console-post-resp.json.tpl | 0 .../get-vnc-console-post-resp.xml.tpl | 0 .../os-consoles/server-post-req.json.tpl | 0 .../os-consoles/server-post-req.xml.tpl | 0 .../os-consoles/server-post-resp.json.tpl | 0 .../os-consoles/server-post-resp.xml.tpl | 0 .../force-delete-post-req.json.tpl | 0 .../force-delete-post-req.xml.tpl | 0 .../restore-post-req.json.tpl | 0 .../restore-post-req.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../os-evacuate/server-evacuate-req.json.tpl | 0 .../os-evacuate/server-evacuate-req.xml.tpl | 0 .../os-evacuate/server-evacuate-resp.json.tpl | 0 .../os-evacuate/server-evacuate-resp.xml.tpl | 0 .../os-evacuate/server-post-req.json.tpl | 0 .../os-evacuate/server-post-req.xml.tpl | 0 .../os-evacuate/server-post-resp.json.tpl | 0 .../os-evacuate/server-post-resp.xml.tpl | 0 .../server-evacuate-find-host-req.json.tpl | 0 .../server-evacuate-find-host-req.xml.tpl | 0 .../server-evacuate-find-host-resp.json.tpl | 0 .../server-evacuate-find-host-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../floating-ips-create-nopool-req.json.tpl | 0 .../floating-ips-create-nopool-req.xml.tpl | 0 .../floating-ips-create-req.json.tpl | 0 .../floating-ips-create-req.xml.tpl | 0 .../floating-ips-create-resp.json.tpl | 0 .../floating-ips-create-resp.xml.tpl | 0 .../floating-ips-get-resp.json.tpl | 0 .../floating-ips-get-resp.xml.tpl | 0 .../floating-ips-list-empty-resp.json.tpl | 0 .../floating-ips-list-empty-resp.xml.tpl | 0 .../floating-ips-list-resp.json.tpl | 0 .../floating-ips-list-resp.xml.tpl | 0 .../hypervisors-show-with-ip-resp.json.tpl | 0 .../hypervisors-show-with-ip-resp.xml.tpl | 0 .../network-create-req.json.tpl | 0 .../network-create-req.xml.tpl | 0 .../network-create-resp.json.tpl | 0 .../network-create-resp.xml.tpl | 0 .../network-show-resp.json.tpl | 0 .../network-show-resp.xml.tpl | 0 .../networks-list-resp.json.tpl | 0 .../networks-list-resp.xml.tpl | 0 .../quotas-update-post-req.json.tpl | 0 .../quotas-update-post-req.xml.tpl | 0 .../quotas-update-post-resp.json.tpl | 0 .../quotas-update-post-resp.xml.tpl | 0 .../server-get-resp-rescue.json.tpl | 0 .../server-get-resp-rescue.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../server-rescue-req.json.tpl | 0 .../server-rescue-req.xml.tpl | 0 .../server-rescue.json.tpl | 0 .../server-rescue.xml.tpl | 0 .../services-get-resp.json.tpl | 0 .../services-get-resp.xml.tpl | 0 .../server-get-resp.json.tpl | 0 .../server-get-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../servers-detail-resp.xml.tpl | 0 .../os-fixed-ips/fixedip-post-req.json.tpl | 0 .../os-fixed-ips/fixedip-post-req.xml.tpl | 0 .../os-fixed-ips/fixedips-get-resp.json.tpl | 0 .../os-fixed-ips/fixedips-get-resp.xml.tpl | 0 .../flavor-access-add-tenant-req.json.tpl | 0 .../flavor-access-add-tenant-req.xml.tpl | 0 .../flavor-access-add-tenant-resp.json.tpl | 0 .../flavor-access-add-tenant-resp.xml.tpl | 0 .../flavor-access-create-req.json.tpl | 0 .../flavor-access-create-req.xml.tpl | 0 .../flavor-access-create-resp.json.tpl | 0 .../flavor-access-create-resp.xml.tpl | 0 .../flavor-access-detail-resp.json.tpl | 0 .../flavor-access-detail-resp.xml.tpl | 0 .../flavor-access-list-resp.json.tpl | 0 .../flavor-access-list-resp.xml.tpl | 0 .../flavor-access-remove-tenant-req.json.tpl | 0 .../flavor-access-remove-tenant-req.xml.tpl | 0 .../flavor-access-remove-tenant-resp.json.tpl | 0 .../flavor-access-remove-tenant-resp.xml.tpl | 0 .../flavor-access-show-resp.json.tpl | 0 .../flavor-access-show-resp.xml.tpl | 0 .../flavor-extra-specs-create-req.json.tpl | 0 .../flavor-extra-specs-create-req.xml.tpl | 0 .../flavor-extra-specs-create-resp.json.tpl | 0 .../flavor-extra-specs-create-resp.xml.tpl | 0 .../flavor-extra-specs-get-resp.json.tpl | 0 .../flavor-extra-specs-get-resp.xml.tpl | 0 .../flavor-extra-specs-list-resp.json.tpl | 0 .../flavor-extra-specs-list-resp.xml.tpl | 0 .../flavor-extra-specs-update-req.json.tpl | 0 .../flavor-extra-specs-update-req.xml.tpl | 0 .../flavor-extra-specs-update-resp.json.tpl | 0 .../flavor-extra-specs-update-resp.xml.tpl | 0 .../flavor-create-post-req.json.tpl | 0 .../flavor-create-post-req.xml.tpl | 0 .../flavor-create-post-resp.json.tpl | 0 .../flavor-create-post-resp.xml.tpl | 0 .../flavor-rxtx-get-resp.json.tpl | 0 .../flavor-rxtx-get-resp.xml.tpl | 0 .../flavor-rxtx-list-resp.json.tpl | 0 .../flavor-rxtx-list-resp.xml.tpl | 0 .../flavor-rxtx-post-req.json.tpl | 0 .../flavor-rxtx-post-req.xml.tpl | 0 .../flavor-rxtx-post-resp.json.tpl | 0 .../flavor-rxtx-post-resp.xml.tpl | 0 .../flavor-swap-get-resp.json.tpl | 0 .../flavor-swap-get-resp.xml.tpl | 0 .../flavor-swap-list-resp.json.tpl | 0 .../flavor-swap-list-resp.xml.tpl | 0 .../flavor-swap-post-req.json.tpl | 0 .../flavor-swap-post-req.xml.tpl | 0 .../flavor-swap-post-resp.json.tpl | 0 .../flavor-swap-post-resp.xml.tpl | 0 ...ip-dns-create-or-update-entry-req.json.tpl | 0 ...-ip-dns-create-or-update-entry-req.xml.tpl | 0 ...p-dns-create-or-update-entry-resp.json.tpl | 0 ...ip-dns-create-or-update-entry-resp.xml.tpl | 0 ...ating-ip-dns-create-or-update-req.json.tpl | 0 ...oating-ip-dns-create-or-update-req.xml.tpl | 0 ...ting-ip-dns-create-or-update-resp.json.tpl | 0 ...ating-ip-dns-create-or-update-resp.xml.tpl | 0 .../floating-ip-dns-entry-get-resp.json.tpl | 0 .../floating-ip-dns-entry-get-resp.xml.tpl | 0 .../floating-ip-dns-entry-list-resp.json.tpl | 0 .../floating-ip-dns-entry-list-resp.xml.tpl | 0 .../floating-ip-dns-list-resp.json.tpl | 0 .../floating-ip-dns-list-resp.xml.tpl | 0 .../floatingippools-list-resp.json.tpl | 0 .../floatingippools-list-resp.xml.tpl | 0 .../floating-ips-bulk-create-req.json.tpl | 0 .../floating-ips-bulk-create-req.xml.tpl | 0 .../floating-ips-bulk-create-resp.json.tpl | 0 .../floating-ips-bulk-create-resp.xml.tpl | 0 .../floating-ips-bulk-delete-req.json.tpl | 0 .../floating-ips-bulk-delete-req.xml.tpl | 0 .../floating-ips-bulk-delete-resp.json.tpl | 0 .../floating-ips-bulk-delete-resp.xml.tpl | 0 ...oating-ips-bulk-list-by-host-resp.json.tpl | 0 ...loating-ips-bulk-list-by-host-resp.xml.tpl | 0 .../floating-ips-bulk-list-resp.json.tpl | 0 .../floating-ips-bulk-list-resp.xml.tpl | 0 .../floating-ips-create-nopool-req.json.tpl | 0 .../floating-ips-create-nopool-req.xml.tpl | 0 .../floating-ips-create-req.json.tpl | 0 .../floating-ips-create-req.xml.tpl | 0 .../floating-ips-create-resp.json.tpl | 0 .../floating-ips-create-resp.xml.tpl | 0 .../floating-ips-get-resp.json.tpl | 0 .../floating-ips-get-resp.xml.tpl | 0 .../floating-ips-list-empty-resp.json.tpl | 0 .../floating-ips-list-empty-resp.xml.tpl | 0 .../floating-ips-list-resp.json.tpl | 0 .../floating-ips-list-resp.xml.tpl | 0 .../os-fping/fping-get-details-resp.json.tpl | 0 .../os-fping/fping-get-details-resp.xml.tpl | 0 .../os-fping/fping-get-resp.json.tpl | 0 .../os-fping/fping-get-resp.xml.tpl | 0 .../os-fping/server-post-req.json.tpl | 0 .../os-fping/server-post-req.xml.tpl | 0 .../os-fping/server-post-resp.json.tpl | 0 .../os-fping/server-post-resp.xml.tpl | 0 .../server-get-resp.json.tpl | 0 .../server-get-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../servers-details-resp.json.tpl | 0 .../servers-details-resp.xml.tpl | 0 .../servers-list-resp.json.tpl | 0 .../servers-list-resp.xml.tpl | 0 .../os-hosts/host-get-reboot.json.tpl | 0 .../os-hosts/host-get-reboot.xml.tpl | 0 .../os-hosts/host-get-resp.json.tpl | 0 .../os-hosts/host-get-resp.xml.tpl | 0 .../os-hosts/host-get-shutdown.json.tpl | 0 .../os-hosts/host-get-shutdown.xml.tpl | 0 .../os-hosts/host-get-startup.json.tpl | 0 .../os-hosts/host-get-startup.xml.tpl | 0 .../host-put-maintenance-req.json.tpl | 0 .../os-hosts/host-put-maintenance-req.xml.tpl | 0 .../host-put-maintenance-resp.json.tpl | 0 .../host-put-maintenance-resp.xml.tpl | 0 .../os-hosts/hosts-list-resp.json.tpl | 0 .../os-hosts/hosts-list-resp.xml.tpl | 0 ...hypervisors-show-with-status-resp.json.tpl | 0 .../hypervisors-show-with-status-resp.xml.tpl | 0 .../hypervisors-detail-resp.json.tpl | 0 .../hypervisors-detail-resp.xml.tpl | 0 .../hypervisors-list-resp.json.tpl | 0 .../hypervisors-list-resp.xml.tpl | 0 .../hypervisors-search-resp.json.tpl | 0 .../hypervisors-search-resp.xml.tpl | 0 .../hypervisors-servers-resp.json.tpl | 0 .../hypervisors-servers-resp.xml.tpl | 0 .../hypervisors-show-resp.json.tpl | 0 .../hypervisors-show-resp.xml.tpl | 0 .../hypervisors-statistics-resp.json.tpl | 0 .../hypervisors-statistics-resp.xml.tpl | 0 .../hypervisors-uptime-resp.json.tpl | 0 .../hypervisors-uptime-resp.xml.tpl | 0 .../instance-action-get-resp.json.tpl | 0 .../instance-action-get-resp.xml.tpl | 0 .../instance-actions-list-resp.json.tpl | 0 .../instance-actions-list-resp.xml.tpl | 0 ...st-usage-audit-log-index-get-resp.json.tpl | 0 ...nst-usage-audit-log-index-get-resp.xml.tpl | 0 ...nst-usage-audit-log-show-get-resp.json.tpl | 0 ...inst-usage-audit-log-show-get-resp.xml.tpl | 0 .../os-keypairs/keypairs-get-resp.json.tpl | 0 .../os-keypairs/keypairs-get-resp.xml.tpl | 0 .../keypairs-import-post-req.json.tpl | 0 .../keypairs-import-post-req.xml.tpl | 0 .../keypairs-import-post-resp.json.tpl | 0 .../keypairs-import-post-resp.xml.tpl | 0 .../os-keypairs/keypairs-list-resp.json.tpl | 0 .../os-keypairs/keypairs-list-resp.xml.tpl | 0 .../os-keypairs/keypairs-post-req.json.tpl | 0 .../os-keypairs/keypairs-post-req.xml.tpl | 0 .../os-keypairs/keypairs-post-resp.json.tpl | 0 .../os-keypairs/keypairs-post-resp.xml.tpl | 0 .../os-migrations/migrations-get.json.tpl | 0 .../os-migrations/migrations-get.xml.tpl | 0 .../multiple-create-no-resv-post-req.json.tpl | 0 .../multiple-create-no-resv-post-req.xml.tpl | 0 ...multiple-create-no-resv-post-resp.json.tpl | 0 .../multiple-create-no-resv-post-resp.xml.tpl | 0 .../multiple-create-post-req.json.tpl | 0 .../multiple-create-post-req.xml.tpl | 0 .../multiple-create-post-resp.json.tpl | 0 .../multiple-create-post-resp.xml.tpl | 0 .../network-associate-host-req.json.tpl | 0 .../network-associate-host-req.xml.tpl | 0 .../network-disassociate-host-req.json.tpl | 0 .../network-disassociate-host-req.xml.tpl | 0 .../network-disassociate-project-req.json.tpl | 0 .../network-disassociate-project-req.xml.tpl | 0 .../network-disassociate-req.json.tpl | 0 .../network-disassociate-req.xml.tpl | 0 .../os-networks/network-add-req.json.tpl | 0 .../os-networks/network-add-req.xml.tpl | 0 .../os-networks/network-create-req.json.tpl | 0 .../os-networks/network-create-req.xml.tpl | 0 .../os-networks/network-create-resp.json.tpl | 0 .../os-networks/network-create-resp.xml.tpl | 0 .../os-networks/network-show-resp.json.tpl | 0 .../os-networks/network-show-resp.xml.tpl | 0 .../networks-disassociate-req.json.tpl | 0 .../networks-disassociate-req.xml.tpl | 0 .../os-networks/networks-list-resp.json.tpl | 0 .../os-networks/networks-list-resp.xml.tpl | 0 .../server-action-rebuild-resp.json.tpl | 0 .../server-action-rebuild-resp.xml.tpl | 0 .../server-action-rebuild.json.tpl | 0 .../server-action-rebuild.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../quota-classes-show-get-resp.json.tpl | 0 .../quota-classes-show-get-resp.xml.tpl | 0 .../quota-classes-update-post-req.json.tpl | 0 .../quota-classes-update-post-req.xml.tpl | 0 .../quota-classes-update-post-resp.json.tpl | 0 .../quota-classes-update-post-resp.xml.tpl | 0 .../quotas-show-defaults-get-resp.json.tpl | 0 .../quotas-show-defaults-get-resp.xml.tpl | 0 .../quotas-show-get-resp.json.tpl | 0 .../quotas-show-get-resp.xml.tpl | 0 .../quotas-update-post-req.json.tpl | 0 .../quotas-update-post-req.xml.tpl | 0 .../quotas-update-post-resp.json.tpl | 0 .../quotas-update-post-resp.xml.tpl | 0 .../os-rescue/server-get-resp-rescue.json.tpl | 0 .../os-rescue/server-get-resp-rescue.xml.tpl | 0 .../server-get-resp-unrescue.json.tpl | 0 .../server-get-resp-unrescue.xml.tpl | 0 .../os-rescue/server-post-req.json.tpl | 0 .../os-rescue/server-post-req.xml.tpl | 0 .../os-rescue/server-post-resp.json.tpl | 0 .../os-rescue/server-post-resp.xml.tpl | 0 .../os-rescue/server-rescue-req.json.tpl | 0 .../os-rescue/server-rescue-req.xml.tpl | 0 .../os-rescue/server-rescue.json.tpl | 0 .../os-rescue/server-rescue.xml.tpl | 0 .../os-rescue/server-unrescue-req.json.tpl | 0 .../os-rescue/server-unrescue-req.xml.tpl | 0 ...ty-group-default-rules-create-req.json.tpl | 0 ...ity-group-default-rules-create-req.xml.tpl | 0 ...y-group-default-rules-create-resp.json.tpl | 0 ...ty-group-default-rules-create-resp.xml.tpl | 0 ...ity-group-default-rules-list-resp.json.tpl | 0 ...rity-group-default-rules-list-resp.xml.tpl | 0 ...ity-group-default-rules-show-resp.json.tpl | 0 ...rity-group-default-rules-show-resp.xml.tpl | 0 .../security-group-add-post-req.json.tpl | 0 .../security-group-add-post-req.xml.tpl | 0 .../security-group-post-req.json.tpl | 0 .../security-group-post-req.xml.tpl | 0 .../security-group-remove-post-req.json.tpl | 0 .../security-group-remove-post-req.xml.tpl | 0 .../security-groups-create-resp.json.tpl | 0 .../security-groups-create-resp.xml.tpl | 0 .../security-groups-get-resp.json.tpl | 0 .../security-groups-get-resp.xml.tpl | 0 .../security-groups-list-get-resp.json.tpl | 0 .../security-groups-list-get-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../server-security-groups-list-resp.json.tpl | 0 .../server-security-groups-list-resp.xml.tpl | 0 .../server-diagnostics-get-resp.json.tpl | 0 .../server-diagnostics-get-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../event-create-req.json.tpl | 0 .../event-create-req.xml.tpl | 0 .../event-create-resp.json.tpl | 0 .../event-create-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../limit-get-resp.json.tpl | 0 .../limit-get-resp.xml.tpl | 0 .../quota-classes-show-get-resp.json.tpl | 0 .../quota-classes-show-get-resp.xml.tpl | 0 .../quota-classes-update-post-req.json.tpl | 0 .../quota-classes-update-post-req.xml.tpl | 0 .../quota-classes-update-post-resp.json.tpl | 0 .../quota-classes-update-post-resp.xml.tpl | 0 .../quotas-show-defaults-get-resp.json.tpl | 0 .../quotas-show-defaults-get-resp.xml.tpl | 0 .../quotas-show-get-resp.json.tpl | 0 .../quotas-show-get-resp.xml.tpl | 0 .../quotas-update-post-req.json.tpl | 0 .../quotas-update-post-req.xml.tpl | 0 .../quotas-update-post-resp.json.tpl | 0 .../quotas-update-post-resp.xml.tpl | 0 .../usedlimits-get-resp.json.tpl | 0 .../usedlimits-get-resp.xml.tpl | 0 .../server-groups-get-resp.json.tpl | 0 .../server-groups-get-resp.xml.tpl | 0 .../server-groups-list-resp.json.tpl | 0 .../server-groups-list-resp.xml.tpl | 0 .../server-groups-post-req.json.tpl | 0 .../server-groups-post-req.xml.tpl | 0 .../server-groups-post-resp.json.tpl | 0 .../server-groups-post-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../servers-list-resp.json.tpl | 0 .../servers-list-resp.xml.tpl | 0 .../get-password-resp.json.tpl | 0 .../get-password-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../server_start_stop.json.tpl | 0 .../server_start_stop.xml.tpl | 0 .../service-disable-log-put-req.json.tpl | 0 .../service-disable-log-put-req.xml.tpl | 0 .../service-disable-log-put-resp.json.tpl | 0 .../service-disable-log-put-resp.xml.tpl | 0 .../service-disable-put-req.json.tpl | 0 .../service-disable-put-req.xml.tpl | 0 .../service-disable-put-resp.json.tpl | 0 .../service-disable-put-resp.xml.tpl | 0 .../service-enable-put-req.json.tpl | 0 .../service-enable-put-req.xml.tpl | 0 .../service-enable-put-resp.json.tpl | 0 .../service-enable-put-resp.xml.tpl | 0 .../os-services/services-get-resp.json.tpl | 0 .../os-services/services-get-resp.xml.tpl | 0 .../services-list-get-resp.json.tpl | 0 .../services-list-get-resp.xml.tpl | 0 .../os-shelve/os-shelve-offload.json.tpl | 0 .../os-shelve/os-shelve-offload.xml.tpl | 0 .../api_samples/os-shelve/os-shelve.json.tpl | 0 .../api_samples/os-shelve/os-shelve.xml.tpl | 0 .../os-shelve/os-unshelve.json.tpl | 0 .../api_samples/os-shelve/os-unshelve.xml.tpl | 0 .../os-shelve/server-post-req.json.tpl | 0 .../os-shelve/server-post-req.xml.tpl | 0 .../os-shelve/server-post-resp.json.tpl | 0 .../os-shelve/server-post-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../simple-tenant-usage-get-specific.json.tpl | 0 .../simple-tenant-usage-get-specific.xml.tpl | 0 .../simple-tenant-usage-get.json.tpl | 0 .../simple-tenant-usage-get.xml.tpl | 0 .../networks-list-res.json.tpl | 0 .../networks-list-res.xml.tpl | 0 .../networks-post-req.json.tpl | 0 .../networks-post-req.xml.tpl | 0 .../networks-post-res.json.tpl | 0 .../networks-post-res.xml.tpl | 0 .../usedlimitsforadmin-get-resp.json.tpl | 0 .../usedlimitsforadmin-get-resp.xml.tpl | 0 .../usedlimits-get-resp.json.tpl | 0 .../usedlimits-get-resp.xml.tpl | 0 .../os-user-data/userdata-post-req.json.tpl | 0 .../os-user-data/userdata-post-req.xml.tpl | 0 .../os-user-data/userdata-post-resp.json.tpl | 0 .../os-user-data/userdata-post-resp.xml.tpl | 0 .../user-quotas-show-get-resp.json.tpl | 0 .../user-quotas-show-get-resp.xml.tpl | 0 .../user-quotas-update-post-req.json.tpl | 0 .../user-quotas-update-post-req.xml.tpl | 0 .../user-quotas-update-post-resp.json.tpl | 0 .../user-quotas-update-post-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../vifs-list-resp.json.tpl | 0 .../vifs-list-resp.xml.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-req.xml.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-post-resp.xml.tpl | 0 .../update-volume-req.json.tpl | 0 .../update-volume-req.xml.tpl | 0 .../attach-volume-to-server-req.json.tpl | 0 .../attach-volume-to-server-req.xml.tpl | 0 .../attach-volume-to-server-resp.json.tpl | 0 .../attach-volume-to-server-resp.xml.tpl | 0 .../list-volume-attachments-resp.json.tpl | 0 .../list-volume-attachments-resp.xml.tpl | 0 .../os-volumes-detail-resp.json.tpl | 0 .../os-volumes/os-volumes-detail-resp.xml.tpl | 0 .../os-volumes/os-volumes-get-resp.json.tpl | 0 .../os-volumes/os-volumes-get-resp.xml.tpl | 0 .../os-volumes/os-volumes-index-resp.json.tpl | 0 .../os-volumes/os-volumes-index-resp.xml.tpl | 0 .../os-volumes/os-volumes-post-req.json.tpl | 0 .../os-volumes/os-volumes-post-req.xml.tpl | 0 .../os-volumes/os-volumes-post-resp.json.tpl | 0 .../os-volumes/os-volumes-post-resp.xml.tpl | 0 .../os-volumes/server-post-req.json.tpl | 0 .../os-volumes/server-post-req.xml.tpl | 0 .../os-volumes/server-post-resp.json.tpl | 0 .../os-volumes/server-post-resp.xml.tpl | 0 .../os-volumes/snapshot-create-req.json.tpl | 0 .../os-volumes/snapshot-create-req.xml.tpl | 0 .../os-volumes/snapshot-create-resp.json.tpl | 0 .../os-volumes/snapshot-create-resp.xml.tpl | 0 .../os-volumes/snapshots-detail-resp.json.tpl | 0 .../os-volumes/snapshots-detail-resp.xml.tpl | 0 .../os-volumes/snapshots-list-resp.json.tpl | 0 .../os-volumes/snapshots-list-resp.xml.tpl | 0 .../os-volumes/snapshots-show-resp.json.tpl | 0 .../os-volumes/snapshots-show-resp.xml.tpl | 0 .../volume-attachment-detail-resp.json.tpl | 0 .../volume-attachment-detail-resp.xml.tpl | 0 .../server-action-changepassword.json.tpl | 0 .../server-action-changepassword.xml.tpl | 0 .../server-action-confirmresize.json.tpl | 0 .../server-action-confirmresize.xml.tpl | 0 .../server-action-createimage.json.tpl | 0 .../server-action-createimage.xml.tpl | 0 .../api_samples/server-action-reboot.json.tpl | 0 .../api_samples/server-action-reboot.xml.tpl | 0 .../server-action-rebuild-resp.json.tpl | 0 .../server-action-rebuild-resp.xml.tpl | 0 .../server-action-rebuild.json.tpl | 0 .../api_samples/server-action-rebuild.xml.tpl | 0 .../api_samples/server-action-resize.json.tpl | 0 .../api_samples/server-action-resize.xml.tpl | 0 .../server-action-revertresize.json.tpl | 0 .../server-action-revertresize.xml.tpl | 0 .../api_samples/server-get-resp.json.tpl | 0 .../api_samples/server-get-resp.xml.tpl | 0 .../server-ips-network-resp.json.tpl | 0 .../server-ips-network-resp.xml.tpl | 0 .../api_samples/server-ips-resp.json.tpl | 0 .../api_samples/server-ips-resp.xml.tpl | 0 .../server-metadata-all-req.json.tpl | 0 .../server-metadata-all-req.xml.tpl | 0 .../server-metadata-all-resp.json.tpl | 0 .../server-metadata-all-resp.xml.tpl | 0 .../api_samples/server-metadata-req.json.tpl | 0 .../api_samples/server-metadata-req.xml.tpl | 0 .../api_samples/server-metadata-resp.json.tpl | 0 .../api_samples/server-metadata-resp.xml.tpl | 0 .../api_samples/server-post-req.json.tpl | 0 .../api_samples/server-post-req.xml.tpl | 0 .../api_samples/server-post-resp.json.tpl | 0 .../api_samples/server-post-resp.xml.tpl | 0 .../api_samples/servers-details-resp.json.tpl | 0 .../api_samples/servers-details-resp.xml.tpl | 0 .../api_samples/servers-list-resp.json.tpl | 0 .../api_samples/servers-list-resp.xml.tpl | 0 .../api_samples/versions-get-resp.json.tpl | 0 .../api_samples/versions-get-resp.xml.tpl | 0 .../integrated/api_samples_test_base.py | 4 +- .../integrated/integrated_helpers.py | 12 ++--- .../{ => unit}/integrated/test_api_samples.py | 30 +++++------ .../{ => unit}/integrated/test_extensions.py | 4 +- .../tests/{ => unit}/integrated/test_login.py | 4 +- .../{ => unit}/integrated/test_servers.py | 6 +-- nova/tests/{ => unit}/integrated/test_xml.py | 2 +- .../{ => unit}/integrated/v3/__init__.py | 0 .../integrated/v3/api_sample_base.py | 9 ++-- .../all_extensions/server-get-resp.json.tpl | 0 .../all_extensions/server-post-req.json.tpl | 0 .../all_extensions/server-post-resp.json.tpl | 0 .../servers-details-resp.json.tpl | 0 .../all_extensions/servers-list-resp.json.tpl | 0 .../consoles/consoles-create-req.json.tpl | 0 .../consoles/consoles-get-resp.json.tpl | 0 .../consoles/consoles-list-get-resp.json.tpl | 0 .../consoles/server-post-req.json.tpl | 0 .../consoles/server-post-resp.json.tpl | 0 .../extensions-get-resp.json.tpl | 0 .../extensions-list-resp.json.tpl | 0 .../flavor-access-add-tenant-req.json.tpl | 0 .../flavor-access-add-tenant-resp.json.tpl | 0 .../flavor-access-create-req.json.tpl | 0 .../flavor-access-create-resp.json.tpl | 0 .../flavor-access-detail-resp.json.tpl | 0 .../flavor-access-list-resp.json.tpl | 0 .../flavor-access-remove-tenant-req.json.tpl | 0 .../flavor-access-remove-tenant-resp.json.tpl | 0 .../flavor-access-show-resp.json.tpl | 0 .../flavor-extra-specs-create-req.json.tpl | 0 .../flavor-extra-specs-create-resp.json.tpl | 0 .../flavor-extra-specs-get-resp.json.tpl | 0 .../flavor-extra-specs-list-resp.json.tpl | 0 .../flavor-extra-specs-update-req.json.tpl | 0 .../flavor-extra-specs-update-resp.json.tpl | 0 .../flavor-create-post-req.json.tpl | 0 .../flavor-create-post-resp.json.tpl | 0 .../flavors/flavor-get-resp.json.tpl | 0 .../flavors/flavors-detail-resp.json.tpl | 0 .../flavors/flavors-list-resp.json.tpl | 0 .../image-size/image-get-resp.json.tpl | 0 .../images-details-get-resp.json.tpl | 0 .../images/image-get-resp.json.tpl | 0 .../images/image-meta-key-get.json.tpl | 0 .../images/image-meta-key-put-req.json.tpl | 0 .../images/image-meta-key-put-resp.json.tpl | 0 .../images/image-metadata-get-resp.json.tpl | 0 .../images/image-metadata-post-req.json.tpl | 0 .../images/image-metadata-post-resp.json.tpl | 0 .../images/image-metadata-put-req.json.tpl | 0 .../images/image-metadata-put-resp.json.tpl | 0 .../images/images-details-get-resp.json.tpl | 0 .../images/images-list-get-resp.json.tpl | 0 .../keypairs/keypairs-get-resp.json.tpl | 0 .../keypairs-import-post-req.json.tpl | 0 .../keypairs-import-post-resp.json.tpl | 0 .../keypairs/keypairs-list-resp.json.tpl | 0 .../keypairs/keypairs-post-req.json.tpl | 0 .../keypairs/keypairs-post-resp.json.tpl | 0 .../server-action-rebuild-resp.json.tpl | 0 .../server-action-rebuild.json.tpl | 0 .../os-access-ips/server-get-resp.json.tpl | 0 .../os-access-ips/server-post-req.json.tpl | 0 .../os-access-ips/server-post-resp.json.tpl | 0 .../os-access-ips/server-put-req.json.tpl | 0 .../os-access-ips/server-put-resp.json.tpl | 0 .../servers-details-resp.json.tpl | 0 .../os-access-ips/servers-list-resp.json.tpl | 0 ...admin-actions-inject-network-info.json.tpl | 0 .../admin-actions-reset-network.json.tpl | 0 .../admin-actions-reset-server-state.json.tpl | 0 .../admin-actions-reset-state.json.tpl | 0 .../os-admin-actions/server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../admin-password-change-password.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../os-agents/agent-post-req.json.tpl | 0 .../os-agents/agent-post-resp.json.tpl | 0 .../os-agents/agent-update-put-req.json.tpl | 0 .../os-agents/agent-update-put-resp.json.tpl | 0 .../os-agents/agents-get-resp.json.tpl | 0 .../aggregate-add-host-post-req.json.tpl | 0 .../aggregate-metadata-post-req.json.tpl | 0 .../os-aggregates/aggregate-post-req.json.tpl | 0 .../aggregate-post-resp.json.tpl | 0 .../aggregate-remove-host-post-req.json.tpl | 0 .../aggregate-update-post-req.json.tpl | 0 .../aggregate-update-post-resp.json.tpl | 0 .../aggregates-add-host-post-resp.json.tpl | 0 .../aggregates-get-resp.json.tpl | 0 .../aggregates-list-get-resp.json.tpl | 0 .../aggregates-metadata-post-resp.json.tpl | 0 .../aggregates-remove-host-post-resp.json.tpl | 0 .../attach-interfaces-create-req.json.tpl | 0 .../attach-interfaces-create-resp.json.tpl | 0 .../attach-interfaces-list-resp.json.tpl | 0 .../attach-interfaces-show-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../availability-zone-detail-resp.json.tpl | 0 .../availability-zone-list-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../os-cells/cells-capacities-resp.json.tpl | 0 .../os-cells/cells-get-resp.json.tpl | 0 .../os-cells/cells-list-empty-resp.json.tpl | 0 .../os-cells/cells-list-resp.json.tpl | 0 .../certificate-create-req.json.tpl | 0 .../certificate-create-resp.json.tpl | 0 .../certificate-get-root-resp.json.tpl | 0 .../cloud-pipe-create-req.json.tpl | 0 .../cloud-pipe-create-resp.json.tpl | 0 .../os-cloudpipe/cloud-pipe-get-resp.json.tpl | 0 .../cloud-pipe-update-req.json.tpl | 0 .../server-config-drive-get-resp.json.tpl | 0 .../os-config-drive/server-post-req.json.tpl | 0 .../os-config-drive/server-post-resp.json.tpl | 0 ...servers-config-drive-details-resp.json.tpl | 0 ...get-console-connect-info-get-resp.json.tpl | 0 .../get-rdp-console-post-req.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../console-output-post-req.json.tpl | 0 .../console-output-post-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../create-backup-req.json.tpl | 0 .../os-create-backup/server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../force-delete-post-req.json.tpl | 0 .../restore-post-req.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../os-disk-config/image-get-resp.json.tpl | 0 .../os-disk-config/image-list-resp.json.tpl | 0 .../list-servers-detail-get.json.tpl | 0 .../server-action-rebuild-req.json.tpl | 0 .../server-action-rebuild-resp.json.tpl | 0 .../os-disk-config/server-get-resp.json.tpl | 0 .../os-disk-config/server-post-req.json.tpl | 0 .../os-disk-config/server-post-resp.json.tpl | 0 .../server-resize-post-req.json.tpl | 0 .../server-update-put-req.json.tpl | 0 .../server-update-put-resp.json.tpl | 0 .../server-evacuate-find-host-req.json.tpl | 0 .../server-evacuate-find-host-resp.json.tpl | 0 .../os-evacuate/server-evacuate-req.json.tpl | 0 .../os-evacuate/server-evacuate-resp.json.tpl | 0 .../os-evacuate/server-post-req.json.tpl | 0 .../os-evacuate/server-post-resp.json.tpl | 0 .../server-get-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../server-get-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../server-get-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../attach-volume-req.json.tpl | 0 .../detach-volume-req.json.tpl | 0 .../server-get-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../swap-volume-req.json.tpl | 0 .../os-fixed-ips/fixedip-post-req.json.tpl | 0 .../os-fixed-ips/fixedips-get-resp.json.tpl | 0 .../flavor-rxtx-get-resp.json.tpl | 0 .../flavor-rxtx-list-resp.json.tpl | 0 .../flavor-rxtx-post-req.json.tpl | 0 .../flavor-rxtx-post-resp.json.tpl | 0 ...ip-dns-create-or-update-entry-req.json.tpl | 0 ...p-dns-create-or-update-entry-resp.json.tpl | 0 ...ating-ip-dns-create-or-update-req.json.tpl | 0 ...ting-ip-dns-create-or-update-resp.json.tpl | 0 .../floating-ip-dns-entry-get-resp.json.tpl | 0 .../floating-ip-dns-entry-list-resp.json.tpl | 0 .../floating-ip-dns-list-resp.json.tpl | 0 .../floatingippools-list-resp.json.tpl | 0 .../floating-ips-bulk-create-req.json.tpl | 0 .../floating-ips-bulk-create-resp.json.tpl | 0 .../floating-ips-bulk-delete-req.json.tpl | 0 .../floating-ips-bulk-delete-resp.json.tpl | 0 ...oating-ips-bulk-list-by-host-resp.json.tpl | 0 .../floating-ips-bulk-list-resp.json.tpl | 0 .../os-fping/fping-get-details-resp.json.tpl | 0 .../os-fping/fping-get-resp.json.tpl | 0 .../os-fping/server-post-req.json.tpl | 0 .../os-fping/server-post-resp.json.tpl | 0 .../server-get-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../servers-details-resp.json.tpl | 0 .../servers-list-resp.json.tpl | 0 .../os-hosts/host-get-reboot.json.tpl | 0 .../os-hosts/host-get-resp.json.tpl | 0 .../os-hosts/host-get-shutdown.json.tpl | 0 .../os-hosts/host-get-startup.json.tpl | 0 .../host-put-maintenance-req.json.tpl | 0 .../host-put-maintenance-resp.json.tpl | 0 .../hosts-list-compute-service-resp.json.tpl | 0 .../os-hosts/hosts-list-resp.json.tpl | 0 .../hypervisors-detail-resp.json.tpl | 0 .../hypervisors-list-resp.json.tpl | 0 .../hypervisors-search-resp.json.tpl | 0 .../hypervisors-servers-resp.json.tpl | 0 .../hypervisors-show-resp.json.tpl | 0 .../hypervisors-statistics-resp.json.tpl | 0 .../hypervisors-uptime-resp.json.tpl | 0 .../instance-action-get-resp.json.tpl | 0 .../instance-actions-list-resp.json.tpl | 0 .../instance-instance-get-resp.json.tpl | 0 .../os-lock-server/lock-server.json.tpl | 0 .../os-lock-server/server-post-req.json.tpl | 0 .../os-lock-server/server-post-resp.json.tpl | 0 .../os-lock-server/unlock-server.json.tpl | 0 .../live-migrate-server.json.tpl | 0 .../os-migrate-server/migrate-server.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../os-migrations/migrations-get.json.tpl | 0 .../multinic-add-fixed-ip-req.json.tpl | 0 .../multinic-remove-fixed-ip-req.json.tpl | 0 .../os-multinic/server-post-req.json.tpl | 0 .../os-multinic/server-post-resp.json.tpl | 0 .../multiple-create-no-resv-post-req.json.tpl | 0 ...multiple-create-no-resv-post-resp.json.tpl | 0 .../multiple-create-post-req.json.tpl | 0 .../multiple-create-post-resp.json.tpl | 0 .../network-associate-host-req.json.tpl | 0 .../network-disassociate-host-req.json.tpl | 0 .../network-disassociate-project-req.json.tpl | 0 .../network-disassociate-req.json.tpl | 0 .../os-networks/network-add-req.json.tpl | 0 .../os-networks/network-create-req.json.tpl | 0 .../os-networks/network-create-resp.json.tpl | 0 .../os-networks/network-show-resp.json.tpl | 0 .../networks-disassociate-req.json.tpl | 0 .../os-networks/networks-list-resp.json.tpl | 0 .../os-pause-server/pause-server.json.tpl | 0 .../os-pause-server/server-post-req.json.tpl | 0 .../os-pause-server/server-post-resp.json.tpl | 0 .../os-pause-server/unpause-server.json.tpl | 0 .../hypervisors-pci-detail-resp.json.tpl | 0 .../os-pci/hypervisors-pci-show-resp.json.tpl | 0 .../os-pci/pci-detail-resp.json.tpl | 0 .../os-pci/pci-index-resp.json.tpl | 0 .../api_samples/os-pci/pci-show-resp.json.tpl | 0 .../os-pci/server-get-resp.json.tpl | 0 .../os-pci/server-post-req.json.tpl | 0 .../os-pci/server-post-resp.json.tpl | 0 .../os-pci/servers-detail-resp.json.tpl | 0 .../quotas-show-defaults-get-resp.json.tpl | 0 .../quotas-show-get-resp.json.tpl | 0 .../quotas-update-force-post-req.json.tpl | 0 .../quotas-update-force-post-resp.json.tpl | 0 .../quotas-update-force-resp.json.tpl | 0 .../quotas-update-post-req.json.tpl | 0 .../quotas-update-post-resp.json.tpl | 0 .../user-quotas-show-get-resp.json.tpl | 0 .../user-quotas-update-post-req.json.tpl | 0 .../user-quotas-update-post-resp.json.tpl | 0 .../get-rdp-console-post-req.json.tpl | 0 .../get-rdp-console-post-resp.json.tpl | 0 .../get-serial-console-post-req.json.tpl | 0 .../get-serial-console-post-resp.json.tpl | 0 .../get-spice-console-post-req.json.tpl | 0 .../get-spice-console-post-resp.json.tpl | 0 .../get-vnc-console-post-req.json.tpl | 0 .../get-vnc-console-post-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../os-rescue/server-get-resp-rescue.json.tpl | 0 .../server-get-resp-unrescue.json.tpl | 0 .../os-rescue/server-post-req.json.tpl | 0 .../os-rescue/server-post-resp.json.tpl | 0 .../server-rescue-req-with-image-ref.json.tpl | 0 .../os-rescue/server-rescue-req.json.tpl | 0 .../os-rescue/server-rescue.json.tpl | 0 .../os-rescue/server-unrescue-req.json.tpl | 0 .../scheduler-hints-post-req.json.tpl | 0 .../scheduler-hints-post-resp.json.tpl | 0 ...ty-group-default-rules-create-req.json.tpl | 0 ...y-group-default-rules-create-resp.json.tpl | 0 ...ity-group-default-rules-list-resp.json.tpl | 0 ...ity-group-default-rules-show-resp.json.tpl | 0 .../security-group-add-post-req.json.tpl | 0 .../security-group-post-req.json.tpl | 0 .../security-group-remove-post-req.json.tpl | 0 .../security-groups-create-resp.json.tpl | 0 .../security-groups-get-resp.json.tpl | 0 .../security-groups-list-get-resp.json.tpl | 0 .../server-get-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-security-groups-list-resp.json.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../server-diagnostics-get-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../event-create-req.json.tpl | 0 .../event-create-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../server-groups-get-resp.json.tpl | 0 .../server-groups-list-resp.json.tpl | 0 .../server-groups-post-req.json.tpl | 0 .../server-groups-post-resp.json.tpl | 0 .../os-server-usage/server-get-resp.json.tpl | 0 .../os-server-usage/server-post-req.json.tpl | 0 .../os-server-usage/server-post-resp.json.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../service-disable-log-put-req.json.tpl | 0 .../service-disable-log-put-resp.json.tpl | 0 .../service-disable-put-req.json.tpl | 0 .../service-disable-put-resp.json.tpl | 0 .../service-enable-put-req.json.tpl | 0 .../service-enable-put-resp.json.tpl | 0 .../services-list-get-resp.json.tpl | 0 .../os-shelve/os-shelve-offload.json.tpl | 0 .../api_samples/os-shelve/os-shelve.json.tpl | 0 .../os-shelve/os-unshelve.json.tpl | 0 .../os-shelve/server-post-req.json.tpl | 0 .../os-shelve/server-post-resp.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../simple-tenant-usage-get-specific.json.tpl | 0 .../simple-tenant-usage-get.json.tpl | 0 .../server-post-req.json.tpl | 0 .../server-post-resp.json.tpl | 0 .../os-suspend-server/server-resume.json.tpl | 0 .../os-suspend-server/server-suspend.json.tpl | 0 .../networks-list-res.json.tpl | 0 .../networks-post-req.json.tpl | 0 .../networks-post-res.json.tpl | 0 .../usedlimits-get-resp.json.tpl | 0 .../os-user-data/userdata-post-req.json.tpl | 0 .../os-user-data/userdata-post-resp.json.tpl | 0 .../os-volumes-detail-resp.json.tpl | 0 .../os-volumes/os-volumes-get-resp.json.tpl | 0 .../os-volumes/os-volumes-index-resp.json.tpl | 0 .../os-volumes/os-volumes-post-req.json.tpl | 0 .../os-volumes/os-volumes-post-resp.json.tpl | 0 .../os-volumes/server-post-req.json.tpl | 0 .../os-volumes/server-post-resp.json.tpl | 0 .../os-volumes/snapshot-create-req.json.tpl | 0 .../os-volumes/snapshot-create-resp.json.tpl | 0 .../os-volumes/snapshots-detail-resp.json.tpl | 0 .../os-volumes/snapshots-list-resp.json.tpl | 0 .../os-volumes/snapshots-show-resp.json.tpl | 0 .../server-ips-network-resp.json.tpl | 0 .../server-ips/server-ips-resp.json.tpl | 0 .../server-ips/server-post-req.json.tpl | 0 .../server-ips/server-post-resp.json.tpl | 0 .../server-metadata-all-req.json.tpl | 0 .../server-metadata-all-resp.json.tpl | 0 .../server-metadata-req.json.tpl | 0 .../server-metadata-resp.json.tpl | 0 .../server-metadata/server-post-req.json.tpl | 0 .../server-metadata/server-post-resp.json.tpl | 0 .../server-action-confirm-resize.json.tpl | 0 .../server-action-create-image.json.tpl | 0 .../servers/server-action-reboot.json.tpl | 0 ...n-rebuild-preserve-ephemeral-resp.json.tpl | 0 ...action-rebuild-preserve-ephemeral.json.tpl | 0 .../server-action-rebuild-resp.json.tpl | 0 .../servers/server-action-rebuild.json.tpl | 0 .../servers/server-action-resize.json.tpl | 0 .../server-action-revert-resize.json.tpl | 0 .../servers/server-action-start.json.tpl | 0 .../servers/server-action-stop.json.tpl | 0 .../servers/server-get-resp.json.tpl | 0 .../servers/server-post-req.json.tpl | 0 .../servers/server-post-resp.json.tpl | 0 .../servers/servers-details-resp.json.tpl | 0 .../servers/servers-list-resp.json.tpl | 0 .../integrated/v3/test_access_ips.py | 4 +- .../integrated/v3/test_admin_actions.py | 2 +- .../integrated/v3/test_admin_password.py | 2 +- .../{ => unit}/integrated/v3/test_agents.py | 2 +- .../integrated/v3/test_aggregates.py | 2 +- .../integrated/v3/test_attach_interfaces.py | 4 +- .../integrated/v3/test_availability_zone.py | 2 +- .../{ => unit}/integrated/v3/test_cells.py | 2 +- .../integrated/v3/test_certificates.py | 2 +- .../integrated/v3/test_cloudpipe.py | 4 +- .../integrated/v3/test_config_drive.py | 6 +-- .../integrated/v3/test_console_auth_tokens.py | 2 +- .../integrated/v3/test_console_output.py | 2 +- .../{ => unit}/integrated/v3/test_consoles.py | 2 +- .../integrated/v3/test_create_backup.py | 4 +- .../integrated/v3/test_deferred_delete.py | 2 +- .../integrated/v3/test_disk_config.py | 4 +- .../{ => unit}/integrated/v3/test_evacuate.py | 2 +- .../v3/test_extended_availability_zone.py | 2 +- .../v3/test_extended_server_attributes.py | 2 +- .../integrated/v3/test_extended_status.py | 2 +- .../integrated/v3/test_extended_volumes.py | 8 +-- .../integrated/v3/test_extension_info.py | 2 +- .../integrated/v3/test_fixed_ips.py | 6 +-- .../integrated/v3/test_flavor_access.py | 2 +- .../integrated/v3/test_flavor_extraspecs.py | 2 +- .../integrated/v3/test_flavor_manage.py | 2 +- .../integrated/v3/test_flavor_rxtx.py | 2 +- .../{ => unit}/integrated/v3/test_flavors.py | 2 +- .../integrated/v3/test_floating_ip_dns.py | 2 +- .../integrated/v3/test_floating_ip_pools.py | 2 +- .../integrated/v3/test_floating_ips_bulk.py | 2 +- .../{ => unit}/integrated/v3/test_fping.py | 4 +- .../v3/test_hide_server_addresses.py | 2 +- .../{ => unit}/integrated/v3/test_hosts.py | 2 +- .../integrated/v3/test_hypervisors.py | 2 +- .../integrated/v3/test_image_size.py | 4 +- .../{ => unit}/integrated/v3/test_images.py | 4 +- .../integrated/v3/test_instance_actions.py | 6 +-- .../{ => unit}/integrated/v3/test_keypairs.py | 2 +- .../integrated/v3/test_lock_server.py | 2 +- .../integrated/v3/test_migrate_server.py | 2 +- .../integrated/v3/test_migrations.py | 2 +- .../{ => unit}/integrated/v3/test_multinic.py | 2 +- .../integrated/v3/test_multiple_create.py | 4 +- .../{ => unit}/integrated/v3/test_networks.py | 4 +- .../integrated/v3/test_networks_associate.py | 2 +- .../integrated/v3/test_pause_server.py | 2 +- .../{ => unit}/integrated/v3/test_pci.py | 4 +- .../integrated/v3/test_quota_sets.py | 2 +- .../integrated/v3/test_remote_consoles.py | 2 +- .../{ => unit}/integrated/v3/test_rescue.py | 2 +- .../integrated/v3/test_scheduler_hints.py | 4 +- .../v3/test_security_group_default_rules.py | 2 +- .../integrated/v3/test_security_groups.py | 2 +- .../integrated/v3/test_server_diagnostics.py | 2 +- .../v3/test_server_external_events.py | 2 +- .../integrated/v3/test_server_groups.py | 2 +- .../integrated/v3/test_server_metadata.py | 2 +- .../integrated/v3/test_server_usage.py | 2 +- .../{ => unit}/integrated/v3/test_servers.py | 4 +- .../integrated/v3/test_servers_ips.py | 2 +- .../{ => unit}/integrated/v3/test_services.py | 4 +- .../{ => unit}/integrated/v3/test_shelve.py | 2 +- .../integrated/v3/test_simple_tenant_usage.py | 2 +- .../integrated/v3/test_suspend_server.py | 2 +- .../integrated/v3/test_tenant_networks.py | 2 +- .../integrated/v3/test_used_limits.py | 2 +- .../integrated/v3/test_user_data.py | 4 +- .../{ => unit}/integrated/v3/test_volumes.py | 6 +-- nova/tests/{ => unit}/keymgr/__init__.py | 0 nova/tests/{ => unit}/keymgr/fake.py | 0 .../{ => unit}/keymgr/test_conf_key_mgr.py | 2 +- nova/tests/{ => unit}/keymgr/test_key.py | 0 nova/tests/{ => unit}/keymgr/test_key_mgr.py | 0 .../{ => unit}/keymgr/test_mock_key_mgr.py | 2 +- .../keymgr/test_not_implemented_key_mgr.py | 2 +- .../{ => unit}/keymgr/test_single_key_mgr.py | 2 +- nova/tests/{ => unit}/matchers.py | 0 .../monkey_patch_example/__init__.py | 0 .../monkey_patch_example/example_a.py | 0 .../monkey_patch_example/example_b.py | 0 nova/tests/{ => unit}/network/__init__.py | 0 .../network/security_group/__init__.py | 0 .../security_group/test_neutron_driver.py | 0 nova/tests/{ => unit}/network/test_api.py | 8 +-- .../{ => unit}/network/test_linux_net.py | 0 nova/tests/{ => unit}/network/test_manager.py | 16 +++--- .../{ => unit}/network/test_network_info.py | 2 +- .../{ => unit}/network/test_neutronv2.py | 2 +- nova/tests/{ => unit}/network/test_rpcapi.py | 2 +- nova/tests/{ => unit}/objects/__init__.py | 0 nova/tests/{ => unit}/objects/test_agent.py | 2 +- .../{ => unit}/objects/test_aggregate.py | 4 +- .../objects/test_bandwidth_usage.py | 2 +- .../{ => unit}/objects/test_block_device.py | 6 +-- .../{ => unit}/objects/test_compute_node.py | 2 +- .../{ => unit}/objects/test_dns_domain.py | 2 +- nova/tests/{ => unit}/objects/test_ec2.py | 2 +- .../{ => unit}/objects/test_external_event.py | 2 +- nova/tests/{ => unit}/objects/test_fields.py | 0 .../tests/{ => unit}/objects/test_fixed_ip.py | 6 +-- nova/tests/{ => unit}/objects/test_flavor.py | 2 +- .../{ => unit}/objects/test_floating_ip.py | 6 +-- nova/tests/{ => unit}/objects/test_hv_spec.py | 2 +- .../tests/{ => unit}/objects/test_instance.py | 16 +++--- .../objects/test_instance_action.py | 2 +- .../{ => unit}/objects/test_instance_fault.py | 2 +- .../{ => unit}/objects/test_instance_group.py | 6 +-- .../objects/test_instance_info_cache.py | 2 +- .../objects/test_instance_numa_topology.py | 2 +- .../objects/test_instance_pci_requests.py | 2 +- nova/tests/{ => unit}/objects/test_keypair.py | 2 +- .../{ => unit}/objects/test_migration.py | 4 +- nova/tests/{ => unit}/objects/test_network.py | 2 +- .../objects/test_network_request.py | 2 +- nova/tests/{ => unit}/objects/test_objects.py | 2 +- .../{ => unit}/objects/test_pci_device.py | 2 +- nova/tests/{ => unit}/objects/test_quotas.py | 4 +- .../{ => unit}/objects/test_security_group.py | 2 +- .../objects/test_security_group_rule.py | 4 +- nova/tests/{ => unit}/objects/test_service.py | 4 +- .../objects/test_virtual_interface.py | 2 +- nova/tests/{ => unit}/pci/__init__.py | 0 nova/tests/{ => unit}/pci/fakes.py | 0 nova/tests/{ => unit}/pci/test_device.py | 0 nova/tests/{ => unit}/pci/test_devspec.py | 0 nova/tests/{ => unit}/pci/test_manager.py | 4 +- nova/tests/{ => unit}/pci/test_request.py | 0 nova/tests/{ => unit}/pci/test_stats.py | 2 +- nova/tests/{ => unit}/pci/test_utils.py | 0 nova/tests/{ => unit}/pci/test_whitelist.py | 0 nova/tests/{ => unit}/policy_fixture.py | 2 +- nova/tests/{ => unit}/scheduler/__init__.py | 0 nova/tests/{ => unit}/scheduler/fakes.py | 0 .../{ => unit}/scheduler/filters/__init__.py | 0 .../filters/test_affinity_filters.py | 2 +- ...gate_image_properties_isolation_filters.py | 2 +- ..._aggregate_instance_extra_specs_filters.py | 2 +- ...ggregate_multitenancy_isolation_filters.py | 2 +- .../filters/test_availability_zone_filters.py | 2 +- .../test_compute_capabilities_filters.py | 2 +- .../scheduler/filters/test_compute_filters.py | 2 +- .../scheduler/filters/test_core_filters.py | 2 +- .../scheduler/filters/test_disk_filters.py | 2 +- .../scheduler/filters/test_extra_specs_ops.py | 0 .../filters/test_image_props_filters.py | 2 +- .../scheduler/filters/test_io_ops_filters.py | 2 +- .../filters/test_isolated_hosts_filter.py | 2 +- .../scheduler/filters/test_json_filters.py | 2 +- .../scheduler/filters/test_metrics_filters.py | 2 +- .../filters/test_num_instances_filters.py | 2 +- .../filters/test_numa_topology_filters.py | 4 +- .../filters/test_pci_passthrough_filters.py | 2 +- .../scheduler/filters/test_ram_filters.py | 2 +- .../scheduler/filters/test_retry_filters.py | 2 +- .../scheduler/filters/test_trusted_filters.py | 2 +- .../scheduler/filters/test_type_filters.py | 2 +- .../{ => unit}/scheduler/ironic_fakes.py | 0 .../scheduler/test_baremetal_host_manager.py | 0 .../scheduler/test_caching_scheduler.py | 4 +- .../scheduler/test_chance_scheduler.py | 2 +- .../tests/{ => unit}/scheduler/test_client.py | 0 .../scheduler/test_filter_scheduler.py | 4 +- .../{ => unit}/scheduler/test_filters.py | 0 .../scheduler/test_filters_utils.py | 0 .../{ => unit}/scheduler/test_host_filters.py | 2 +- .../{ => unit}/scheduler/test_host_manager.py | 4 +- .../scheduler/test_ironic_host_manager.py | 2 +- .../tests/{ => unit}/scheduler/test_rpcapi.py | 0 .../{ => unit}/scheduler/test_scheduler.py | 10 ++-- .../scheduler/test_scheduler_options.py | 0 .../scheduler/test_scheduler_utils.py | 2 +- .../{ => unit}/scheduler/test_weights.py | 4 +- .../tests/{ => unit}/servicegroup/__init__.py | 0 .../servicegroup/test_db_servicegroup.py | 2 +- .../servicegroup/test_mc_servicegroup.py | 2 +- .../{ => unit}/servicegroup/test_zk_driver.py | 2 +- nova/tests/{ => unit}/ssl_cert/ca.crt | 0 .../tests/{ => unit}/ssl_cert/certificate.crt | 0 nova/tests/{ => unit}/ssl_cert/privatekey.key | 0 nova/tests/{ => unit}/test_api_validation.py | 0 .../{ => unit}/test_availability_zones.py | 2 +- nova/tests/{ => unit}/test_baserpc.py | 0 nova/tests/{ => unit}/test_bdm.py | 2 +- nova/tests/{ => unit}/test_block_device.py | 4 +- nova/tests/{ => unit}/test_cinder.py | 0 nova/tests/{ => unit}/test_configdrive2.py | 2 +- nova/tests/{ => unit}/test_context.py | 0 nova/tests/{ => unit}/test_crypto.py | 0 nova/tests/{ => unit}/test_exception.py | 0 nova/tests/{ => unit}/test_flavors.py | 0 nova/tests/{ => unit}/test_hacking.py | 0 nova/tests/{ => unit}/test_hooks.py | 0 .../test_instance_types_extra_specs.py | 0 .../tests/{ => unit}/test_iptables_network.py | 0 nova/tests/{ => unit}/test_ipv6.py | 0 nova/tests/{ => unit}/test_linuxscsi.py | 0 nova/tests/{ => unit}/test_loadables.py | 4 +- nova/tests/{ => unit}/test_matchers.py | 2 +- nova/tests/{ => unit}/test_metadata.py | 10 ++-- nova/tests/{ => unit}/test_notifications.py | 4 +- nova/tests/{ => unit}/test_nova_manage.py | 4 +- nova/tests/{ => unit}/test_objectstore.py | 0 nova/tests/{ => unit}/test_pipelib.py | 0 nova/tests/{ => unit}/test_policy.py | 2 +- nova/tests/{ => unit}/test_quota.py | 8 +-- nova/tests/{ => unit}/test_safeutils.py | 0 nova/tests/{ => unit}/test_service.py | 20 +++---- nova/tests/{ => unit}/test_test.py | 0 nova/tests/{ => unit}/test_test_utils.py | 2 +- nova/tests/{ => unit}/test_utils.py | 20 +++---- nova/tests/{ => unit}/test_versions.py | 0 nova/tests/{ => unit}/test_weights.py | 0 nova/tests/{ => unit}/test_wsgi.py | 2 +- nova/tests/{ => unit}/utils.py | 0 nova/tests/{ => unit}/virt/__init__.py | 0 nova/tests/{ => unit}/virt/disk/__init__.py | 0 .../{ => unit}/virt/disk/mount/__init__.py | 0 .../{ => unit}/virt/disk/mount/test_loop.py | 0 .../{ => unit}/virt/disk/mount/test_nbd.py | 0 nova/tests/{ => unit}/virt/disk/test_api.py | 0 .../tests/{ => unit}/virt/disk/test_inject.py | 2 +- .../{ => unit}/virt/disk/vfs/__init__.py | 0 .../{ => unit}/virt/disk/vfs/fakeguestfs.py | 0 .../{ => unit}/virt/disk/vfs/test_guestfs.py | 2 +- .../{ => unit}/virt/disk/vfs/test_localfs.py | 2 +- nova/tests/{ => unit}/virt/hyperv/__init__.py | 0 nova/tests/{ => unit}/virt/hyperv/db_fakes.py | 0 nova/tests/{ => unit}/virt/hyperv/fake.py | 0 .../virt/hyperv/test_basevolumeutils.py | 0 .../{ => unit}/virt/hyperv/test_hostutils.py | 0 .../{ => unit}/virt/hyperv/test_hypervapi.py | 10 ++-- .../{ => unit}/virt/hyperv/test_ioutils.py | 0 .../virt/hyperv/test_migrationops.py | 2 +- .../virt/hyperv/test_networkutils.py | 0 .../virt/hyperv/test_networkutilsv2.py | 2 +- .../{ => unit}/virt/hyperv/test_pathutils.py | 0 .../virt/hyperv/test_rdpconsoleutils.py | 0 .../virt/hyperv/test_rdpconsoleutilsv2.py | 0 .../virt/hyperv/test_utilsfactory.py | 0 .../{ => unit}/virt/hyperv/test_vhdutils.py | 0 .../{ => unit}/virt/hyperv/test_vhdutilsv2.py | 0 .../{ => unit}/virt/hyperv/test_vmops.py | 2 +- .../{ => unit}/virt/hyperv/test_vmutils.py | 0 .../{ => unit}/virt/hyperv/test_vmutilsv2.py | 2 +- .../virt/hyperv/test_volumeutils.py | 2 +- .../virt/hyperv/test_volumeutilsv2.py | 0 nova/tests/{ => unit}/virt/ironic/__init__.py | 0 .../virt/ironic/test_client_wrapper.py | 2 +- .../{ => unit}/virt/ironic/test_driver.py | 6 +-- .../{ => unit}/virt/ironic/test_patcher.py | 4 +- nova/tests/{ => unit}/virt/ironic/utils.py | 0 .../tests/{ => unit}/virt/libvirt/__init__.py | 0 .../virt/libvirt/fake_imagebackend.py | 0 .../virt/libvirt/fake_libvirt_utils.py | 0 .../{ => unit}/virt/libvirt/fakelibvirt.py | 0 .../{ => unit}/virt/libvirt/test_blockinfo.py | 6 +-- .../{ => unit}/virt/libvirt/test_config.py | 2 +- .../{ => unit}/virt/libvirt/test_designer.py | 0 .../{ => unit}/virt/libvirt/test_dmcrypt.py | 0 .../{ => unit}/virt/libvirt/test_driver.py | 30 +++++------ .../virt/libvirt/test_fakelibvirt.py | 2 +- .../{ => unit}/virt/libvirt/test_firewall.py | 4 +- .../virt/libvirt/test_imagebackend.py | 4 +- .../virt/libvirt/test_imagecache.py | 2 +- .../tests/{ => unit}/virt/libvirt/test_lvm.py | 0 .../tests/{ => unit}/virt/libvirt/test_rbd.py | 0 .../{ => unit}/virt/libvirt/test_utils.py | 0 .../tests/{ => unit}/virt/libvirt/test_vif.py | 2 +- .../{ => unit}/virt/libvirt/test_volume.py | 2 +- .../{ => unit}/virt/test_block_device.py | 4 +- .../tests/{ => unit}/virt/test_configdrive.py | 0 .../tests/{ => unit}/virt/test_diagnostics.py | 0 nova/tests/{ => unit}/virt/test_driver.py | 4 +- nova/tests/{ => unit}/virt/test_events.py | 0 nova/tests/{ => unit}/virt/test_hardware.py | 2 +- nova/tests/{ => unit}/virt/test_imagecache.py | 2 +- nova/tests/{ => unit}/virt/test_images.py | 0 nova/tests/{ => unit}/virt/test_virt.py | 0 .../{ => unit}/virt/test_virt_drivers.py | 16 +++--- .../tests/{ => unit}/virt/test_volumeutils.py | 0 .../{ => unit}/virt/vmwareapi/__init__.py | 0 nova/tests/{ => unit}/virt/vmwareapi/fake.py | 0 nova/tests/{ => unit}/virt/vmwareapi/stubs.py | 4 +- .../virt/vmwareapi/test_configdrive.py | 16 +++--- .../virt/vmwareapi/test_driver_api.py | 22 ++++---- .../{ => unit}/virt/vmwareapi/test_ds_util.py | 2 +- .../test_ds_util_datastore_selection.py | 0 .../virt/vmwareapi/test_imagecache.py | 4 +- .../{ => unit}/virt/vmwareapi/test_images.py | 8 +-- .../{ => unit}/virt/vmwareapi/test_io_util.py | 0 .../virt/vmwareapi/test_read_write_util.py | 0 .../{ => unit}/virt/vmwareapi/test_vif.py | 6 +-- .../virt/vmwareapi/test_vim_util.py | 4 +- .../{ => unit}/virt/vmwareapi/test_vm_util.py | 6 +-- .../{ => unit}/virt/vmwareapi/test_vmops.py | 12 ++--- .../virt/vmwareapi/test_volumeops.py | 4 +- nova/tests/{ => unit}/virt/xenapi/__init__.py | 0 .../{ => unit}/virt/xenapi/client/__init__.py | 0 .../virt/xenapi/client/test_objects.py | 2 +- .../virt/xenapi/client/test_session.py | 2 +- .../{ => unit}/virt/xenapi/image/__init__.py | 0 .../virt/xenapi/image/test_bittorrent.py | 2 +- .../virt/xenapi/image/test_glance.py | 2 +- .../virt/xenapi/image/test_utils.py | 0 .../virt/xenapi/image/test_vdi_through_dev.py | 0 nova/tests/{ => unit}/virt/xenapi/stubs.py | 4 +- .../{ => unit}/virt/xenapi/test_agent.py | 0 .../{ => unit}/virt/xenapi/test_driver.py | 2 +- .../virt/xenapi/test_network_utils.py | 2 +- .../{ => unit}/virt/xenapi/test_vm_utils.py | 4 +- .../{ => unit}/virt/xenapi/test_vmops.py | 4 +- .../virt/xenapi/test_volume_utils.py | 2 +- .../{ => unit}/virt/xenapi/test_volumeops.py | 2 +- .../{ => unit}/virt/xenapi/test_xenapi.py | 25 ++++----- nova/tests/{ => unit}/virt/xenapi/vm_rrd.xml | 0 nova/tests/{ => unit}/volume/__init__.py | 0 .../{ => unit}/volume/encryptors/__init__.py | 0 .../{ => unit}/volume/encryptors/test_base.py | 2 +- .../volume/encryptors/test_cryptsetup.py | 2 +- .../{ => unit}/volume/encryptors/test_luks.py | 2 +- .../{ => unit}/volume/encryptors/test_nop.py | 2 +- nova/tests/{ => unit}/volume/test_cinder.py | 0 run_tests.sh | 2 +- tox.ini | 1 + 1830 files changed, 814 insertions(+), 807 deletions(-) rename nova/tests/{ => unit}/CA/cacert.pem (100%) rename nova/tests/{ => unit}/CA/private/cakey.pem (100%) rename nova/tests/{ => unit}/README.rst (100%) create mode 100644 nova/tests/unit/__init__.py rename nova/tests/{ => unit}/api/__init__.py (100%) rename nova/tests/{ => unit}/api/ec2/__init__.py (100%) rename nova/tests/{ => unit}/api/ec2/public_key/dummy.fingerprint (100%) rename nova/tests/{ => unit}/api/ec2/public_key/dummy.pub (100%) rename nova/tests/{ => unit}/api/ec2/test_api.py (99%) rename nova/tests/{ => unit}/api/ec2/test_apirequest.py (100%) rename nova/tests/{ => unit}/api/ec2/test_cinder_cloud.py (99%) rename nova/tests/{ => unit}/api/ec2/test_cloud.py (99%) rename nova/tests/{ => unit}/api/ec2/test_ec2_validate.py (98%) rename nova/tests/{ => unit}/api/ec2/test_ec2utils.py (100%) rename nova/tests/{ => unit}/api/ec2/test_error_response.py (100%) rename nova/tests/{ => unit}/api/ec2/test_faults.py (100%) rename nova/tests/{ => unit}/api/ec2/test_middleware.py (100%) rename nova/tests/{ => unit}/api/openstack/__init__.py (100%) rename nova/tests/{ => unit}/api/openstack/common.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/__init__.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/__init__.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_admin_actions.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_admin_password.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_agents.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_aggregates.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_attach_interfaces.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_availability_zone.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_baremetal_nodes.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_block_device_mapping.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_block_device_mapping_v1.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_cells.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_certificates.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_cloudpipe.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_cloudpipe_update.py (97%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_config_drive.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_console_auth_tokens.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_console_output.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_consoles.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_createserverext.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_deferred_delete.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_disk_config.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_evacuate.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_extended_availability_zone.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_extended_evacuate_find_host.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_extended_hypervisors.py (96%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_extended_ips.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_extended_ips_mac.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_extended_rescue_with_image.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_extended_server_attributes.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_extended_status.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_extended_volumes.py (97%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_fixed_ips.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_flavor_access.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_flavor_disabled.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_flavor_manage.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_flavor_rxtx.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_flavor_swap.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_flavorextradata.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_flavors_extra_specs.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_floating_ip_dns.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_floating_ip_pools.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_floating_ips.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_floating_ips_bulk.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_fping.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_hide_server_addresses.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_hosts.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_hypervisor_status.py (97%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_hypervisors.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_image_size.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_instance_actions.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_instance_usage_audit_log.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_keypairs.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_migrate_server.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_migrations.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_multinic.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_networks.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_neutron_security_groups.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_quota_classes.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_quotas.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_rescue.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_scheduler_hints.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_security_group_default_rules.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_security_groups.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_server_diagnostics.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_server_external_events.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_server_group_quotas.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_server_groups.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_server_password.py (97%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_server_start_stop.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_server_usage.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_services.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_shelve.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_simple_tenant_usage.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_snapshots.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_tenant_networks.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_used_limits.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_virtual_interfaces.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/contrib/test_volumes.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/extensions/__init__.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/extensions/foxinsocks.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/__init__.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/__init__.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/admin_only_action_common.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_access_ips.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_console_auth_tokens.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_consoles.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_create_backup.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_extended_volumes.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_extension_info.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_lock_server.py (95%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_migrations.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_multiple_create.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_pause_server.py (95%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_pci.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_server_actions.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_server_external_events.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_server_password.py (96%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_servers.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_services.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_suspend_server.py (94%) rename nova/tests/{ => unit}/api/openstack/compute/plugins/v3/test_user_data.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/__init__.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/test_schemas.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/flavors/invalid/mixed.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/flavors/invalid/partial.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/flavors/invalid/partial2.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/flavors/valid/empty.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/flavors/valid/full.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/flavors/valid/refs.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/images/invalid/mixed.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/images/invalid/no-metadata.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/images/invalid/partial.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/images/invalid/partial2.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/images/valid/empty.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/images/valid/full.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/images/valid/refs.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/servers/invalid/mixed.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/servers/invalid/partial.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/servers/invalid/partial2.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/servers/invalid/partial3.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/servers/valid/detailed.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/servers/valid/empty.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/servers/valid/full.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/schemas/v1.1/servers/valid/refs.xml (100%) rename nova/tests/{ => unit}/api/openstack/compute/test_api.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/test_auth.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/test_consoles.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/test_extensions.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/test_flavors.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/test_image_metadata.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/test_images.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/test_limits.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/test_server_actions.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/test_server_metadata.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/test_servers.py (99%) rename nova/tests/{ => unit}/api/openstack/compute/test_urlmap.py (97%) rename nova/tests/{ => unit}/api/openstack/compute/test_v21_extensions.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/test_v3_auth.py (98%) rename nova/tests/{ => unit}/api/openstack/compute/test_v3_extensions.py (100%) rename nova/tests/{ => unit}/api/openstack/compute/test_versions.py (99%) rename nova/tests/{ => unit}/api/openstack/fakes.py (99%) rename nova/tests/{ => unit}/api/openstack/test_common.py (99%) rename nova/tests/{ => unit}/api/openstack/test_faults.py (100%) rename nova/tests/{ => unit}/api/openstack/test_mapper.py (97%) rename nova/tests/{ => unit}/api/openstack/test_wsgi.py (99%) rename nova/tests/{ => unit}/api/openstack/test_xmlutil.py (99%) rename nova/tests/{ => unit}/api/test_auth.py (100%) rename nova/tests/{ => unit}/api/test_compute_req_id.py (100%) rename nova/tests/{ => unit}/api/test_validator.py (100%) rename nova/tests/{ => unit}/api/test_wsgi.py (100%) rename nova/tests/{ => unit}/bundle/1mb.manifest.xml (100%) rename nova/tests/{ => unit}/bundle/1mb.no_kernel_or_ramdisk.manifest.xml (100%) rename nova/tests/{ => unit}/bundle/1mb.part.0 (100%) rename nova/tests/{ => unit}/bundle/1mb.part.1 (100%) rename nova/tests/{ => unit}/cast_as_call.py (100%) rename nova/tests/{ => unit}/cells/__init__.py (100%) rename nova/tests/{ => unit}/cells/fakes.py (98%) rename nova/tests/{ => unit}/cells/test_cells_filters.py (99%) rename nova/tests/{ => unit}/cells/test_cells_manager.py (99%) rename nova/tests/{ => unit}/cells/test_cells_messaging.py (99%) rename nova/tests/{ => unit}/cells/test_cells_rpc_driver.py (99%) rename nova/tests/{ => unit}/cells/test_cells_rpcapi.py (99%) rename nova/tests/{ => unit}/cells/test_cells_scheduler.py (98%) rename nova/tests/{ => unit}/cells/test_cells_state_manager.py (100%) rename nova/tests/{ => unit}/cells/test_cells_utils.py (100%) rename nova/tests/{ => unit}/cells/test_cells_weights.py (100%) rename nova/tests/{ => unit}/cert/__init__.py (100%) rename nova/tests/{ => unit}/cert/test_rpcapi.py (100%) rename nova/tests/{ => unit}/cmd/__init__.py (100%) rename nova/tests/{ => unit}/cmd/test_idmapshift.py (100%) rename nova/tests/{ => unit}/compute/__init__.py (100%) rename nova/tests/{ => unit}/compute/eventlet_utils.py (100%) rename nova/tests/{ => unit}/compute/fake_resource_tracker.py (100%) rename nova/tests/{ => unit}/compute/monitors/__init__.py (100%) rename nova/tests/{ => unit}/compute/monitors/test_cpu_monitor.py (100%) rename nova/tests/{ => unit}/compute/monitors/test_monitors.py (96%) rename nova/tests/{ => unit}/compute/test_arch.py (100%) rename nova/tests/{ => unit}/compute/test_claims.py (99%) rename nova/tests/{ => unit}/compute/test_compute.py (99%) rename nova/tests/{ => unit}/compute/test_compute_api.py (99%) rename nova/tests/{ => unit}/compute/test_compute_cells.py (99%) rename nova/tests/{ => unit}/compute/test_compute_mgr.py (99%) rename nova/tests/{ => unit}/compute/test_compute_utils.py (98%) rename nova/tests/{ => unit}/compute/test_compute_xen.py (95%) rename nova/tests/{ => unit}/compute/test_flavors.py (100%) rename nova/tests/{ => unit}/compute/test_host_api.py (99%) rename nova/tests/{ => unit}/compute/test_hvtype.py (100%) rename nova/tests/{ => unit}/compute/test_keypairs.py (98%) rename nova/tests/{ => unit}/compute/test_multiple_nodes.py (100%) rename nova/tests/{ => unit}/compute/test_resource_tracker.py (99%) rename nova/tests/{ => unit}/compute/test_resources.py (99%) rename nova/tests/{ => unit}/compute/test_rpcapi.py (99%) rename nova/tests/{ => unit}/compute/test_shelve.py (99%) rename nova/tests/{ => unit}/compute/test_stats.py (100%) rename nova/tests/{ => unit}/compute/test_tracker.py (100%) rename nova/tests/{ => unit}/compute/test_virtapi.py (100%) rename nova/tests/{ => unit}/compute/test_vmmode.py (100%) rename nova/tests/{ => unit}/conductor/__init__.py (100%) rename nova/tests/{ => unit}/conductor/tasks/__init__.py (100%) rename nova/tests/{ => unit}/conductor/tasks/test_live_migrate.py (99%) rename nova/tests/{ => unit}/conductor/test_conductor.py (99%) rename nova/tests/{ => unit}/conf_fixture.py (94%) rename nova/tests/{ => unit}/console/__init__.py (100%) rename nova/tests/{ => unit}/console/test_console.py (100%) rename nova/tests/{ => unit}/console/test_rpcapi.py (100%) rename nova/tests/{ => unit}/console/test_serial.py (100%) rename nova/tests/{ => unit}/console/test_type.py (100%) rename nova/tests/{ => unit}/console/test_websocketproxy.py (100%) rename nova/tests/{ => unit}/consoleauth/__init__.py (100%) rename nova/tests/{ => unit}/consoleauth/test_consoleauth.py (100%) rename nova/tests/{ => unit}/consoleauth/test_rpcapi.py (100%) rename nova/tests/{ => unit}/db/__init__.py (100%) rename nova/tests/{ => unit}/db/fakes.py (100%) rename nova/tests/{ => unit}/db/test_db_api.py (99%) rename nova/tests/{ => unit}/db/test_migration_utils.py (99%) rename nova/tests/{ => unit}/db/test_migrations.conf (100%) rename nova/tests/{ => unit}/db/test_migrations.py (100%) rename nova/tests/{ => unit}/db/test_sqlite.py (100%) rename nova/tests/{ => unit}/fake_block_device.py (100%) rename nova/tests/{ => unit}/fake_crypto.py (100%) rename nova/tests/{ => unit}/fake_hosts.py (96%) rename nova/tests/{ => unit}/fake_instance.py (100%) rename nova/tests/{ => unit}/fake_ldap.py (100%) rename nova/tests/{ => unit}/fake_loadables/__init__.py (100%) rename nova/tests/{ => unit}/fake_loadables/fake_loadable1.py (96%) rename nova/tests/{ => unit}/fake_loadables/fake_loadable2.py (96%) rename nova/tests/{ => unit}/fake_network.py (99%) rename nova/tests/{ => unit}/fake_network_cache_model.py (100%) rename nova/tests/{ => unit}/fake_notifier.py (100%) rename nova/tests/{ => unit}/fake_policy.py (100%) rename nova/tests/{ => unit}/fake_processutils.py (100%) rename nova/tests/{ => unit}/fake_server_actions.py (100%) rename nova/tests/{ => unit}/fake_utils.py (100%) rename nova/tests/{ => unit}/fake_volume.py (100%) rename nova/tests/{ => unit}/functional/__init__.py (100%) rename nova/tests/{ => unit}/image/__init__.py (100%) rename nova/tests/{ => unit}/image/abs.tar.gz (100%) rename nova/tests/{ => unit}/image/fake.py (100%) rename nova/tests/{ => unit}/image/rel.tar.gz (100%) rename nova/tests/{ => unit}/image/test_fake.py (96%) rename nova/tests/{ => unit}/image/test_glance.py (100%) rename nova/tests/{ => unit}/image/test_s3.py (99%) rename nova/tests/{ => unit}/image/test_transfer_modules.py (100%) rename nova/tests/{ => unit}/image_fixtures.py (100%) rename nova/tests/{ => unit}/integrated/__init__.py (100%) rename nova/tests/{ => unit}/integrated/api/__init__.py (100%) rename nova/tests/{ => unit}/integrated/api/client.py (99%) rename nova/tests/{ => unit}/integrated/api_samples/NMN/multinic-add-fixed-ip-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/NMN/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/NMN/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/NMN/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/NMN/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/image-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/image-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/image-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/image-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/list-servers-detail-get.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-action-rebuild-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-action-rebuild-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-resize-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-resize-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-update-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-update-put-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-DCF/server-update-put-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-AZ/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-AZ/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-AZ/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-AZ/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS-MAC/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS-MAC/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS-MAC/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-STS/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-STS/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-STS/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-STS/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-VIF-NET/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-VIF-NET/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-VIF-NET/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-VIF-NET/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-VIF-NET/vifs-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SRV-USG/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SRV-USG/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SRV-USG/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SRV-USG/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SRV-USG/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SRV-USG/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SRV-USG/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/README.rst (94%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/flavors-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/flavors-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-changepassword.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-changepassword.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-confirmresize.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-confirmresize.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-createimage.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-createimage.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-reboot.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-reboot.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-rebuild.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-resize.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-resize.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-revertresize.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-action-revertresize.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/servers-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/servers-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/all_extensions/servers-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/flavor-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/flavor-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/flavors-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/flavors-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-meta-key-get.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-meta-key-get.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-meta-key-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-meta-key-put-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-meta-key-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-meta-key-put-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-put-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-put-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/image-metadata-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/images-details-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/images-details-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/images-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/images-details-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/images-list-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/images-list-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/images-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/images-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/limit-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/limit-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-backup-server.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-backup-server.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-inject-network-info.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-live-migrate.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-live-migrate.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-lock-server.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-lock-server.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-migrate.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-migrate.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-pause.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-pause.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-reset-network.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-reset-server-state.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-reset-state.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-resume.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-resume.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-suspend.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-suspend.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-unlock-server.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-unlock-server.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-unpause.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/admin-actions-unpause.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-admin-actions/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-agents/agent-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-agents/agent-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-agents/agent-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-agents/agent-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-agents/agent-update-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-agents/agent-update-put-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-agents/agent-update-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-agents/agent-update-put-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-agents/agents-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-agents/agents-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-update-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregates-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregates-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-aggregates/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-attach-interfaces/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-availability-zone/availability-zone-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-availability-zone/availability-zone-details-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-availability-zone/availability-zone-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-availability-zone/availability-zone-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-availability-zone/availability-zone-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cell-capacities/cells-capacities-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cell-capacities/cells-capacities-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cells/cells-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cells/cells-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cells/cells-list-empty-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cells/cells-list-empty-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cells/cells-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cells/cells-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-certificates/certificate-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-certificates/certificate-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-certificates/certificate-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-certificates/certificate-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-certificates/certificate-get-root-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-certificates/certificate-get-root-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cloudpipe-update/cloud-pipe-update-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cloudpipe/cloud-pipe-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-config-drive/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-config-drive/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-config-drive/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-config-drive/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-auth-tokens/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-auth-tokens/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-auth-tokens/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-auth-tokens/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-output/console-output-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-output/console-output-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-output/console-output-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-output/console-output-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-output/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-output/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-output/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-console-output/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-rdp-console-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-rdp-console-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-rdp-console-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-rdp-console-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-serial-console-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-serial-console-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-serial-console-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-serial-console-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-spice-console-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-spice-console-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-spice-console-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-spice-console-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-vnc-console-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-vnc-console-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/get-vnc-console-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-consoles/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-deferred-delete/force-delete-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-deferred-delete/restore-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-deferred-delete/restore-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-deferred-delete/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-deferred-delete/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-deferred-delete/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-deferred-delete/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-evacuate/server-evacuate-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-evacuate/server-evacuate-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-evacuate/server-evacuate-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-evacuate/server-evacuate-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-evacuate/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-evacuate/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-evacuate/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-evacuate/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-evacuate-find-host/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-evacuate-find-host/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-evacuate-find-host/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-evacuate-find-host/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-networks/network-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-networks/network-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-networks/network-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-networks/network-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-networks/network-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-networks/network-show-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-networks/networks-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-networks/networks-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-quotas/quotas-update-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-quotas/quotas-update-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-quotas/quotas-update-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-quotas/quotas-update-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-rescue-with-image/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-rescue-with-image/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-rescue-with-image/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-rescue-with-image/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-rescue-with-image/server-rescue-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-rescue-with-image/server-rescue-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-rescue-with-image/server-rescue.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-rescue-with-image/server-rescue.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-services-delete/services-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-services-delete/services-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-volumes/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-volumes/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-volumes/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-volumes/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-volumes/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-volumes/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-volumes/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fixed-ips/fixedip-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fixed-ips/fixedip-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fixed-ips/fixedips-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-manage/flavor-create-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-manage/flavor-create-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-manage/flavor-create-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-manage/flavor-create-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-swap/flavor-swap-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-swap/flavor-swap-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-swap/flavor-swap-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-flavor-swap/flavor-swap-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-floating-ips/floating-ips-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fping/fping-get-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fping/fping-get-details-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fping/fping-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fping/fping-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fping/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fping/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fping/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-fping/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hide-server-addresses/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hide-server-addresses/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hide-server-addresses/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hide-server-addresses/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hide-server-addresses/servers-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-get-reboot.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-get-reboot.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-get-shutdown.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-get-shutdown.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-get-startup.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-get-startup.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-put-maintenance-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-put-maintenance-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-put-maintenance-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/host-put-maintenance-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/hosts-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-search-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-servers-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-servers-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-show-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-statistics-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-hypervisors/hypervisors-uptime-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-instance-actions/instance-action-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-instance-actions/instance-action-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-instance-actions/instance-actions-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-import-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-import-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-import-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-import-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-keypairs/keypairs-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-migrations/migrations-get.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-migrations/migrations-get.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-multiple-create/multiple-create-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-multiple-create/multiple-create-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-multiple-create/multiple-create-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks-associate/network-associate-host-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks-associate/network-associate-host-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks-associate/network-disassociate-host-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks-associate/network-disassociate-project-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks-associate/network-disassociate-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks-associate/network-disassociate-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/network-add-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/network-add-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/network-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/network-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/network-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/network-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/network-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/network-show-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/networks-disassociate-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/networks-disassociate-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/networks-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-networks/networks-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-sets/quotas-show-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-sets/quotas-update-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-sets/quotas-update-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-quota-sets/quotas-update-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-get-resp-rescue.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-rescue-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-rescue-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-rescue.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-rescue.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-unrescue-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-rescue/server-unrescue-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-group-add-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-group-add-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-group-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-group-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-group-remove-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-group-remove-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-groups-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-groups-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-groups-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-groups-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/security-groups-list-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-security-groups/server-security-groups-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-diagnostics/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-diagnostics/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-diagnostics/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-diagnostics/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-external-events/event-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-external-events/event-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-external-events/event-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-external-events/event-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-external-events/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-external-events/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-external-events/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-external-events/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/limit-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/limit-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quota-classes-show-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quotas-show-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quotas-show-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quotas-update-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quotas-update-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quotas-update-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/quotas-update-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/usedlimits-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-group-quotas/usedlimits-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-groups/server-groups-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-groups/server-groups-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-groups/server-groups-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-groups/server-groups-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-groups/server-groups-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-groups/server-groups-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-groups/server-groups-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-groups/server-groups-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-list-multi-status/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-list-multi-status/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-list-multi-status/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-list-multi-status/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-list-multi-status/servers-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-list-multi-status/servers-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-password/get-password-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-password/get-password-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-password/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-password/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-password/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-password/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-start-stop/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-start-stop/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-start-stop/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-start-stop/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-start-stop/server_start_stop.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-server-start-stop/server_start_stop.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-disable-log-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-disable-log-put-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-disable-log-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-disable-log-put-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-disable-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-disable-put-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-disable-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-disable-put-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-enable-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-enable-put-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-enable-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/service-enable-put-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/services-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/services-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/services-list-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-services/services-list-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-shelve/os-shelve-offload.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-shelve/os-shelve-offload.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-shelve/os-shelve.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-shelve/os-shelve.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-shelve/os-unshelve.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-shelve/os-unshelve.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-shelve/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-shelve/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-shelve/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-shelve/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-simple-tenant-usage/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-simple-tenant-usage/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-simple-tenant-usage/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-tenant-networks/networks-list-res.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-tenant-networks/networks-list-res.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-tenant-networks/networks-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-tenant-networks/networks-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-tenant-networks/networks-post-res.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-tenant-networks/networks-post-res.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-user-data/userdata-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-user-data/userdata-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-user-data/userdata-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-user-data/userdata-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-user-quotas/user-quotas-show-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-user-quotas/user-quotas-show-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-user-quotas/user-quotas-update-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-user-quotas/user-quotas-update-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-user-quotas/user-quotas-update-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-user-quotas/user-quotas-update-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-virtual-interfaces/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-virtual-interfaces/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-virtual-interfaces/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-virtual-interfaces/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volume-attachment-update/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volume-attachment-update/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volume-attachment-update/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volume-attachment-update/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volume-attachment-update/update-volume-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volume-attachment-update/update-volume-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/attach-volume-to-server-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/attach-volume-to-server-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/attach-volume-to-server-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/attach-volume-to-server-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/list-volume-attachments-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/list-volume-attachments-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/os-volumes-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/os-volumes-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/os-volumes-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/os-volumes-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/os-volumes-index-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/os-volumes-index-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/os-volumes-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/os-volumes-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/os-volumes-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/os-volumes-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/snapshot-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/snapshot-create-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/snapshot-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/snapshot-create-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/snapshots-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/snapshots-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/snapshots-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/snapshots-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/snapshots-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/snapshots-show-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/volume-attachment-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/os-volumes/volume-attachment-detail-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-changepassword.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-changepassword.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-confirmresize.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-confirmresize.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-createimage.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-createimage.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-reboot.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-reboot.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-rebuild-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-rebuild.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-rebuild.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-resize.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-resize.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-revertresize.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-action-revertresize.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-ips-network-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-ips-network-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-ips-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-ips-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-metadata-all-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-metadata-all-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-metadata-all-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-metadata-all-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-metadata-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-metadata-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-metadata-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-metadata-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-post-req.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/server-post-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/servers-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/servers-details-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/servers-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/servers-list-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/versions-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples/versions-get-resp.xml.tpl (100%) rename nova/tests/{ => unit}/integrated/api_samples_test_base.py (99%) rename nova/tests/{ => unit}/integrated/integrated_helpers.py (94%) rename nova/tests/{ => unit}/integrated/test_api_samples.py (99%) rename nova/tests/{ => unit}/integrated/test_extensions.py (92%) rename nova/tests/{ => unit}/integrated/test_login.py (91%) rename nova/tests/{ => unit}/integrated/test_servers.py (99%) rename nova/tests/{ => unit}/integrated/test_xml.py (96%) rename nova/tests/{ => unit}/integrated/v3/__init__.py (100%) rename nova/tests/{ => unit}/integrated/v3/api_sample_base.py (91%) rename nova/tests/{ => unit}/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/all_extensions/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/all_extensions/servers-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/consoles/consoles-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/consoles/consoles-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/consoles/consoles-list-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/consoles/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/consoles/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/extension-info/extensions-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/extension-info/extensions-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-access/flavor-access-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-access/flavor-access-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-manage/flavor-create-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/flavors/flavors-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/image-size/image-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/image-size/images-details-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/image-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/image-meta-key-get.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/image-meta-key-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/image-meta-key-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/image-metadata-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/image-metadata-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/image-metadata-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/image-metadata-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/image-metadata-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/images-details-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/images/images-list-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/keypairs/keypairs-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/keypairs/keypairs-import-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/keypairs/keypairs-import-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/keypairs/keypairs-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/keypairs/keypairs-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/keypairs/keypairs-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-access-ips/servers-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-admin-actions/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-admin-actions/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-admin-password/admin-password-change-password.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-admin-password/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-admin-password/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-agents/agent-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-agents/agent-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-agents/agent-update-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-agents/agent-update-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-agents/agents-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregate-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregate-update-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-attach-interfaces/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-attach-interfaces/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-availability-zone/availability-zone-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-availability-zone/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-availability-zone/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-cells/cells-capacities-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-cells/cells-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-cells/cells-list-empty-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-cells/cells-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-certificates/certificate-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-certificates/certificate-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-certificates/certificate-get-root-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-config-drive/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-config-drive/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-console-auth-tokens/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-console-auth-tokens/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-console-output/console-output-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-console-output/console-output-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-console-output/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-console-output/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-create-backup/create-backup-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-create-backup/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-create-backup/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-deferred-delete/force-delete-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-deferred-delete/restore-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-deferred-delete/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-deferred-delete/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/image-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/image-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/server-resize-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/server-update-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-evacuate/server-evacuate-find-host-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-evacuate/server-evacuate-find-host-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-evacuate/server-evacuate-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-evacuate/server-evacuate-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-evacuate/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-evacuate/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-availability-zone/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-server-attributes/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-status/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-status/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-volumes/attach-volume-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-volumes/detach-volume-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-volumes/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-volumes/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-extended-volumes/swap-volume-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-fixed-ips/fixedip-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-fping/fping-get-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-fping/fping-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-fping/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-fping/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hide-server-addresses/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hosts/host-get-reboot.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hosts/host-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hosts/host-get-shutdown.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hosts/host-get-startup.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hosts/host-put-maintenance-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hosts/host-put-maintenance-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hosts/hosts-list-compute-service-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hosts/hosts-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hypervisors/hypervisors-servers-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-instance-actions/instance-action-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-instance-actions/instance-instance-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-lock-server/lock-server.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-lock-server/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-lock-server/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-lock-server/unlock-server.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-migrate-server/live-migrate-server.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-migrate-server/migrate-server.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-migrate-server/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-migrate-server/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-migrations/migrations-get.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-multinic/multinic-add-fixed-ip-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-multinic/multinic-remove-fixed-ip-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-multinic/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-multinic/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-multiple-create/multiple-create-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-networks-associate/network-associate-host-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-networks-associate/network-disassociate-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-networks/network-add-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-networks/network-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-networks/network-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-networks/network-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-networks/networks-disassociate-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-networks/networks-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pause-server/pause-server.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pause-server/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pause-server/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pause-server/unpause-server.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pci/hypervisors-pci-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pci/pci-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pci/pci-index-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pci/pci-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pci/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pci/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-quota-sets/quotas-update-force-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-quota-sets/quotas-update-force-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-quota-sets/quotas-update-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-quota-sets/user-quotas-update-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-remote-consoles/get-rdp-console-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-remote-consoles/get-rdp-console-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-remote-consoles/get-serial-console-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-remote-consoles/get-serial-console-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-remote-consoles/get-spice-console-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-remote-consoles/get-spice-console-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-remote-consoles/get-vnc-console-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-remote-consoles/get-vnc-console-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-remote-consoles/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-remote-consoles/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-rescue/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-rescue/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-rescue/server-rescue-req-with-image-ref.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-rescue/server-rescue-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-rescue/server-rescue.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-rescue/server-unrescue-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/security-group-add-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/security-group-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/security-group-remove-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/security-groups-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/security-groups-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-diagnostics/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-diagnostics/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-external-events/event-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-external-events/event-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-external-events/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-external-events/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-groups/server-groups-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-groups/server-groups-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-groups/server-groups-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-groups/server-groups-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-usage/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-usage/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-services/service-disable-log-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-services/service-disable-log-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-services/service-disable-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-services/service-disable-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-services/service-enable-put-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-services/service-enable-put-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-services/services-list-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-shelve/os-shelve-offload.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-shelve/os-shelve.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-shelve/os-unshelve.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-shelve/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-shelve/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-simple-tenant-usage/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-suspend-server/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-suspend-server/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-suspend-server/server-resume.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-suspend-server/server-suspend.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-tenant-networks/networks-list-res.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-tenant-networks/networks-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-tenant-networks/networks-post-res.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-used-limits/usedlimits-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-user-data/userdata-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-user-data/userdata-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/os-volumes-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/os-volumes-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/os-volumes-index-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/os-volumes-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/os-volumes-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/snapshot-create-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/snapshot-create-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/snapshots-detail-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/snapshots-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/os-volumes/snapshots-show-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/server-ips/server-ips-network-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/server-ips/server-ips-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/server-ips/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/server-ips/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/server-metadata/server-metadata-all-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/server-metadata/server-metadata-all-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/server-metadata/server-metadata-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/server-metadata/server-metadata-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/server-metadata/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/server-metadata/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-confirm-resize.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-create-image.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-reboot.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-rebuild.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-resize.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-revert-resize.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-start.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-action-stop.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-get-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-post-req.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/server-post-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/servers-details-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/api_samples/servers/servers-list-resp.json.tpl (100%) rename nova/tests/{ => unit}/integrated/v3/test_access_ips.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_admin_actions.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_admin_password.py (95%) rename nova/tests/{ => unit}/integrated/v3/test_agents.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_aggregates.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_attach_interfaces.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_availability_zone.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_cells.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_certificates.py (95%) rename nova/tests/{ => unit}/integrated/v3/test_cloudpipe.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_config_drive.py (92%) rename nova/tests/{ => unit}/integrated/v3/test_console_auth_tokens.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_console_output.py (95%) rename nova/tests/{ => unit}/integrated/v3/test_consoles.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_create_backup.py (93%) rename nova/tests/{ => unit}/integrated/v3/test_deferred_delete.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_disk_config.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_evacuate.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_extended_availability_zone.py (95%) rename nova/tests/{ => unit}/integrated/v3/test_extended_server_attributes.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_extended_status.py (95%) rename nova/tests/{ => unit}/integrated/v3/test_extended_volumes.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_extension_info.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_fixed_ips.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_flavor_access.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_flavor_extraspecs.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_flavor_manage.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_flavor_rxtx.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_flavors.py (95%) rename nova/tests/{ => unit}/integrated/v3/test_floating_ip_dns.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_floating_ip_pools.py (95%) rename nova/tests/{ => unit}/integrated/v3/test_floating_ips_bulk.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_fping.py (92%) rename nova/tests/{ => unit}/integrated/v3/test_hide_server_addresses.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_hosts.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_hypervisors.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_image_size.py (93%) rename nova/tests/{ => unit}/integrated/v3/test_images.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_instance_actions.py (95%) rename nova/tests/{ => unit}/integrated/v3/test_keypairs.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_lock_server.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_migrate_server.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_migrations.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_multinic.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_multiple_create.py (94%) rename nova/tests/{ => unit}/integrated/v3/test_networks.py (95%) rename nova/tests/{ => unit}/integrated/v3/test_networks_associate.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_pause_server.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_pci.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_quota_sets.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_remote_consoles.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_rescue.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_scheduler_hints.py (92%) rename nova/tests/{ => unit}/integrated/v3/test_security_group_default_rules.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_security_groups.py (99%) rename nova/tests/{ => unit}/integrated/v3/test_server_diagnostics.py (94%) rename nova/tests/{ => unit}/integrated/v3/test_server_external_events.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_server_groups.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_server_metadata.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_server_usage.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_servers.py (98%) rename nova/tests/{ => unit}/integrated/v3/test_servers_ips.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_services.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_shelve.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_simple_tenant_usage.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_suspend_server.py (96%) rename nova/tests/{ => unit}/integrated/v3/test_tenant_networks.py (97%) rename nova/tests/{ => unit}/integrated/v3/test_used_limits.py (95%) rename nova/tests/{ => unit}/integrated/v3/test_user_data.py (92%) rename nova/tests/{ => unit}/integrated/v3/test_volumes.py (97%) rename nova/tests/{ => unit}/keymgr/__init__.py (100%) rename nova/tests/{ => unit}/keymgr/fake.py (100%) rename nova/tests/{ => unit}/keymgr/test_conf_key_mgr.py (97%) rename nova/tests/{ => unit}/keymgr/test_key.py (100%) rename nova/tests/{ => unit}/keymgr/test_key_mgr.py (100%) rename nova/tests/{ => unit}/keymgr/test_mock_key_mgr.py (98%) rename nova/tests/{ => unit}/keymgr/test_not_implemented_key_mgr.py (97%) rename nova/tests/{ => unit}/keymgr/test_single_key_mgr.py (97%) rename nova/tests/{ => unit}/matchers.py (100%) rename nova/tests/{ => unit}/monkey_patch_example/__init__.py (100%) rename nova/tests/{ => unit}/monkey_patch_example/example_a.py (100%) rename nova/tests/{ => unit}/monkey_patch_example/example_b.py (100%) rename nova/tests/{ => unit}/network/__init__.py (100%) rename nova/tests/{ => unit}/network/security_group/__init__.py (100%) rename nova/tests/{ => unit}/network/security_group/test_neutron_driver.py (100%) rename nova/tests/{ => unit}/network/test_api.py (99%) rename nova/tests/{ => unit}/network/test_linux_net.py (100%) rename nova/tests/{ => unit}/network/test_manager.py (99%) rename nova/tests/{ => unit}/network/test_network_info.py (99%) rename nova/tests/{ => unit}/network/test_neutronv2.py (99%) rename nova/tests/{ => unit}/network/test_rpcapi.py (99%) rename nova/tests/{ => unit}/objects/__init__.py (100%) rename nova/tests/{ => unit}/objects/test_agent.py (98%) rename nova/tests/{ => unit}/objects/test_aggregate.py (98%) rename nova/tests/{ => unit}/objects/test_bandwidth_usage.py (98%) rename nova/tests/{ => unit}/objects/test_block_device.py (98%) rename nova/tests/{ => unit}/objects/test_compute_node.py (99%) rename nova/tests/{ => unit}/objects/test_dns_domain.py (98%) rename nova/tests/{ => unit}/objects/test_ec2.py (99%) rename nova/tests/{ => unit}/objects/test_external_event.py (97%) rename nova/tests/{ => unit}/objects/test_fields.py (100%) rename nova/tests/{ => unit}/objects/test_fixed_ip.py (99%) rename nova/tests/{ => unit}/objects/test_flavor.py (99%) rename nova/tests/{ => unit}/objects/test_floating_ip.py (98%) rename nova/tests/{ => unit}/objects/test_hv_spec.py (97%) rename nova/tests/{ => unit}/objects/test_instance.py (99%) rename nova/tests/{ => unit}/objects/test_instance_action.py (99%) rename nova/tests/{ => unit}/objects/test_instance_fault.py (99%) rename nova/tests/{ => unit}/objects/test_instance_group.py (99%) rename nova/tests/{ => unit}/objects/test_instance_info_cache.py (98%) rename nova/tests/{ => unit}/objects/test_instance_numa_topology.py (98%) rename nova/tests/{ => unit}/objects/test_instance_pci_requests.py (99%) rename nova/tests/{ => unit}/objects/test_keypair.py (98%) rename nova/tests/{ => unit}/objects/test_migration.py (98%) rename nova/tests/{ => unit}/objects/test_network.py (99%) rename nova/tests/{ => unit}/objects/test_network_request.py (98%) rename nova/tests/{ => unit}/objects/test_objects.py (99%) rename nova/tests/{ => unit}/objects/test_pci_device.py (99%) rename nova/tests/{ => unit}/objects/test_quotas.py (98%) rename nova/tests/{ => unit}/objects/test_security_group.py (99%) rename nova/tests/{ => unit}/objects/test_security_group_rule.py (97%) rename nova/tests/{ => unit}/objects/test_service.py (98%) rename nova/tests/{ => unit}/objects/test_virtual_interface.py (98%) rename nova/tests/{ => unit}/pci/__init__.py (100%) rename nova/tests/{ => unit}/pci/fakes.py (100%) rename nova/tests/{ => unit}/pci/test_device.py (100%) rename nova/tests/{ => unit}/pci/test_devspec.py (100%) rename nova/tests/{ => unit}/pci/test_manager.py (99%) rename nova/tests/{ => unit}/pci/test_request.py (100%) rename nova/tests/{ => unit}/pci/test_stats.py (99%) rename nova/tests/{ => unit}/pci/test_utils.py (100%) rename nova/tests/{ => unit}/pci/test_whitelist.py (100%) rename nova/tests/{ => unit}/policy_fixture.py (98%) rename nova/tests/{ => unit}/scheduler/__init__.py (100%) rename nova/tests/{ => unit}/scheduler/fakes.py (100%) rename nova/tests/{ => unit}/scheduler/filters/__init__.py (100%) rename nova/tests/{ => unit}/scheduler/filters/test_affinity_filters.py (99%) rename nova/tests/{ => unit}/scheduler/filters/test_aggregate_image_properties_isolation_filters.py (99%) rename nova/tests/{ => unit}/scheduler/filters/test_aggregate_instance_extra_specs_filters.py (98%) rename nova/tests/{ => unit}/scheduler/filters/test_aggregate_multitenancy_isolation_filters.py (98%) rename nova/tests/{ => unit}/scheduler/filters/test_availability_zone_filters.py (97%) rename nova/tests/{ => unit}/scheduler/filters/test_compute_capabilities_filters.py (98%) rename nova/tests/{ => unit}/scheduler/filters/test_compute_filters.py (98%) rename nova/tests/{ => unit}/scheduler/filters/test_core_filters.py (98%) rename nova/tests/{ => unit}/scheduler/filters/test_disk_filters.py (99%) rename nova/tests/{ => unit}/scheduler/filters/test_extra_specs_ops.py (100%) rename nova/tests/{ => unit}/scheduler/filters/test_image_props_filters.py (99%) rename nova/tests/{ => unit}/scheduler/filters/test_io_ops_filters.py (98%) rename nova/tests/{ => unit}/scheduler/filters/test_isolated_hosts_filter.py (99%) rename nova/tests/{ => unit}/scheduler/filters/test_json_filters.py (99%) rename nova/tests/{ => unit}/scheduler/filters/test_metrics_filters.py (97%) rename nova/tests/{ => unit}/scheduler/filters/test_num_instances_filters.py (98%) rename nova/tests/{ => unit}/scheduler/filters/test_numa_topology_filters.py (98%) rename nova/tests/{ => unit}/scheduler/filters/test_pci_passthrough_filters.py (98%) rename nova/tests/{ => unit}/scheduler/filters/test_ram_filters.py (98%) rename nova/tests/{ => unit}/scheduler/filters/test_retry_filters.py (97%) rename nova/tests/{ => unit}/scheduler/filters/test_trusted_filters.py (99%) rename nova/tests/{ => unit}/scheduler/filters/test_type_filters.py (98%) rename nova/tests/{ => unit}/scheduler/ironic_fakes.py (100%) rename nova/tests/{ => unit}/scheduler/test_baremetal_host_manager.py (100%) rename nova/tests/{ => unit}/scheduler/test_caching_scheduler.py (98%) rename nova/tests/{ => unit}/scheduler/test_chance_scheduler.py (99%) rename nova/tests/{ => unit}/scheduler/test_client.py (100%) rename nova/tests/{ => unit}/scheduler/test_filter_scheduler.py (99%) rename nova/tests/{ => unit}/scheduler/test_filters.py (100%) rename nova/tests/{ => unit}/scheduler/test_filters_utils.py (100%) rename nova/tests/{ => unit}/scheduler/test_host_filters.py (97%) rename nova/tests/{ => unit}/scheduler/test_host_manager.py (99%) rename nova/tests/{ => unit}/scheduler/test_ironic_host_manager.py (99%) rename nova/tests/{ => unit}/scheduler/test_rpcapi.py (100%) rename nova/tests/{ => unit}/scheduler/test_scheduler.py (98%) rename nova/tests/{ => unit}/scheduler/test_scheduler_options.py (100%) rename nova/tests/{ => unit}/scheduler/test_scheduler_utils.py (99%) rename nova/tests/{ => unit}/scheduler/test_weights.py (99%) rename nova/tests/{ => unit}/servicegroup/__init__.py (100%) rename nova/tests/{ => unit}/servicegroup/test_db_servicegroup.py (98%) rename nova/tests/{ => unit}/servicegroup/test_mc_servicegroup.py (99%) rename nova/tests/{ => unit}/servicegroup/test_zk_driver.py (97%) rename nova/tests/{ => unit}/ssl_cert/ca.crt (100%) rename nova/tests/{ => unit}/ssl_cert/certificate.crt (100%) rename nova/tests/{ => unit}/ssl_cert/privatekey.key (100%) rename nova/tests/{ => unit}/test_api_validation.py (100%) rename nova/tests/{ => unit}/test_availability_zones.py (99%) rename nova/tests/{ => unit}/test_baserpc.py (100%) rename nova/tests/{ => unit}/test_bdm.py (99%) rename nova/tests/{ => unit}/test_block_device.py (99%) rename nova/tests/{ => unit}/test_cinder.py (100%) rename nova/tests/{ => unit}/test_configdrive2.py (98%) rename nova/tests/{ => unit}/test_context.py (100%) rename nova/tests/{ => unit}/test_crypto.py (100%) rename nova/tests/{ => unit}/test_exception.py (100%) rename nova/tests/{ => unit}/test_flavors.py (100%) rename nova/tests/{ => unit}/test_hacking.py (100%) rename nova/tests/{ => unit}/test_hooks.py (100%) rename nova/tests/{ => unit}/test_instance_types_extra_specs.py (100%) rename nova/tests/{ => unit}/test_iptables_network.py (100%) rename nova/tests/{ => unit}/test_ipv6.py (100%) rename nova/tests/{ => unit}/test_linuxscsi.py (100%) rename nova/tests/{ => unit}/test_loadables.py (98%) rename nova/tests/{ => unit}/test_matchers.py (99%) rename nova/tests/{ => unit}/test_metadata.py (99%) rename nova/tests/{ => unit}/test_notifications.py (99%) rename nova/tests/{ => unit}/test_nova_manage.py (99%) rename nova/tests/{ => unit}/test_objectstore.py (100%) rename nova/tests/{ => unit}/test_pipelib.py (100%) rename nova/tests/{ => unit}/test_policy.py (99%) rename nova/tests/{ => unit}/test_quota.py (99%) rename nova/tests/{ => unit}/test_safeutils.py (100%) rename nova/tests/{ => unit}/test_service.py (94%) rename nova/tests/{ => unit}/test_test.py (100%) rename nova/tests/{ => unit}/test_test_utils.py (98%) rename nova/tests/{ => unit}/test_utils.py (98%) rename nova/tests/{ => unit}/test_versions.py (100%) rename nova/tests/{ => unit}/test_weights.py (100%) rename nova/tests/{ => unit}/test_wsgi.py (99%) rename nova/tests/{ => unit}/utils.py (100%) rename nova/tests/{ => unit}/virt/__init__.py (100%) rename nova/tests/{ => unit}/virt/disk/__init__.py (100%) rename nova/tests/{ => unit}/virt/disk/mount/__init__.py (100%) rename nova/tests/{ => unit}/virt/disk/mount/test_loop.py (100%) rename nova/tests/{ => unit}/virt/disk/mount/test_nbd.py (100%) rename nova/tests/{ => unit}/virt/disk/test_api.py (100%) rename nova/tests/{ => unit}/virt/disk/test_inject.py (99%) rename nova/tests/{ => unit}/virt/disk/vfs/__init__.py (100%) rename nova/tests/{ => unit}/virt/disk/vfs/fakeguestfs.py (100%) rename nova/tests/{ => unit}/virt/disk/vfs/test_guestfs.py (99%) rename nova/tests/{ => unit}/virt/disk/vfs/test_localfs.py (99%) rename nova/tests/{ => unit}/virt/hyperv/__init__.py (100%) rename nova/tests/{ => unit}/virt/hyperv/db_fakes.py (100%) rename nova/tests/{ => unit}/virt/hyperv/fake.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_basevolumeutils.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_hostutils.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_hypervapi.py (99%) rename nova/tests/{ => unit}/virt/hyperv/test_ioutils.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_migrationops.py (98%) rename nova/tests/{ => unit}/virt/hyperv/test_networkutils.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_networkutilsv2.py (96%) rename nova/tests/{ => unit}/virt/hyperv/test_pathutils.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_rdpconsoleutils.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_rdpconsoleutilsv2.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_utilsfactory.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_vhdutils.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_vhdutilsv2.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_vmops.py (99%) rename nova/tests/{ => unit}/virt/hyperv/test_vmutils.py (100%) rename nova/tests/{ => unit}/virt/hyperv/test_vmutilsv2.py (99%) rename nova/tests/{ => unit}/virt/hyperv/test_volumeutils.py (98%) rename nova/tests/{ => unit}/virt/hyperv/test_volumeutilsv2.py (100%) rename nova/tests/{ => unit}/virt/ironic/__init__.py (100%) rename nova/tests/{ => unit}/virt/ironic/test_client_wrapper.py (98%) rename nova/tests/{ => unit}/virt/ironic/test_driver.py (99%) rename nova/tests/{ => unit}/virt/ironic/test_patcher.py (98%) rename nova/tests/{ => unit}/virt/ironic/utils.py (100%) rename nova/tests/{ => unit}/virt/libvirt/__init__.py (100%) rename nova/tests/{ => unit}/virt/libvirt/fake_imagebackend.py (100%) rename nova/tests/{ => unit}/virt/libvirt/fake_libvirt_utils.py (100%) rename nova/tests/{ => unit}/virt/libvirt/fakelibvirt.py (100%) rename nova/tests/{ => unit}/virt/libvirt/test_blockinfo.py (99%) rename nova/tests/{ => unit}/virt/libvirt/test_config.py (99%) rename nova/tests/{ => unit}/virt/libvirt/test_designer.py (100%) rename nova/tests/{ => unit}/virt/libvirt/test_dmcrypt.py (100%) rename nova/tests/{ => unit}/virt/libvirt/test_driver.py (99%) rename nova/tests/{ => unit}/virt/libvirt/test_fakelibvirt.py (99%) rename nova/tests/{ => unit}/virt/libvirt/test_firewall.py (99%) rename nova/tests/{ => unit}/virt/libvirt/test_imagebackend.py (99%) rename nova/tests/{ => unit}/virt/libvirt/test_imagecache.py (99%) rename nova/tests/{ => unit}/virt/libvirt/test_lvm.py (100%) rename nova/tests/{ => unit}/virt/libvirt/test_rbd.py (100%) rename nova/tests/{ => unit}/virt/libvirt/test_utils.py (100%) rename nova/tests/{ => unit}/virt/libvirt/test_vif.py (99%) rename nova/tests/{ => unit}/virt/libvirt/test_volume.py (99%) rename nova/tests/{ => unit}/virt/test_block_device.py (99%) rename nova/tests/{ => unit}/virt/test_configdrive.py (100%) rename nova/tests/{ => unit}/virt/test_diagnostics.py (100%) rename nova/tests/{ => unit}/virt/test_driver.py (92%) rename nova/tests/{ => unit}/virt/test_events.py (100%) rename nova/tests/{ => unit}/virt/test_hardware.py (99%) rename nova/tests/{ => unit}/virt/test_imagecache.py (99%) rename nova/tests/{ => unit}/virt/test_images.py (100%) rename nova/tests/{ => unit}/virt/test_virt.py (100%) rename nova/tests/{ => unit}/virt/test_virt_drivers.py (98%) rename nova/tests/{ => unit}/virt/test_volumeutils.py (100%) rename nova/tests/{ => unit}/virt/vmwareapi/__init__.py (100%) rename nova/tests/{ => unit}/virt/vmwareapi/fake.py (100%) rename nova/tests/{ => unit}/virt/vmwareapi/stubs.py (97%) rename nova/tests/{ => unit}/virt/vmwareapi/test_configdrive.py (93%) rename nova/tests/{ => unit}/virt/vmwareapi/test_driver_api.py (99%) rename nova/tests/{ => unit}/virt/vmwareapi/test_ds_util.py (99%) rename nova/tests/{ => unit}/virt/vmwareapi/test_ds_util_datastore_selection.py (100%) rename nova/tests/{ => unit}/virt/vmwareapi/test_imagecache.py (99%) rename nova/tests/{ => unit}/virt/vmwareapi/test_images.py (97%) rename nova/tests/{ => unit}/virt/vmwareapi/test_io_util.py (100%) rename nova/tests/{ => unit}/virt/vmwareapi/test_read_write_util.py (100%) rename nova/tests/{ => unit}/virt/vmwareapi/test_vif.py (99%) rename nova/tests/{ => unit}/virt/vmwareapi/test_vim_util.py (97%) rename nova/tests/{ => unit}/virt/vmwareapi/test_vm_util.py (99%) rename nova/tests/{ => unit}/virt/vmwareapi/test_vmops.py (99%) rename nova/tests/{ => unit}/virt/vmwareapi/test_volumeops.py (97%) rename nova/tests/{ => unit}/virt/xenapi/__init__.py (100%) rename nova/tests/{ => unit}/virt/xenapi/client/__init__.py (100%) rename nova/tests/{ => unit}/virt/xenapi/client/test_objects.py (98%) rename nova/tests/{ => unit}/virt/xenapi/client/test_session.py (99%) rename nova/tests/{ => unit}/virt/xenapi/image/__init__.py (100%) rename nova/tests/{ => unit}/virt/xenapi/image/test_bittorrent.py (99%) rename nova/tests/{ => unit}/virt/xenapi/image/test_glance.py (99%) rename nova/tests/{ => unit}/virt/xenapi/image/test_utils.py (100%) rename nova/tests/{ => unit}/virt/xenapi/image/test_vdi_through_dev.py (100%) rename nova/tests/{ => unit}/virt/xenapi/stubs.py (99%) rename nova/tests/{ => unit}/virt/xenapi/test_agent.py (100%) rename nova/tests/{ => unit}/virt/xenapi/test_driver.py (98%) rename nova/tests/{ => unit}/virt/xenapi/test_network_utils.py (98%) rename nova/tests/{ => unit}/virt/xenapi/test_vm_utils.py (99%) rename nova/tests/{ => unit}/virt/xenapi/test_vmops.py (99%) rename nova/tests/{ => unit}/virt/xenapi/test_volume_utils.py (99%) rename nova/tests/{ => unit}/virt/xenapi/test_volumeops.py (99%) rename nova/tests/{ => unit}/virt/xenapi/test_xenapi.py (99%) rename nova/tests/{ => unit}/virt/xenapi/vm_rrd.xml (100%) rename nova/tests/{ => unit}/volume/__init__.py (100%) rename nova/tests/{ => unit}/volume/encryptors/__init__.py (100%) rename nova/tests/{ => unit}/volume/encryptors/test_base.py (97%) rename nova/tests/{ => unit}/volume/encryptors/test_cryptsetup.py (98%) rename nova/tests/{ => unit}/volume/encryptors/test_luks.py (97%) rename nova/tests/{ => unit}/volume/encryptors/test_nop.py (94%) rename nova/tests/{ => unit}/volume/test_cinder.py (100%) diff --git a/nova/test.py b/nova/test.py index ef6d5b737367..45e7015715d1 100644 --- a/nova/test.py +++ b/nova/test.py @@ -54,8 +54,8 @@ from nova.openstack.common import log as nova_logging from nova import paths from nova import rpc from nova import service -from nova.tests import conf_fixture -from nova.tests import policy_fixture +from nova.tests.unit import conf_fixture +from nova.tests.unit import policy_fixture from nova import utils diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index a40a66648480..e69de29bb2d1 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -1,49 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# 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. - -""" -:mod:`nova.tests` -- Nova Unittests -===================================================== - -.. automodule:: nova.tests - :platform: Unix -""" - -# TODO(mikal): move eventlet imports to nova.__init__ once we move to PBR -import os -import sys -import traceback - - -# NOTE(mikal): All of this is because if dnspython is present in your -# environment then eventlet monkeypatches socket.getaddrinfo() with an -# implementation which doesn't work for IPv6. What we're checking here is -# that the magic environment variable was set when the import happened. -# NOTE(dims): Prevent this code from kicking in under docs generation -# as it leads to spurious errors/warning. -stack = traceback.extract_stack() -if ('eventlet' in sys.modules and - os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes' and - (len(stack) < 2 or 'sphinx' not in stack[-2][0])): - raise ImportError('eventlet imported before nova/cmd/__init__ ' - '(env var set to %s)' - % os.environ.get('EVENTLET_NO_GREENDNS')) - -os.environ['EVENTLET_NO_GREENDNS'] = 'yes' - -import eventlet - -eventlet.monkey_patch(os=False) diff --git a/nova/tests/CA/cacert.pem b/nova/tests/unit/CA/cacert.pem similarity index 100% rename from nova/tests/CA/cacert.pem rename to nova/tests/unit/CA/cacert.pem diff --git a/nova/tests/CA/private/cakey.pem b/nova/tests/unit/CA/private/cakey.pem similarity index 100% rename from nova/tests/CA/private/cakey.pem rename to nova/tests/unit/CA/private/cakey.pem diff --git a/nova/tests/README.rst b/nova/tests/unit/README.rst similarity index 100% rename from nova/tests/README.rst rename to nova/tests/unit/README.rst diff --git a/nova/tests/unit/__init__.py b/nova/tests/unit/__init__.py new file mode 100644 index 000000000000..31822c15169c --- /dev/null +++ b/nova/tests/unit/__init__.py @@ -0,0 +1,49 @@ +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# 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. + +""" +:mod:`nova.tests.unit` -- Nova Unittests +===================================================== + +.. automodule:: nova.tests.unit + :platform: Unix +""" + +# TODO(mikal): move eventlet imports to nova.__init__ once we move to PBR +import os +import sys +import traceback + + +# NOTE(mikal): All of this is because if dnspython is present in your +# environment then eventlet monkeypatches socket.getaddrinfo() with an +# implementation which doesn't work for IPv6. What we're checking here is +# that the magic environment variable was set when the import happened. +# NOTE(dims): Prevent this code from kicking in under docs generation +# as it leads to spurious errors/warning. +stack = traceback.extract_stack() +if ('eventlet' in sys.modules and + os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes' and + (len(stack) < 2 or 'sphinx' not in stack[-2][0])): + raise ImportError('eventlet imported before nova/cmd/__init__ ' + '(env var set to %s)' + % os.environ.get('EVENTLET_NO_GREENDNS')) + +os.environ['EVENTLET_NO_GREENDNS'] = 'yes' + +import eventlet + +eventlet.monkey_patch(os=False) diff --git a/nova/tests/api/__init__.py b/nova/tests/unit/api/__init__.py similarity index 100% rename from nova/tests/api/__init__.py rename to nova/tests/unit/api/__init__.py diff --git a/nova/tests/api/ec2/__init__.py b/nova/tests/unit/api/ec2/__init__.py similarity index 100% rename from nova/tests/api/ec2/__init__.py rename to nova/tests/unit/api/ec2/__init__.py diff --git a/nova/tests/api/ec2/public_key/dummy.fingerprint b/nova/tests/unit/api/ec2/public_key/dummy.fingerprint similarity index 100% rename from nova/tests/api/ec2/public_key/dummy.fingerprint rename to nova/tests/unit/api/ec2/public_key/dummy.fingerprint diff --git a/nova/tests/api/ec2/public_key/dummy.pub b/nova/tests/unit/api/ec2/public_key/dummy.pub similarity index 100% rename from nova/tests/api/ec2/public_key/dummy.pub rename to nova/tests/unit/api/ec2/public_key/dummy.pub diff --git a/nova/tests/api/ec2/test_api.py b/nova/tests/unit/api/ec2/test_api.py similarity index 99% rename from nova/tests/api/ec2/test_api.py rename to nova/tests/unit/api/ec2/test_api.py index 4ceb71c53c39..cc4a2adb75e0 100644 --- a/nova/tests/api/ec2/test_api.py +++ b/nova/tests/unit/api/ec2/test_api.py @@ -40,7 +40,7 @@ from nova import context from nova import exception from nova.openstack.common import versionutils from nova import test -from nova.tests import matchers +from nova.tests.unit import matchers class FakeHttplibSocket(object): diff --git a/nova/tests/api/ec2/test_apirequest.py b/nova/tests/unit/api/ec2/test_apirequest.py similarity index 100% rename from nova/tests/api/ec2/test_apirequest.py rename to nova/tests/unit/api/ec2/test_apirequest.py diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/unit/api/ec2/test_cinder_cloud.py similarity index 99% rename from nova/tests/api/ec2/test_cinder_cloud.py rename to nova/tests/unit/api/ec2/test_cinder_cloud.py index 98c99fd55125..78db126aee85 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/unit/api/ec2/test_cinder_cloud.py @@ -32,12 +32,12 @@ from nova import db from nova import exception from nova import objects from nova import test -from nova.tests import cast_as_call -from nova.tests import fake_network -from nova.tests import fake_notifier -from nova.tests import fake_utils -from nova.tests.image import fake -from nova.tests import matchers +from nova.tests.unit import cast_as_call +from nova.tests.unit import fake_network +from nova.tests.unit import fake_notifier +from nova.tests.unit import fake_utils +from nova.tests.unit.image import fake +from nova.tests.unit import matchers from nova import volume CONF = cfg.CONF @@ -95,7 +95,7 @@ class CinderCloudTestCase(test.TestCase): self.useFixture(fixtures.TempDir()).path fake_utils.stub_out_utils_spawn_n(self.stubs) self.flags(compute_driver='nova.virt.fake.FakeDriver', - volume_api_class='nova.tests.fake_volume.API') + volume_api_class='nova.tests.unit.fake_volume.API') def fake_show(meh, context, id, **kwargs): return {'id': id, diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/unit/api/ec2/test_cloud.py similarity index 99% rename from nova/tests/api/ec2/test_cloud.py rename to nova/tests/unit/api/ec2/test_cloud.py index 5df870f7b557..113af8c96ccd 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/unit/api/ec2/test_cloud.py @@ -55,15 +55,15 @@ from nova.openstack.common import policy as common_policy from nova.openstack.common import uuidutils from nova import policy from nova import test -from nova.tests.api.openstack.compute.contrib import ( +from nova.tests.unit.api.openstack.compute.contrib import ( test_neutron_security_groups as test_neutron) -from nova.tests import cast_as_call -from nova.tests import fake_block_device -from nova.tests import fake_network -from nova.tests import fake_notifier -from nova.tests import fake_utils -from nova.tests.image import fake -from nova.tests import matchers +from nova.tests.unit import cast_as_call +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_network +from nova.tests.unit import fake_notifier +from nova.tests.unit import fake_utils +from nova.tests.unit.image import fake +from nova.tests.unit import matchers from nova import utils from nova.virt import fake as fake_virt from nova import volume @@ -141,7 +141,7 @@ class CloudTestCase(test.TestCase): self.useFixture(test.SampleNetworks()) ec2utils.reset_cache() self.flags(compute_driver='nova.virt.fake.FakeDriver', - volume_api_class='nova.tests.fake_volume.API') + volume_api_class='nova.tests.unit.fake_volume.API') self.useFixture(fixtures.FakeLogger('boto')) fake_utils.stub_out_utils_spawn_n(self.stubs) diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/unit/api/ec2/test_ec2_validate.py similarity index 98% rename from nova/tests/api/ec2/test_ec2_validate.py rename to nova/tests/unit/api/ec2/test_ec2_validate.py index b75e729a1ba5..53ae8c110e3d 100644 --- a/nova/tests/api/ec2/test_ec2_validate.py +++ b/nova/tests/unit/api/ec2/test_ec2_validate.py @@ -26,10 +26,10 @@ from nova import context from nova import db from nova import exception from nova import test -from nova.tests import cast_as_call -from nova.tests import fake_network -from nova.tests import fake_notifier -from nova.tests.image import fake +from nova.tests.unit import cast_as_call +from nova.tests.unit import fake_network +from nova.tests.unit import fake_notifier +from nova.tests.unit.image import fake CONF = cfg.CONF CONF.import_opt('compute_driver', 'nova.virt.driver') diff --git a/nova/tests/api/ec2/test_ec2utils.py b/nova/tests/unit/api/ec2/test_ec2utils.py similarity index 100% rename from nova/tests/api/ec2/test_ec2utils.py rename to nova/tests/unit/api/ec2/test_ec2utils.py diff --git a/nova/tests/api/ec2/test_error_response.py b/nova/tests/unit/api/ec2/test_error_response.py similarity index 100% rename from nova/tests/api/ec2/test_error_response.py rename to nova/tests/unit/api/ec2/test_error_response.py diff --git a/nova/tests/api/ec2/test_faults.py b/nova/tests/unit/api/ec2/test_faults.py similarity index 100% rename from nova/tests/api/ec2/test_faults.py rename to nova/tests/unit/api/ec2/test_faults.py diff --git a/nova/tests/api/ec2/test_middleware.py b/nova/tests/unit/api/ec2/test_middleware.py similarity index 100% rename from nova/tests/api/ec2/test_middleware.py rename to nova/tests/unit/api/ec2/test_middleware.py diff --git a/nova/tests/api/openstack/__init__.py b/nova/tests/unit/api/openstack/__init__.py similarity index 100% rename from nova/tests/api/openstack/__init__.py rename to nova/tests/unit/api/openstack/__init__.py diff --git a/nova/tests/api/openstack/common.py b/nova/tests/unit/api/openstack/common.py similarity index 100% rename from nova/tests/api/openstack/common.py rename to nova/tests/unit/api/openstack/common.py diff --git a/nova/tests/api/openstack/compute/__init__.py b/nova/tests/unit/api/openstack/compute/__init__.py similarity index 100% rename from nova/tests/api/openstack/compute/__init__.py rename to nova/tests/unit/api/openstack/compute/__init__.py diff --git a/nova/tests/api/openstack/compute/contrib/__init__.py b/nova/tests/unit/api/openstack/compute/contrib/__init__.py similarity index 100% rename from nova/tests/api/openstack/compute/contrib/__init__.py rename to nova/tests/unit/api/openstack/compute/contrib/__init__.py diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/unit/api/openstack/compute/contrib/test_admin_actions.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_admin_actions.py rename to nova/tests/unit/api/openstack/compute/contrib/test_admin_actions.py index d801abda64fb..44bf495b29a7 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_admin_actions.py @@ -27,8 +27,8 @@ from nova import exception from nova import objects from nova.openstack.common import uuidutils from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance class CommonMixin(object): diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_password.py b/nova/tests/unit/api/openstack/compute/contrib/test_admin_password.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_admin_password.py rename to nova/tests/unit/api/openstack/compute/contrib/test_admin_password.py index 26b2d442b5bc..4ddfc08dccd7 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_password.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_admin_password.py @@ -21,7 +21,7 @@ from nova.api.openstack.compute.plugins.v3 import admin_password \ from nova.compute import api as compute_api from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes def fake_get(self, context, id, expected_attrs=None, want_objects=False): diff --git a/nova/tests/api/openstack/compute/contrib/test_agents.py b/nova/tests/unit/api/openstack/compute/contrib/test_agents.py similarity index 100% rename from nova/tests/api/openstack/compute/contrib/test_agents.py rename to nova/tests/unit/api/openstack/compute/contrib/test_agents.py diff --git a/nova/tests/api/openstack/compute/contrib/test_aggregates.py b/nova/tests/unit/api/openstack/compute/contrib/test_aggregates.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_aggregates.py rename to nova/tests/unit/api/openstack/compute/contrib/test_aggregates.py index e1df95248eaa..9b52146fa183 100644 --- a/nova/tests/api/openstack/compute/contrib/test_aggregates.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_aggregates.py @@ -23,8 +23,8 @@ from nova.api.openstack.compute.plugins.v3 import aggregates as aggregates_v21 from nova import context from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import matchers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import matchers AGGREGATE_LIST = [ {"name": "aggregate1", "id": "1", "availability_zone": "nova1"}, diff --git a/nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py b/nova/tests/unit/api/openstack/compute/contrib/test_attach_interfaces.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py rename to nova/tests/unit/api/openstack/compute/contrib/test_attach_interfaces.py index de2cce46b89f..3b7e0b058a01 100644 --- a/nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_attach_interfaces.py @@ -27,7 +27,7 @@ from nova import exception from nova.network import api as network_api from nova import objects from nova import test -from nova.tests import fake_network_cache_model +from nova.tests.unit import fake_network_cache_model import webob from webob import exc diff --git a/nova/tests/api/openstack/compute/contrib/test_availability_zone.py b/nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_availability_zone.py rename to nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py index 6a09b03fc56d..31b20d68613e 100644 --- a/nova/tests/api/openstack/compute/contrib/test_availability_zone.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py @@ -33,11 +33,11 @@ from nova import db from nova import exception from nova import servicegroup from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -from nova.tests.image import fake -from nova.tests import matchers -from nova.tests.objects import test_service +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit.image import fake +from nova.tests.unit import matchers +from nova.tests.unit.objects import test_service FAKE_UUID = fakes.FAKE_UUID diff --git a/nova/tests/api/openstack/compute/contrib/test_baremetal_nodes.py b/nova/tests/unit/api/openstack/compute/contrib/test_baremetal_nodes.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_baremetal_nodes.py rename to nova/tests/unit/api/openstack/compute/contrib/test_baremetal_nodes.py index 9650f9560a0e..451c92a40bf8 100644 --- a/nova/tests/api/openstack/compute/contrib/test_baremetal_nodes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_baremetal_nodes.py @@ -22,7 +22,7 @@ from nova.api.openstack.compute.plugins.v3 import baremetal_nodes \ from nova.api.openstack import extensions from nova import context from nova import test -from nova.tests.virt.ironic import utils as ironic_utils +from nova.tests.unit.virt.ironic import utils as ironic_utils class FakeRequest(object): diff --git a/nova/tests/api/openstack/compute/contrib/test_block_device_mapping.py b/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_block_device_mapping.py rename to nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping.py index 2c988d501cac..ab20ad85c309 100644 --- a/nova/tests/api/openstack/compute/contrib/test_block_device_mapping.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping.py @@ -29,9 +29,9 @@ from nova.compute import api as compute_api from nova import exception from nova import objects from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.image import fake -from nova.tests import matchers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.image import fake +from nova.tests.unit import matchers CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/contrib/test_block_device_mapping_v1.py b/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_block_device_mapping_v1.py rename to nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py index 2e680b9dad5a..2f73f0095293 100644 --- a/nova/tests/api/openstack/compute/contrib/test_block_device_mapping_v1.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py @@ -28,8 +28,8 @@ from nova.api.openstack.compute import servers as servers_v2 from nova.compute import api as compute_api from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.image import fake +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/contrib/test_cells.py b/nova/tests/unit/api/openstack/compute/contrib/test_cells.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_cells.py rename to nova/tests/unit/api/openstack/compute/contrib/test_cells.py index a317dc13f663..1460d33e3a6b 100644 --- a/nova/tests/api/openstack/compute/contrib/test_cells.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_cells.py @@ -28,8 +28,8 @@ from nova import context from nova import exception from nova import rpc from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import utils +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import utils class BaseCellsTest(test.NoDBTestCase): diff --git a/nova/tests/api/openstack/compute/contrib/test_certificates.py b/nova/tests/unit/api/openstack/compute/contrib/test_certificates.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_certificates.py rename to nova/tests/unit/api/openstack/compute/contrib/test_certificates.py index 5d8634f4d091..c7066516d8a1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_certificates.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_certificates.py @@ -28,7 +28,7 @@ from nova import exception from nova.openstack.common import policy as common_policy from nova import policy from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class CertificatesTestV21(test.NoDBTestCase): diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_cloudpipe.py rename to nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py index d2358f3bf3af..ab3b1a58cc41 100644 --- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py @@ -26,9 +26,9 @@ from nova.api.openstack import wsgi from nova.compute import utils as compute_utils from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_network -from nova.tests import matchers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_network +from nova.tests.unit import matchers from nova import utils CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe_update.py b/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe_update.py similarity index 97% rename from nova/tests/api/openstack/compute/contrib/test_cloudpipe_update.py rename to nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe_update.py index 5caccf14b5af..23faf6275adf 100644 --- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe_update.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe_update.py @@ -19,8 +19,8 @@ from nova.api.openstack.compute.plugins.v3 import cloudpipe as clup_v21 from nova import db from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_network +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_network fake_networks = [fake_network.fake_network(1), diff --git a/nova/tests/api/openstack/compute/contrib/test_config_drive.py b/nova/tests/unit/api/openstack/compute/contrib/test_config_drive.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_config_drive.py rename to nova/tests/unit/api/openstack/compute/contrib/test_config_drive.py index a9d624b7bc82..ef94db0d238c 100644 --- a/nova/tests/api/openstack/compute/contrib/test_config_drive.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_config_drive.py @@ -31,9 +31,9 @@ from nova.compute import flavors from nova import db from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -from nova.tests.image import fake +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py b/nova/tests/unit/api/openstack/compute/contrib/test_console_auth_tokens.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py rename to nova/tests/unit/api/openstack/compute/contrib/test_console_auth_tokens.py index 3c3fee2871e5..eef4cd62ea93 100644 --- a/nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_console_auth_tokens.py @@ -20,7 +20,7 @@ import webob from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes CONF = cfg.CONF CONF.import_opt('osapi_compute_ext_list', 'nova.api.openstack.compute.contrib') diff --git a/nova/tests/api/openstack/compute/contrib/test_console_output.py b/nova/tests/unit/api/openstack/compute/contrib/test_console_output.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_console_output.py rename to nova/tests/unit/api/openstack/compute/contrib/test_console_output.py index faf39da0e11e..441899a19b52 100644 --- a/nova/tests/api/openstack/compute/contrib/test_console_output.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_console_output.py @@ -20,8 +20,8 @@ from oslo.serialization import jsonutils from nova.compute import api as compute_api from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance def fake_get_console_output(self, _context, _instance, tail_length): diff --git a/nova/tests/api/openstack/compute/contrib/test_consoles.py b/nova/tests/unit/api/openstack/compute/contrib/test_consoles.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_consoles.py rename to nova/tests/unit/api/openstack/compute/contrib/test_consoles.py index 1faff0d78c76..debd1e7f5f45 100644 --- a/nova/tests/api/openstack/compute/contrib/test_consoles.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_consoles.py @@ -20,7 +20,7 @@ import webob from nova.compute import api as compute_api from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes def fake_get_vnc_console(self, _context, _instance, _console_type): diff --git a/nova/tests/api/openstack/compute/contrib/test_createserverext.py b/nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_createserverext.py rename to nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py index 62b135ac0eae..eca3aa39531c 100644 --- a/nova/tests/api/openstack/compute/contrib/test_createserverext.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py @@ -23,7 +23,7 @@ from nova.compute import api as compute_api from nova import db from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes FAKE_UUID = fakes.FAKE_UUID diff --git a/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py b/nova/tests/unit/api/openstack/compute/contrib/test_deferred_delete.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_deferred_delete.py rename to nova/tests/unit/api/openstack/compute/contrib/test_deferred_delete.py index 0c335d0a0219..0dfd0e5339e5 100644 --- a/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_deferred_delete.py @@ -22,7 +22,7 @@ from nova.compute import api as compute_api from nova import context from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class FakeRequest(object): diff --git a/nova/tests/api/openstack/compute/contrib/test_disk_config.py b/nova/tests/unit/api/openstack/compute/contrib/test_disk_config.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_disk_config.py rename to nova/tests/unit/api/openstack/compute/contrib/test_disk_config.py index 1cdafcdd5fe0..b9a514a45166 100644 --- a/nova/tests/api/openstack/compute/contrib/test_disk_config.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_disk_config.py @@ -22,9 +22,9 @@ from nova.compute import api as compute_api from nova import db from nova import objects from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -import nova.tests.image.fake +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +import nova.tests.unit.image.fake MANUAL_INSTANCE_UUID = fakes.FAKE_UUID @@ -137,7 +137,7 @@ class DiskConfigTestCaseV21(test.TestCase): ' not one of [\'AUTO\', \'MANUAL\']", "code": 400}}}}') def _setup_fake_image_service(self): - self.image_service = nova.tests.image.fake.stub_out_image_service( + self.image_service = nova.tests.unit.image.fake.stub_out_image_service( self.stubs) timestamp = datetime.datetime(2011, 1, 1, 1, 2, 3) image = {'id': '88580842-f50a-11e2-8d3a-f23c91aec05e', @@ -156,7 +156,7 @@ class DiskConfigTestCaseV21(test.TestCase): def tearDown(self): super(DiskConfigTestCaseV21, self).tearDown() - nova.tests.image.fake.FakeImageService_reset() + nova.tests.unit.image.fake.FakeImageService_reset() def assertDiskConfig(self, dict_, value): self.assertIn(API_DISK_CONFIG, dict_) diff --git a/nova/tests/api/openstack/compute/contrib/test_evacuate.py b/nova/tests/unit/api/openstack/compute/contrib/test_evacuate.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_evacuate.py rename to nova/tests/unit/api/openstack/compute/contrib/test_evacuate.py index c2094518bf72..3f5b662db500 100644 --- a/nova/tests/api/openstack/compute/contrib/test_evacuate.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_evacuate.py @@ -23,8 +23,8 @@ from nova.compute import vm_states from nova import context from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py rename to nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py index cec539f0e188..a3e6dd4a78df 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py @@ -26,8 +26,8 @@ from nova import exception from nova import objects from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance UUID1 = '00000000-0000-0000-0000-000000000001' UUID2 = '00000000-0000-0000-0000-000000000002' diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_evacuate_find_host.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_evacuate_find_host.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_extended_evacuate_find_host.py rename to nova/tests/unit/api/openstack/compute/contrib/test_extended_evacuate_find_host.py index a011c7dddf34..1aaee6837adb 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_evacuate_find_host.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_evacuate_find_host.py @@ -22,8 +22,8 @@ from nova.compute import vm_states from nova import context from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance class ExtendedEvacuateFindHostTest(test.NoDBTestCase): diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_hypervisors.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_hypervisors.py similarity index 96% rename from nova/tests/api/openstack/compute/contrib/test_extended_hypervisors.py rename to nova/tests/unit/api/openstack/compute/contrib/test_extended_hypervisors.py index a249c7c087c9..df5e0d787a2c 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_hypervisors.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_hypervisors.py @@ -23,8 +23,8 @@ from nova.api.openstack import extensions from nova import db from nova import exception from nova import test -from nova.tests.api.openstack.compute.contrib import test_hypervisors -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack.compute.contrib import test_hypervisors +from nova.tests.unit.api.openstack import fakes def fake_compute_node_get(context, compute_id): diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_ips.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_extended_ips.py rename to nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py index c2df53c2f0db..770814116c12 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_ips.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py @@ -23,8 +23,8 @@ from nova import compute from nova import objects from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance UUID1 = '00000000-0000-0000-0000-000000000001' UUID2 = '00000000-0000-0000-0000-000000000002' diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py rename to nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py index d67b04ea4625..c3e94600aac9 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py @@ -23,8 +23,8 @@ from nova import compute from nova import objects from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance UUID1 = '00000000-0000-0000-0000-000000000001' UUID2 = '00000000-0000-0000-0000-000000000002' diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_rescue_with_image.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_rescue_with_image.py similarity index 100% rename from nova/tests/api/openstack/compute/contrib/test_extended_rescue_with_image.py rename to nova/tests/unit/api/openstack/compute/contrib/test_extended_rescue_with_image.py diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py rename to nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py index 0b82d7a750e2..f944289efef8 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py @@ -24,7 +24,7 @@ from nova import exception from nova import objects from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes from oslo.config import cfg diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_status.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_extended_status.py rename to nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py index 218f277501c6..b47562f7a769 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_status.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py @@ -24,8 +24,8 @@ from nova import exception from nova import objects from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance UUID1 = '00000000-0000-0000-0000-000000000001' UUID2 = '00000000-0000-0000-0000-000000000002' diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py rename to nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py index abe99643b8d3..851848d7a512 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py @@ -22,7 +22,7 @@ from nova.api.openstack import wsgi from nova import compute from nova import network from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_volumes.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py similarity index 97% rename from nova/tests/api/openstack/compute/contrib/test_extended_volumes.py rename to nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py index 9c02792e8bf2..d441013e8de8 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_volumes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py @@ -23,9 +23,9 @@ from nova import db from nova import objects from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_block_device -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance UUID1 = '00000000-0000-0000-0000-000000000001' UUID2 = '00000000-0000-0000-0000-000000000002' diff --git a/nova/tests/api/openstack/compute/contrib/test_fixed_ips.py b/nova/tests/unit/api/openstack/compute/contrib/test_fixed_ips.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_fixed_ips.py rename to nova/tests/unit/api/openstack/compute/contrib/test_fixed_ips.py index 9e97c294b37e..f331da80fe62 100644 --- a/nova/tests/api/openstack/compute/contrib/test_fixed_ips.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_fixed_ips.py @@ -21,8 +21,8 @@ from nova import db from nova import exception from nova.i18n import _ from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.objects import test_network +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.objects import test_network fake_fixed_ips = [{'id': 1, diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_access.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_access.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_flavor_access.py rename to nova/tests/unit/api/openstack/compute/contrib/test_flavor_access.py index 63b1a9792435..5718a826e4a0 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_access.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_access.py @@ -27,7 +27,7 @@ from nova import context from nova import db from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes def generate_flavor(flavorid, ispublic): diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py rename to nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py index fbb630949a03..a646f43fd142 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py @@ -19,7 +19,7 @@ import webob from nova.api.openstack.compute.contrib import flavor_disabled from nova.compute import flavors from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes FAKE_FLAVORS = { 'flavor 1': { diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_flavor_manage.py rename to nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py index 937fa8581e92..3d44e4970b10 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py @@ -28,7 +28,7 @@ from nova import context from nova import db from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes def fake_db_flavor(**updates): diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py rename to nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py index 9b4a06cc1496..a8f31653c120 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py @@ -18,7 +18,7 @@ import webob from nova.compute import flavors from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes FAKE_FLAVORS = { 'flavor 1': { diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_flavor_swap.py rename to nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py index 763fa3335ef4..f168db060aaa 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py @@ -18,7 +18,7 @@ import webob from nova.compute import flavors from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes FAKE_FLAVORS = { 'flavor 1': { diff --git a/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavorextradata.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_flavorextradata.py rename to nova/tests/unit/api/openstack/compute/contrib/test_flavorextradata.py index 3a730754e0f2..1299b6c88d49 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavorextradata.py @@ -20,7 +20,7 @@ import webob from nova.compute import flavors from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes def fake_get_flavor_by_flavor_id(flavorid, ctxt=None): diff --git a/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavors_extra_specs.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py rename to nova/tests/unit/api/openstack/compute/contrib/test_flavors_extra_specs.py index 31d2dc0e4108..8a6f4814a830 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavors_extra_specs.py @@ -23,8 +23,8 @@ from nova.api.openstack.compute.plugins.v3 import flavors_extraspecs \ import nova.db from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.objects import test_flavor +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.objects import test_flavor def return_create_flavor_extra_specs(context, flavor_id, extra_specs): diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_dns.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py rename to nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_dns.py index 9ad0e1189938..9a68e0de60c2 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_dns.py @@ -27,7 +27,7 @@ from nova import db from nova import exception from nova import network from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes name = "arbitraryname" diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ip_pools.py b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_pools.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_floating_ip_pools.py rename to nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_pools.py index 1b24fe5fdf5b..926e88c6aea7 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ip_pools.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_pools.py @@ -21,7 +21,7 @@ from nova.api.openstack.compute.plugins.v3 import floating_ip_pools as\ from nova import context from nova import network from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes def fake_get_floating_ip_pools(self, context): diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_floating_ips.py rename to nova/tests/unit/api/openstack/compute/contrib/test_floating_ips.py index 34e8ab4af052..b383d1dbc104 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips.py @@ -31,8 +31,8 @@ from nova import db from nova import exception from nova import network from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_network +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_network FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ips_bulk.py b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips_bulk.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_floating_ips_bulk.py rename to nova/tests/unit/api/openstack/compute/contrib/test_floating_ips_bulk.py index bac9ea66dbc4..8c81d99ab0bd 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ips_bulk.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips_bulk.py @@ -22,7 +22,7 @@ from nova.api.openstack.compute.plugins.v3 import floating_ips_bulk as\ from nova import context from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/contrib/test_fping.py b/nova/tests/unit/api/openstack/compute/contrib/test_fping.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_fping.py rename to nova/tests/unit/api/openstack/compute/contrib/test_fping.py index b35c1168f77b..a6364d6ee7f7 100644 --- a/nova/tests/api/openstack/compute/contrib/test_fping.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_fping.py @@ -18,7 +18,7 @@ from nova.api.openstack.compute.contrib import fping from nova.api.openstack.compute.plugins.v3 import fping as fping_v21 from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes import nova.utils diff --git a/nova/tests/api/openstack/compute/contrib/test_hide_server_addresses.py b/nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_hide_server_addresses.py rename to nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py index a2f5535d810d..217fd480f974 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hide_server_addresses.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py @@ -27,8 +27,8 @@ from nova import exception from nova import objects from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance SENTINEL = object() diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/unit/api/openstack/compute/contrib/test_hosts.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_hosts.py rename to nova/tests/unit/api/openstack/compute/contrib/test_hosts.py index 22d317387431..5478a7dd33ad 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hosts.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_hosts.py @@ -25,8 +25,8 @@ from nova import context as context_maker from nova import db from nova import exception from nova import test -from nova.tests import fake_hosts -from nova.tests import utils +from nova.tests.unit import fake_hosts +from nova.tests.unit import utils def stub_service_get_all(context, disabled=None): diff --git a/nova/tests/api/openstack/compute/contrib/test_hypervisor_status.py b/nova/tests/unit/api/openstack/compute/contrib/test_hypervisor_status.py similarity index 97% rename from nova/tests/api/openstack/compute/contrib/test_hypervisor_status.py rename to nova/tests/unit/api/openstack/compute/contrib/test_hypervisor_status.py index 13cdf5f8fe41..2d9187a7d122 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hypervisor_status.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_hypervisor_status.py @@ -21,7 +21,7 @@ from nova.api.openstack.compute.plugins.v3 import hypervisors \ as hypervisors_v21 from nova.api.openstack import extensions from nova import test -from nova.tests.api.openstack.compute.contrib import test_hypervisors +from nova.tests.unit.api.openstack.compute.contrib import test_hypervisors TEST_HYPER = dict(test_hypervisors.TEST_HYPERS[0], service=dict(id=1, diff --git a/nova/tests/api/openstack/compute/contrib/test_hypervisors.py b/nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_hypervisors.py rename to nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py index ebb0b8593bec..9ae3c307c507 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hypervisors.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py @@ -27,7 +27,7 @@ from nova import context from nova import db from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes TEST_HYPERS = [ diff --git a/nova/tests/api/openstack/compute/contrib/test_image_size.py b/nova/tests/unit/api/openstack/compute/contrib/test_image_size.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_image_size.py rename to nova/tests/unit/api/openstack/compute/contrib/test_image_size.py index cfc63a9eba9b..2a8d95cb8647 100644 --- a/nova/tests/api/openstack/compute/contrib/test_image_size.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_image_size.py @@ -20,7 +20,7 @@ import webob from nova.api.openstack.compute.contrib import image_size from nova.image import glance from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes NOW_API_FORMAT = "2010-10-11T10:30:22Z" IMAGES = [{ diff --git a/nova/tests/api/openstack/compute/contrib/test_instance_actions.py b/nova/tests/unit/api/openstack/compute/contrib/test_instance_actions.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_instance_actions.py rename to nova/tests/unit/api/openstack/compute/contrib/test_instance_actions.py index 9d3c289e847a..a5ea3784e344 100644 --- a/nova/tests/api/openstack/compute/contrib/test_instance_actions.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_instance_actions.py @@ -30,9 +30,9 @@ from nova import exception from nova.openstack.common import policy as common_policy from nova import policy from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -from nova.tests import fake_server_actions +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_server_actions FAKE_UUID = fake_server_actions.FAKE_UUID FAKE_REQUEST_ID = fake_server_actions.FAKE_REQUEST_ID1 diff --git a/nova/tests/api/openstack/compute/contrib/test_instance_usage_audit_log.py b/nova/tests/unit/api/openstack/compute/contrib/test_instance_usage_audit_log.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_instance_usage_audit_log.py rename to nova/tests/unit/api/openstack/compute/contrib/test_instance_usage_audit_log.py index 58e3c405b8f2..1ae85c8625ed 100644 --- a/nova/tests/api/openstack/compute/contrib/test_instance_usage_audit_log.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_instance_usage_audit_log.py @@ -22,8 +22,8 @@ from nova import context from nova import db from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.objects import test_service +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.objects import test_service from nova import utils diff --git a/nova/tests/api/openstack/compute/contrib/test_keypairs.py b/nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_keypairs.py rename to nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py index 21ac2969aa71..6a6c6f0736ce 100644 --- a/nova/tests/api/openstack/compute/contrib/test_keypairs.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py @@ -26,8 +26,8 @@ from nova.openstack.common import policy as common_policy from nova import policy from nova import quota from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.objects import test_keypair +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.objects import test_keypair QUOTAS = quota.QUOTAS diff --git a/nova/tests/api/openstack/compute/contrib/test_migrate_server.py b/nova/tests/unit/api/openstack/compute/contrib/test_migrate_server.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_migrate_server.py rename to nova/tests/unit/api/openstack/compute/contrib/test_migrate_server.py index 3a79e65810da..069b68883757 100644 --- a/nova/tests/api/openstack/compute/contrib/test_migrate_server.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_migrate_server.py @@ -16,9 +16,9 @@ from nova.api.openstack.compute.plugins.v3 import migrate_server from nova import exception from nova.openstack.common import uuidutils -from nova.tests.api.openstack.compute.plugins.v3 import \ +from nova.tests.unit.api.openstack.compute.plugins.v3 import \ admin_only_action_common -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class MigrateServerTests(admin_only_action_common.CommonTests): diff --git a/nova/tests/api/openstack/compute/contrib/test_migrations.py b/nova/tests/unit/api/openstack/compute/contrib/test_migrations.py similarity index 100% rename from nova/tests/api/openstack/compute/contrib/test_migrations.py rename to nova/tests/unit/api/openstack/compute/contrib/test_migrations.py diff --git a/nova/tests/api/openstack/compute/contrib/test_multinic.py b/nova/tests/unit/api/openstack/compute/contrib/test_multinic.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_multinic.py rename to nova/tests/unit/api/openstack/compute/contrib/test_multinic.py index 481fe7e4417d..dcf1dd299f71 100644 --- a/nova/tests/api/openstack/compute/contrib/test_multinic.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_multinic.py @@ -21,7 +21,7 @@ from nova import compute from nova import exception from nova import objects from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes UUID = '70f6db34-de8d-4fbd-aafb-4065bdfa6114' diff --git a/nova/tests/api/openstack/compute/contrib/test_networks.py b/nova/tests/unit/api/openstack/compute/contrib/test_networks.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_networks.py rename to nova/tests/unit/api/openstack/compute/contrib/test_networks.py index b388ae1b5d0c..5636a06d0dd1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_networks.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_networks.py @@ -36,7 +36,7 @@ from nova import exception from nova.network import manager from nova import objects from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes import nova.utils CONF = cfg.CONF @@ -433,7 +433,7 @@ class NetworksTestV21(test.NoDBTestCase): res_dict = self.controller.show(req, uuid) self.assertEqual(res_dict['network']['project_id'], 'fake') - @mock.patch('nova.tests.api.openstack.compute.contrib.test_networks.' + @mock.patch('nova.tests.unit.api.openstack.compute.contrib.test_networks.' 'FakeNetworkAPI.add_network_to_project', side_effect=exception.NoMoreNetworks) def test_network_add_no_more_networks_fail(self, mock_add): @@ -442,7 +442,7 @@ class NetworksTestV21(test.NoDBTestCase): self.assertRaises(webob.exc.HTTPBadRequest, self.controller.add, req, {'id': uuid}) - @mock.patch('nova.tests.api.openstack.compute.contrib.test_networks.' + @mock.patch('nova.tests.unit.api.openstack.compute.contrib.test_networks.' 'FakeNetworkAPI.add_network_to_project', side_effect=exception.NetworkNotFoundForUUID(uuid='fake_uuid')) def test_network_add_network_not_found_networks_fail(self, mock_add): diff --git a/nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py b/nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py rename to nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py index 2d818466be27..704de210057d 100644 --- a/nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py @@ -34,8 +34,8 @@ from nova.network.neutronv2 import api as neutron_api from nova.network.security_group import neutron_driver from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack.compute.contrib import test_security_groups -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack.compute.contrib import test_security_groups +from nova.tests.unit.api.openstack import fakes class TestNeutronSecurityGroupsTestCase(test.TestCase): diff --git a/nova/tests/api/openstack/compute/contrib/test_quota_classes.py b/nova/tests/unit/api/openstack/compute/contrib/test_quota_classes.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_quota_classes.py rename to nova/tests/unit/api/openstack/compute/contrib/test_quota_classes.py index 2767d66518f9..228b44f369ce 100644 --- a/nova/tests/api/openstack/compute/contrib/test_quota_classes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_quota_classes.py @@ -20,7 +20,7 @@ from nova.api.openstack.compute.contrib import quota_classes from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes def quota_set(class_name): diff --git a/nova/tests/api/openstack/compute/contrib/test_quotas.py b/nova/tests/unit/api/openstack/compute/contrib/test_quotas.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_quotas.py rename to nova/tests/unit/api/openstack/compute/contrib/test_quotas.py index 37d3ab2ecb7f..33511b0cc3bb 100644 --- a/nova/tests/api/openstack/compute/contrib/test_quotas.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_quotas.py @@ -28,7 +28,7 @@ from nova import context as context_maker from nova import exception from nova import quota from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes def quota_set(id, include_server_group_quotas=True): diff --git a/nova/tests/api/openstack/compute/contrib/test_rescue.py b/nova/tests/unit/api/openstack/compute/contrib/test_rescue.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_rescue.py rename to nova/tests/unit/api/openstack/compute/contrib/test_rescue.py index 4695f8b2680c..f8de7de291c4 100644 --- a/nova/tests/api/openstack/compute/contrib/test_rescue.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_rescue.py @@ -20,7 +20,7 @@ import webob from nova import compute from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes CONF = cfg.CONF CONF.import_opt('password_length', 'nova.utils') diff --git a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py b/nova/tests/unit/api/openstack/compute/contrib/test_scheduler_hints.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py rename to nova/tests/unit/api/openstack/compute/contrib/test_scheduler_hints.py index 9dc9a5a8cdc7..fba3a02eec4d 100644 --- a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_scheduler_hints.py @@ -27,9 +27,9 @@ import nova.compute.api from nova.compute import flavors from nova import db from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -from nova.tests.image import fake +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit.image import fake UUID = fakes.FAKE_UUID diff --git a/nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py b/nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py rename to nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py index abe0724f78a8..a735f4722ead 100644 --- a/nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py @@ -24,7 +24,7 @@ from nova.api.openstack import wsgi from nova import context import nova.db from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_security_groups.py rename to nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py index 6911f92d2263..d1620b6a2847 100644 --- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py @@ -34,9 +34,9 @@ from nova import objects from nova.objects import instance as instance_obj from nova import quota from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -from nova.tests import utils +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit import utils CONF = cfg.CONF FAKE_UUID1 = 'a47ae74e-ab08-447f-8eee-ffd43fc46c16' diff --git a/nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py rename to nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py index bf29024f990f..535a1afa1580 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py @@ -22,7 +22,7 @@ from nova.api.openstack import wsgi from nova.compute import api as compute_api from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes UUID = 'abc' diff --git a/nova/tests/api/openstack/compute/contrib/test_server_external_events.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_external_events.py similarity index 100% rename from nova/tests/api/openstack/compute/contrib/test_server_external_events.py rename to nova/tests/unit/api/openstack/compute/contrib/test_server_external_events.py diff --git a/nova/tests/api/openstack/compute/contrib/test_server_group_quotas.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_group_quotas.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_server_group_quotas.py rename to nova/tests/unit/api/openstack/compute/contrib/test_server_group_quotas.py index 1f97c5ec4fe9..9e756cf15786 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_group_quotas.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_group_quotas.py @@ -24,7 +24,7 @@ import nova.db from nova.openstack.common import uuidutils from nova import quota from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/contrib/test_server_groups.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_server_groups.py rename to nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py index 7d4b4d88ca97..7dd2675c9ee8 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_groups.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py @@ -26,8 +26,8 @@ from nova import exception from nova import objects from nova.openstack.common import uuidutils from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import utils +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import utils FAKE_UUID1 = 'a47ae74e-ab08-447f-8eee-ffd43fc46c16' FAKE_UUID2 = 'c6e6430a-6563-4efa-9542-5e93c9e97d18' diff --git a/nova/tests/api/openstack/compute/contrib/test_server_password.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_password.py similarity index 97% rename from nova/tests/api/openstack/compute/contrib/test_server_password.py rename to nova/tests/unit/api/openstack/compute/contrib/test_server_password.py index d7a6d3f07042..d29b0480f396 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_password.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_password.py @@ -21,8 +21,8 @@ import webob from nova.api.metadata import password from nova import compute from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/contrib/test_server_start_stop.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_start_stop.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_server_start_stop.py rename to nova/tests/unit/api/openstack/compute/contrib/test_server_start_stop.py index ad190100201a..6be2a52b8645 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_start_stop.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_start_stop.py @@ -26,7 +26,7 @@ from nova import exception from nova.openstack.common import policy as common_policy from nova import policy from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes def fake_instance_get(context, instance_id, diff --git a/nova/tests/api/openstack/compute/contrib/test_server_usage.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_server_usage.py rename to nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py index 52844191f396..ee0d9a0ef456 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_usage.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py @@ -26,8 +26,8 @@ from nova import exception from nova import objects from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance UUID1 = '00000000-0000-0000-0000-000000000001' UUID2 = '00000000-0000-0000-0000-000000000002' diff --git a/nova/tests/api/openstack/compute/contrib/test_services.py b/nova/tests/unit/api/openstack/compute/contrib/test_services.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_services.py rename to nova/tests/unit/api/openstack/compute/contrib/test_services.py index 43fa6c463b5b..87297c567ba9 100644 --- a/nova/tests/api/openstack/compute/contrib/test_services.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_services.py @@ -30,8 +30,8 @@ from nova import db from nova import exception from nova.servicegroup.drivers import db as db_driver from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.objects import test_service +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.objects import test_service fake_services_list = [ diff --git a/nova/tests/api/openstack/compute/contrib/test_shelve.py b/nova/tests/unit/api/openstack/compute/contrib/test_shelve.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_shelve.py rename to nova/tests/unit/api/openstack/compute/contrib/test_shelve.py index 5405a92fec06..df1c6fc44930 100644 --- a/nova/tests/api/openstack/compute/contrib/test_shelve.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_shelve.py @@ -24,8 +24,8 @@ from nova import exception from nova.openstack.common import policy as common_policy from nova import policy from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance def fake_instance_get_by_uuid(context, instance_id, diff --git a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py rename to nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py index 8cde54e57556..9639b886aedb 100644 --- a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py @@ -34,7 +34,7 @@ from nova import objects from nova.openstack.common import policy as common_policy from nova import policy from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes from nova import utils SERVERS = 5 diff --git a/nova/tests/api/openstack/compute/contrib/test_snapshots.py b/nova/tests/unit/api/openstack/compute/contrib/test_snapshots.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_snapshots.py rename to nova/tests/unit/api/openstack/compute/contrib/test_snapshots.py index da3e9262fa1f..74bb1948e677 100644 --- a/nova/tests/api/openstack/compute/contrib/test_snapshots.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_snapshots.py @@ -21,7 +21,7 @@ import webob from nova.api.openstack.compute.contrib import volumes from nova import context from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes from nova.volume import cinder diff --git a/nova/tests/api/openstack/compute/contrib/test_tenant_networks.py b/nova/tests/unit/api/openstack/compute/contrib/test_tenant_networks.py similarity index 98% rename from nova/tests/api/openstack/compute/contrib/test_tenant_networks.py rename to nova/tests/unit/api/openstack/compute/contrib/test_tenant_networks.py index 18133e8604fa..30d4da6ba1b1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_tenant_networks.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_tenant_networks.py @@ -20,7 +20,7 @@ from nova.api.openstack.compute.plugins.v3 import tenant_networks \ as networks_v21 from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class TenantNetworksTestV21(test.NoDBTestCase): diff --git a/nova/tests/api/openstack/compute/contrib/test_used_limits.py b/nova/tests/unit/api/openstack/compute/contrib/test_used_limits.py similarity index 100% rename from nova/tests/api/openstack/compute/contrib/test_used_limits.py rename to nova/tests/unit/api/openstack/compute/contrib/test_used_limits.py diff --git a/nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py b/nova/tests/unit/api/openstack/compute/contrib/test_virtual_interfaces.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py rename to nova/tests/unit/api/openstack/compute/contrib/test_virtual_interfaces.py index f235513897ea..e8484d61b9dc 100644 --- a/nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_virtual_interfaces.py @@ -25,7 +25,7 @@ from nova import context from nova import exception from nova import network from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/unit/api/openstack/compute/contrib/test_volumes.py similarity index 99% rename from nova/tests/api/openstack/compute/contrib/test_volumes.py rename to nova/tests/unit/api/openstack/compute/contrib/test_volumes.py index 511f6017c57b..e3c5b8b07122 100644 --- a/nova/tests/api/openstack/compute/contrib/test_volumes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_volumes.py @@ -36,9 +36,9 @@ from nova import db from nova import exception from nova import objects from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_block_device -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance from nova.volume import cinder CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/extensions/__init__.py b/nova/tests/unit/api/openstack/compute/extensions/__init__.py similarity index 100% rename from nova/tests/api/openstack/compute/extensions/__init__.py rename to nova/tests/unit/api/openstack/compute/extensions/__init__.py diff --git a/nova/tests/api/openstack/compute/extensions/foxinsocks.py b/nova/tests/unit/api/openstack/compute/extensions/foxinsocks.py similarity index 100% rename from nova/tests/api/openstack/compute/extensions/foxinsocks.py rename to nova/tests/unit/api/openstack/compute/extensions/foxinsocks.py diff --git a/nova/tests/api/openstack/compute/plugins/__init__.py b/nova/tests/unit/api/openstack/compute/plugins/__init__.py similarity index 100% rename from nova/tests/api/openstack/compute/plugins/__init__.py rename to nova/tests/unit/api/openstack/compute/plugins/__init__.py diff --git a/nova/tests/api/openstack/compute/plugins/v3/__init__.py b/nova/tests/unit/api/openstack/compute/plugins/v3/__init__.py similarity index 100% rename from nova/tests/api/openstack/compute/plugins/v3/__init__.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/__init__.py diff --git a/nova/tests/api/openstack/compute/plugins/v3/admin_only_action_common.py b/nova/tests/unit/api/openstack/compute/plugins/v3/admin_only_action_common.py similarity index 99% rename from nova/tests/api/openstack/compute/plugins/v3/admin_only_action_common.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/admin_only_action_common.py index b3b234f9548e..ce99d1069b1c 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/admin_only_action_common.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/admin_only_action_common.py @@ -21,7 +21,7 @@ import nova.context from nova import exception from nova.openstack.common import uuidutils from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance class CommonMixin(object): diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_access_ips.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_access_ips.py similarity index 99% rename from nova/tests/api/openstack/compute/plugins/v3/test_access_ips.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_access_ips.py index 831d708c2203..44c1d5b5cd49 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_access_ips.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_access_ips.py @@ -23,8 +23,8 @@ from nova import db from nova import exception from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.image import fake +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.image import fake class AccessIPsExtTest(test.NoDBTestCase): diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_console_auth_tokens.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_console_auth_tokens.py similarity index 98% rename from nova/tests/api/openstack/compute/plugins/v3/test_console_auth_tokens.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_console_auth_tokens.py index 1248c39e3965..259906c53530 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_console_auth_tokens.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_console_auth_tokens.py @@ -18,7 +18,7 @@ from oslo.serialization import jsonutils from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes _FAKE_CONNECT_INFO = {'instance_uuid': 'fake_instance_uuid', diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_consoles.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_consoles.py similarity index 99% rename from nova/tests/api/openstack/compute/plugins/v3/test_consoles.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_consoles.py index addc5396da88..d3ba83dcbc16 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_consoles.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_consoles.py @@ -26,8 +26,8 @@ from nova import console from nova import db from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import matchers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import matchers FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_create_backup.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_create_backup.py similarity index 98% rename from nova/tests/api/openstack/compute/plugins/v3/test_create_backup.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_create_backup.py index 332d65219593..83701090f812 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_create_backup.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_create_backup.py @@ -17,9 +17,9 @@ from nova.api.openstack import common from nova.api.openstack.compute.plugins.v3 import create_backup from nova.openstack.common import uuidutils from nova import test -from nova.tests.api.openstack.compute.plugins.v3 import \ +from nova.tests.unit.api.openstack.compute.plugins.v3 import \ admin_only_action_common -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class CreateBackupTests(admin_only_action_common.CommonMixin, diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_extended_volumes.py similarity index 99% rename from nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_extended_volumes.py index dda65113e84a..dc6dd2898f01 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_extended_volumes.py @@ -25,9 +25,9 @@ from nova import exception from nova import objects from nova.objects import instance as instance_obj from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_block_device -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance from nova import volume UUID1 = '00000000-0000-0000-0000-000000000001' diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_extension_info.py similarity index 98% rename from nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_extension_info.py index 38905a4702c8..ee4e9d18b90c 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_extension_info.py @@ -17,7 +17,7 @@ from nova.api.openstack.compute.plugins.v3 import extension_info from nova import exception from nova import policy from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class fake_extension(object): diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_lock_server.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_lock_server.py similarity index 95% rename from nova/tests/api/openstack/compute/plugins/v3/test_lock_server.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_lock_server.py index 5f8e499b0b74..ff5817ba1984 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_lock_server.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_lock_server.py @@ -15,9 +15,9 @@ from nova.api.openstack.compute.plugins.v3 import lock_server from nova import exception -from nova.tests.api.openstack.compute.plugins.v3 import \ +from nova.tests.unit.api.openstack.compute.plugins.v3 import \ admin_only_action_common -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class LockServerTests(admin_only_action_common.CommonTests): diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_migrations.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_migrations.py similarity index 100% rename from nova/tests/api/openstack/compute/plugins/v3/test_migrations.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_migrations.py diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_multiple_create.py similarity index 99% rename from nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_multiple_create.py index 0c8320bccc48..35a559c668f7 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_multiple_create.py @@ -30,9 +30,9 @@ from nova import db from nova import exception from nova.network import manager from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -from nova.tests.image import fake +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit.image import fake CONF = cfg.CONF FAKE_UUID = fakes.FAKE_UUID diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_pause_server.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_pause_server.py similarity index 95% rename from nova/tests/api/openstack/compute/plugins/v3/test_pause_server.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_pause_server.py index e5de55bc30ad..5364fb45b33c 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_pause_server.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_pause_server.py @@ -14,9 +14,9 @@ # under the License. from nova.api.openstack.compute.plugins.v3 import pause_server -from nova.tests.api.openstack.compute.plugins.v3 import \ +from nova.tests.unit.api.openstack.compute.plugins.v3 import \ admin_only_action_common -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class PauseServerTests(admin_only_action_common.CommonTests): diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_pci.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_pci.py similarity index 99% rename from nova/tests/api/openstack/compute/plugins/v3/test_pci.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_pci.py index 5bc2201c49e0..6ac6269195d7 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_pci.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_pci.py @@ -24,8 +24,8 @@ from nova import exception from nova import objects from nova.pci import device from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.objects import test_pci_device +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.objects import test_pci_device fake_compute_node = { diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_server_actions.py similarity index 99% rename from nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_server_actions.py index eca40bdfb7cd..0bfe0eb2d4ca 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_server_actions.py @@ -33,10 +33,10 @@ from nova.image import glance from nova import objects from nova.openstack.common import uuidutils from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests.image import fake +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit.image import fake CONF = cfg.CONF CONF.import_opt('password_length', 'nova.utils') diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_server_external_events.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_server_external_events.py similarity index 100% rename from nova/tests/api/openstack/compute/plugins/v3/test_server_external_events.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_server_external_events.py diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_server_password.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_server_password.py similarity index 96% rename from nova/tests/api/openstack/compute/plugins/v3/test_server_password.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_server_password.py index 969393ec6075..20a8c1e0a120 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_server_password.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_server_password.py @@ -20,8 +20,8 @@ import webob from nova.api.metadata import password from nova import compute from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py similarity index 99% rename from nova/tests/api/openstack/compute/plugins/v3/test_servers.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py index 9972ad86122c..6eb92902fe91 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py @@ -59,11 +59,11 @@ from nova.objects import instance as instance_obj from nova.openstack.common import policy as common_policy from nova import policy from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -from nova.tests import fake_network -from nova.tests.image import fake -from nova.tests import matchers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_network +from nova.tests.unit.image import fake +from nova.tests.unit import matchers from nova import utils as nova_utils CONF = cfg.CONF @@ -259,7 +259,8 @@ class ServersControllerTest(ControllerTest): self.assertEqual([(None, None, port, None)], res.as_tuples()) def test_requested_networks_neutronv2_subclass_with_port(self): - cls = 'nova.tests.api.openstack.compute.test_servers.NeutronV2Subclass' + cls = ('nova.tests.unit.api.openstack.compute' + + '.test_servers.NeutronV2Subclass') self.flags(network_api_class=cls) port = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee' requested_networks = [{'port': port}] diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_services.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_services.py similarity index 99% rename from nova/tests/api/openstack/compute/plugins/v3/test_services.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_services.py index 9e681c6fde2c..072992cbb69c 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_services.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_services.py @@ -28,8 +28,8 @@ from nova import db from nova import exception from nova.servicegroup.drivers import db as db_driver from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.objects import test_service +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.objects import test_service fake_services_list = [ diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_suspend_server.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_suspend_server.py similarity index 94% rename from nova/tests/api/openstack/compute/plugins/v3/test_suspend_server.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_suspend_server.py index 0b82996e31fe..b0b71a0229cd 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_suspend_server.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_suspend_server.py @@ -13,9 +13,9 @@ # under the License. from nova.api.openstack.compute.plugins.v3 import suspend_server -from nova.tests.api.openstack.compute.plugins.v3 import \ +from nova.tests.unit.api.openstack.compute.plugins.v3 import \ admin_only_action_common -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class SuspendServerTests(admin_only_action_common.CommonTests): diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_user_data.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_user_data.py similarity index 98% rename from nova/tests/api/openstack/compute/plugins/v3/test_user_data.py rename to nova/tests/unit/api/openstack/compute/plugins/v3/test_user_data.py index 9ee2c5022a26..0e10c283f742 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_user_data.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_user_data.py @@ -30,9 +30,9 @@ from nova import db from nova import exception from nova.network import manager from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -from nova.tests.image import fake +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/schemas/__init__.py b/nova/tests/unit/api/openstack/compute/schemas/__init__.py similarity index 100% rename from nova/tests/api/openstack/compute/schemas/__init__.py rename to nova/tests/unit/api/openstack/compute/schemas/__init__.py diff --git a/nova/tests/api/openstack/compute/schemas/test_schemas.py b/nova/tests/unit/api/openstack/compute/schemas/test_schemas.py similarity index 100% rename from nova/tests/api/openstack/compute/schemas/test_schemas.py rename to nova/tests/unit/api/openstack/compute/schemas/test_schemas.py diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/flavors/invalid/mixed.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/mixed.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/flavors/invalid/mixed.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/mixed.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/flavors/invalid/partial.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/partial.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/flavors/invalid/partial.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/partial.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/flavors/invalid/partial2.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/partial2.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/flavors/invalid/partial2.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/partial2.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/flavors/valid/empty.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/empty.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/flavors/valid/empty.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/empty.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/flavors/valid/full.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/full.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/flavors/valid/full.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/full.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/flavors/valid/refs.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/refs.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/flavors/valid/refs.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/refs.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/images/invalid/mixed.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/mixed.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/images/invalid/mixed.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/mixed.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/images/invalid/no-metadata.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/no-metadata.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/images/invalid/no-metadata.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/no-metadata.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/images/invalid/partial.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/partial.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/images/invalid/partial.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/partial.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/images/invalid/partial2.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/partial2.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/images/invalid/partial2.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/partial2.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/images/valid/empty.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/empty.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/images/valid/empty.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/empty.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/images/valid/full.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/full.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/images/valid/full.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/full.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/images/valid/refs.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/refs.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/images/valid/refs.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/refs.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/servers/invalid/mixed.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/mixed.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/servers/invalid/mixed.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/mixed.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/servers/invalid/partial.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/servers/invalid/partial.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/servers/invalid/partial2.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial2.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/servers/invalid/partial2.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial2.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/servers/invalid/partial3.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial3.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/servers/invalid/partial3.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial3.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/servers/valid/detailed.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/detailed.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/servers/valid/detailed.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/detailed.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/servers/valid/empty.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/empty.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/servers/valid/empty.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/empty.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/servers/valid/full.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/full.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/servers/valid/full.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/full.xml diff --git a/nova/tests/api/openstack/compute/schemas/v1.1/servers/valid/refs.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/refs.xml similarity index 100% rename from nova/tests/api/openstack/compute/schemas/v1.1/servers/valid/refs.xml rename to nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/refs.xml diff --git a/nova/tests/api/openstack/compute/test_api.py b/nova/tests/unit/api/openstack/compute/test_api.py similarity index 99% rename from nova/tests/api/openstack/compute/test_api.py rename to nova/tests/unit/api/openstack/compute/test_api.py index ecfe3c689a0f..f86c04d4bda9 100644 --- a/nova/tests/api/openstack/compute/test_api.py +++ b/nova/tests/unit/api/openstack/compute/test_api.py @@ -23,7 +23,7 @@ from nova.api import openstack as openstack_api from nova.api.openstack import wsgi from nova import exception from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class APITest(test.NoDBTestCase): diff --git a/nova/tests/api/openstack/compute/test_auth.py b/nova/tests/unit/api/openstack/compute/test_auth.py similarity index 98% rename from nova/tests/api/openstack/compute/test_auth.py rename to nova/tests/unit/api/openstack/compute/test_auth.py index a8b48f685220..0386623b5d42 100644 --- a/nova/tests/api/openstack/compute/test_auth.py +++ b/nova/tests/unit/api/openstack/compute/test_auth.py @@ -18,7 +18,7 @@ import webob.dec from nova import context from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class TestNoAuthMiddleware(test.NoDBTestCase): diff --git a/nova/tests/api/openstack/compute/test_consoles.py b/nova/tests/unit/api/openstack/compute/test_consoles.py similarity index 99% rename from nova/tests/api/openstack/compute/test_consoles.py rename to nova/tests/unit/api/openstack/compute/test_consoles.py index df90927060c0..3ba99899c015 100644 --- a/nova/tests/api/openstack/compute/test_consoles.py +++ b/nova/tests/unit/api/openstack/compute/test_consoles.py @@ -27,8 +27,8 @@ from nova import console from nova import db from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import matchers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import matchers FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/unit/api/openstack/compute/test_extensions.py similarity index 99% rename from nova/tests/api/openstack/compute/test_extensions.py rename to nova/tests/unit/api/openstack/compute/test_extensions.py index 49670087c84c..cf84fc1f8402 100644 --- a/nova/tests/api/openstack/compute/test_extensions.py +++ b/nova/tests/unit/api/openstack/compute/test_extensions.py @@ -28,8 +28,8 @@ from nova.api.openstack import xmlutil from nova import exception import nova.policy from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import matchers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import matchers CONF = cfg.CONF @@ -142,7 +142,7 @@ class ExtensionTestCase(test.TestCase): def setUp(self): super(ExtensionTestCase, self).setUp() ext_list = CONF.osapi_compute_extension[:] - fox = ('nova.tests.api.openstack.compute.extensions.' + fox = ('nova.tests.unit.api.openstack.compute.extensions.' 'foxinsocks.Foxinsocks') if fox not in ext_list: ext_list.append(fox) diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/unit/api/openstack/compute/test_flavors.py similarity index 99% rename from nova/tests/api/openstack/compute/test_flavors.py rename to nova/tests/unit/api/openstack/compute/test_flavors.py index 71a844f15355..265b50ac8543 100644 --- a/nova/tests/api/openstack/compute/test_flavors.py +++ b/nova/tests/unit/api/openstack/compute/test_flavors.py @@ -26,8 +26,8 @@ from nova import context from nova import db from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import matchers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import matchers NS = "{http://docs.openstack.org/compute/api/v1.1}" ATOMNS = "{http://www.w3.org/2005/Atom}" diff --git a/nova/tests/api/openstack/compute/test_image_metadata.py b/nova/tests/unit/api/openstack/compute/test_image_metadata.py similarity index 98% rename from nova/tests/api/openstack/compute/test_image_metadata.py rename to nova/tests/unit/api/openstack/compute/test_image_metadata.py index 194dfd3b1c1a..6de8ddf6f69a 100644 --- a/nova/tests/api/openstack/compute/test_image_metadata.py +++ b/nova/tests/unit/api/openstack/compute/test_image_metadata.py @@ -24,8 +24,8 @@ from nova.api.openstack.compute.plugins.v3 import image_metadata \ as image_metadata_v21 from nova import exception from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import image_fixtures +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import image_fixtures IMAGE_FIXTURES = image_fixtures.get_image_fixtures() CHK_QUOTA_STR = 'nova.api.openstack.common.check_img_metadata_properties_quota' @@ -318,7 +318,7 @@ class ImageMetaDataTestV21(test.NoDBTestCase): side_effect=exception.ImageNotAuthorized(image_id='123')) def test_image_not_authorized_update_all(self, _get_mocked): image_id = 131 - # see nova.tests.api.openstack.fakes:_make_image_fixtures + # see nova.tests.unit.api.openstack.fakes:_make_image_fixtures req = fakes.HTTPRequest.blank('/v2/fake/images/%s/metadata/key1' % image_id) @@ -334,7 +334,7 @@ class ImageMetaDataTestV21(test.NoDBTestCase): side_effect=exception.ImageNotAuthorized(image_id='123')) def test_image_not_authorized_create(self, _get_mocked): image_id = 131 - # see nova.tests.api.openstack.fakes:_make_image_fixtures + # see nova.tests.unit.api.openstack.fakes:_make_image_fixtures req = fakes.HTTPRequest.blank('/v2/fake/images/%s/metadata/key1' % image_id) diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/unit/api/openstack/compute/test_images.py similarity index 99% rename from nova/tests/api/openstack/compute/test_images.py rename to nova/tests/unit/api/openstack/compute/test_images.py index 62dc3d8218cc..ad55f9a86e97 100644 --- a/nova/tests/api/openstack/compute/test_images.py +++ b/nova/tests/unit/api/openstack/compute/test_images.py @@ -31,9 +31,9 @@ from nova.api.openstack import xmlutil from nova import exception from nova.image import glance from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import image_fixtures -from nova.tests import matchers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import image_fixtures +from nova.tests.unit import matchers NS = "{http://docs.openstack.org/compute/api/v1.1}" ATOMNS = "{http://www.w3.org/2005/Atom}" diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/unit/api/openstack/compute/test_limits.py similarity index 99% rename from nova/tests/api/openstack/compute/test_limits.py rename to nova/tests/unit/api/openstack/compute/test_limits.py index 73885ad2cc29..47da849b28cf 100644 --- a/nova/tests/api/openstack/compute/test_limits.py +++ b/nova/tests/unit/api/openstack/compute/test_limits.py @@ -34,8 +34,8 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil import nova.context from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import matchers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import matchers from nova import utils diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/unit/api/openstack/compute/test_server_actions.py similarity index 99% rename from nova/tests/api/openstack/compute/test_server_actions.py rename to nova/tests/unit/api/openstack/compute/test_server_actions.py index 97b33dc99a63..16f8ce14bf38 100644 --- a/nova/tests/api/openstack/compute/test_server_actions.py +++ b/nova/tests/unit/api/openstack/compute/test_server_actions.py @@ -33,12 +33,12 @@ from nova.image import glance from nova import objects from nova.openstack.common import uuidutils from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests.image import fake -from nova.tests import matchers -from nova.tests import utils +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit.image import fake +from nova.tests.unit import matchers +from nova.tests.unit import utils CONF = cfg.CONF CONF.import_opt('password_length', 'nova.utils') diff --git a/nova/tests/api/openstack/compute/test_server_metadata.py b/nova/tests/unit/api/openstack/compute/test_server_metadata.py similarity index 99% rename from nova/tests/api/openstack/compute/test_server_metadata.py rename to nova/tests/unit/api/openstack/compute/test_server_metadata.py index 330786142dbe..ba9126f0f1a7 100644 --- a/nova/tests/api/openstack/compute/test_server_metadata.py +++ b/nova/tests/unit/api/openstack/compute/test_server_metadata.py @@ -31,8 +31,8 @@ import nova.db from nova import exception from nova import objects from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance CONF = cfg.CONF diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/unit/api/openstack/compute/test_servers.py similarity index 99% rename from nova/tests/api/openstack/compute/test_servers.py rename to nova/tests/unit/api/openstack/compute/test_servers.py index f08821e1016b..c37df741ecc5 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/unit/api/openstack/compute/test_servers.py @@ -56,13 +56,13 @@ from nova.objects import instance as instance_obj from nova.openstack.common import policy as common_policy from nova import policy from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -from nova.tests import fake_network -from nova.tests.image import fake -from nova.tests import matchers -from nova.tests.objects import test_keypair -from nova.tests import utils +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_network +from nova.tests.unit.image import fake +from nova.tests.unit import matchers +from nova.tests.unit.objects import test_keypair +from nova.tests.unit import utils from nova import utils as nova_utils CONF = cfg.CONF @@ -245,7 +245,8 @@ class ServersControllerTest(ControllerTest): self.assertEqual([(None, None, port, None)], res.as_tuples()) def test_requested_networks_neutronv2_subclass_with_port(self): - cls = 'nova.tests.api.openstack.compute.test_servers.NeutronV2Subclass' + cls = ('nova.tests.unit.api.openstack.compute' + + '.test_servers.NeutronV2Subclass') self.flags(network_api_class=cls) port = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee' requested_networks = [{'port': port}] diff --git a/nova/tests/api/openstack/compute/test_urlmap.py b/nova/tests/unit/api/openstack/compute/test_urlmap.py similarity index 97% rename from nova/tests/api/openstack/compute/test_urlmap.py rename to nova/tests/unit/api/openstack/compute/test_urlmap.py index f1f5f60cfe85..c95cb95d2cfc 100644 --- a/nova/tests/api/openstack/compute/test_urlmap.py +++ b/nova/tests/unit/api/openstack/compute/test_urlmap.py @@ -17,19 +17,19 @@ from oslo.serialization import jsonutils import webob from nova import test -from nova.tests.api.openstack import fakes -import nova.tests.image.fake +from nova.tests.unit.api.openstack import fakes +import nova.tests.unit.image.fake class UrlmapTest(test.NoDBTestCase): def setUp(self): super(UrlmapTest, self).setUp() fakes.stub_out_rate_limiting(self.stubs) - nova.tests.image.fake.stub_out_image_service(self.stubs) + nova.tests.unit.image.fake.stub_out_image_service(self.stubs) def tearDown(self): super(UrlmapTest, self).tearDown() - nova.tests.image.fake.FakeImageService_reset() + nova.tests.unit.image.fake.FakeImageService_reset() def test_path_version_v1_1(self): # Test URL path specifying v1.1 returns v2 content. diff --git a/nova/tests/api/openstack/compute/test_v21_extensions.py b/nova/tests/unit/api/openstack/compute/test_v21_extensions.py similarity index 100% rename from nova/tests/api/openstack/compute/test_v21_extensions.py rename to nova/tests/unit/api/openstack/compute/test_v21_extensions.py diff --git a/nova/tests/api/openstack/compute/test_v3_auth.py b/nova/tests/unit/api/openstack/compute/test_v3_auth.py similarity index 98% rename from nova/tests/api/openstack/compute/test_v3_auth.py rename to nova/tests/unit/api/openstack/compute/test_v3_auth.py index 5a42b758f505..e728fa89d6e2 100644 --- a/nova/tests/api/openstack/compute/test_v3_auth.py +++ b/nova/tests/unit/api/openstack/compute/test_v3_auth.py @@ -19,7 +19,7 @@ import webob.dec from nova import context from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class TestNoAuthMiddlewareV3(test.NoDBTestCase): diff --git a/nova/tests/api/openstack/compute/test_v3_extensions.py b/nova/tests/unit/api/openstack/compute/test_v3_extensions.py similarity index 100% rename from nova/tests/api/openstack/compute/test_v3_extensions.py rename to nova/tests/unit/api/openstack/compute/test_v3_extensions.py diff --git a/nova/tests/api/openstack/compute/test_versions.py b/nova/tests/unit/api/openstack/compute/test_versions.py similarity index 99% rename from nova/tests/api/openstack/compute/test_versions.py rename to nova/tests/unit/api/openstack/compute/test_versions.py index baec98b9ee40..fabd15e01c79 100644 --- a/nova/tests/api/openstack/compute/test_versions.py +++ b/nova/tests/unit/api/openstack/compute/test_versions.py @@ -25,9 +25,9 @@ from nova.api.openstack.compute import versions from nova.api.openstack.compute import views from nova.api.openstack import xmlutil from nova import test -from nova.tests.api.openstack import common -from nova.tests.api.openstack import fakes -from nova.tests import matchers +from nova.tests.unit.api.openstack import common +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import matchers NS = { diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/unit/api/openstack/fakes.py similarity index 99% rename from nova/tests/api/openstack/fakes.py rename to nova/tests/unit/api/openstack/fakes.py index 6b706383221b..34c072a634db 100644 --- a/nova/tests/api/openstack/fakes.py +++ b/nova/tests/unit/api/openstack/fakes.py @@ -41,9 +41,9 @@ from nova import exception as exc import nova.netconf from nova.network import api as network_api from nova import quota -from nova.tests import fake_block_device -from nova.tests import fake_network -from nova.tests.objects import test_keypair +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_network +from nova.tests.unit.objects import test_keypair from nova import utils from nova import wsgi diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/unit/api/openstack/test_common.py similarity index 99% rename from nova/tests/api/openstack/test_common.py rename to nova/tests/unit/api/openstack/test_common.py index 37ead3e73d89..a61f70cf9500 100644 --- a/nova/tests/api/openstack/test_common.py +++ b/nova/tests/unit/api/openstack/test_common.py @@ -33,7 +33,7 @@ from nova.compute import task_states from nova.compute import vm_states from nova import exception from nova import test -from nova.tests import utils +from nova.tests.unit import utils NS = "{http://docs.openstack.org/compute/api/v1.1}" diff --git a/nova/tests/api/openstack/test_faults.py b/nova/tests/unit/api/openstack/test_faults.py similarity index 100% rename from nova/tests/api/openstack/test_faults.py rename to nova/tests/unit/api/openstack/test_faults.py diff --git a/nova/tests/api/openstack/test_mapper.py b/nova/tests/unit/api/openstack/test_mapper.py similarity index 97% rename from nova/tests/api/openstack/test_mapper.py rename to nova/tests/unit/api/openstack/test_mapper.py index 99b53f384aad..b872be546f90 100644 --- a/nova/tests/api/openstack/test_mapper.py +++ b/nova/tests/unit/api/openstack/test_mapper.py @@ -17,7 +17,7 @@ import webob from nova.api import openstack as openstack_api from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes class MapperTest(test.NoDBTestCase): diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/unit/api/openstack/test_wsgi.py similarity index 99% rename from nova/tests/api/openstack/test_wsgi.py rename to nova/tests/unit/api/openstack/test_wsgi.py index 71ba710bcec5..760710162844 100644 --- a/nova/tests/api/openstack/test_wsgi.py +++ b/nova/tests/unit/api/openstack/test_wsgi.py @@ -19,8 +19,8 @@ from nova.api.openstack import wsgi from nova import exception from nova import i18n from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import utils +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import utils class RequestTest(test.NoDBTestCase): diff --git a/nova/tests/api/openstack/test_xmlutil.py b/nova/tests/unit/api/openstack/test_xmlutil.py similarity index 99% rename from nova/tests/api/openstack/test_xmlutil.py rename to nova/tests/unit/api/openstack/test_xmlutil.py index 903340c8d6cb..19186889bb7c 100644 --- a/nova/tests/api/openstack/test_xmlutil.py +++ b/nova/tests/unit/api/openstack/test_xmlutil.py @@ -20,7 +20,7 @@ from lxml import etree from nova.api.openstack import xmlutil from nova import exception from nova import test -from nova.tests import utils as tests_utils +from nova.tests.unit import utils as tests_utils class SelectorTest(test.NoDBTestCase): diff --git a/nova/tests/api/test_auth.py b/nova/tests/unit/api/test_auth.py similarity index 100% rename from nova/tests/api/test_auth.py rename to nova/tests/unit/api/test_auth.py diff --git a/nova/tests/api/test_compute_req_id.py b/nova/tests/unit/api/test_compute_req_id.py similarity index 100% rename from nova/tests/api/test_compute_req_id.py rename to nova/tests/unit/api/test_compute_req_id.py diff --git a/nova/tests/api/test_validator.py b/nova/tests/unit/api/test_validator.py similarity index 100% rename from nova/tests/api/test_validator.py rename to nova/tests/unit/api/test_validator.py diff --git a/nova/tests/api/test_wsgi.py b/nova/tests/unit/api/test_wsgi.py similarity index 100% rename from nova/tests/api/test_wsgi.py rename to nova/tests/unit/api/test_wsgi.py diff --git a/nova/tests/bundle/1mb.manifest.xml b/nova/tests/unit/bundle/1mb.manifest.xml similarity index 100% rename from nova/tests/bundle/1mb.manifest.xml rename to nova/tests/unit/bundle/1mb.manifest.xml diff --git a/nova/tests/bundle/1mb.no_kernel_or_ramdisk.manifest.xml b/nova/tests/unit/bundle/1mb.no_kernel_or_ramdisk.manifest.xml similarity index 100% rename from nova/tests/bundle/1mb.no_kernel_or_ramdisk.manifest.xml rename to nova/tests/unit/bundle/1mb.no_kernel_or_ramdisk.manifest.xml diff --git a/nova/tests/bundle/1mb.part.0 b/nova/tests/unit/bundle/1mb.part.0 similarity index 100% rename from nova/tests/bundle/1mb.part.0 rename to nova/tests/unit/bundle/1mb.part.0 diff --git a/nova/tests/bundle/1mb.part.1 b/nova/tests/unit/bundle/1mb.part.1 similarity index 100% rename from nova/tests/bundle/1mb.part.1 rename to nova/tests/unit/bundle/1mb.part.1 diff --git a/nova/tests/cast_as_call.py b/nova/tests/unit/cast_as_call.py similarity index 100% rename from nova/tests/cast_as_call.py rename to nova/tests/unit/cast_as_call.py diff --git a/nova/tests/cells/__init__.py b/nova/tests/unit/cells/__init__.py similarity index 100% rename from nova/tests/cells/__init__.py rename to nova/tests/unit/cells/__init__.py diff --git a/nova/tests/cells/fakes.py b/nova/tests/unit/cells/fakes.py similarity index 98% rename from nova/tests/cells/fakes.py rename to nova/tests/unit/cells/fakes.py index 8a2763850043..983e450262d8 100644 --- a/nova/tests/cells/fakes.py +++ b/nova/tests/unit/cells/fakes.py @@ -160,7 +160,7 @@ def _build_cell_stub_infos(test_case): def init(test_case): global CELL_NAME_TO_STUB_INFO - test_case.flags(driver='nova.tests.cells.fakes.FakeCellsDriver', + test_case.flags(driver='nova.tests.unit.cells.fakes.FakeCellsDriver', group='cells') CELL_NAME_TO_STUB_INFO = {} _build_cell_stub_infos(test_case) diff --git a/nova/tests/cells/test_cells_filters.py b/nova/tests/unit/cells/test_cells_filters.py similarity index 99% rename from nova/tests/cells/test_cells_filters.py rename to nova/tests/unit/cells/test_cells_filters.py index 01ad3580ff41..0ae832f6c8ee 100644 --- a/nova/tests/cells/test_cells_filters.py +++ b/nova/tests/unit/cells/test_cells_filters.py @@ -20,7 +20,7 @@ from nova.cells import filters from nova import context from nova.db.sqlalchemy import models from nova import test -from nova.tests.cells import fakes +from nova.tests.unit.cells import fakes class FiltersTestCase(test.NoDBTestCase): diff --git a/nova/tests/cells/test_cells_manager.py b/nova/tests/unit/cells/test_cells_manager.py similarity index 99% rename from nova/tests/cells/test_cells_manager.py rename to nova/tests/unit/cells/test_cells_manager.py index e540bf5793b5..ca77abd1d253 100644 --- a/nova/tests/cells/test_cells_manager.py +++ b/nova/tests/unit/cells/test_cells_manager.py @@ -26,8 +26,8 @@ from nova.cells import messaging from nova.cells import utils as cells_utils from nova import context from nova import test -from nova.tests.cells import fakes -from nova.tests import fake_server_actions +from nova.tests.unit.cells import fakes +from nova.tests.unit import fake_server_actions CONF = cfg.CONF CONF.import_opt('compute_topic', 'nova.compute.rpcapi') diff --git a/nova/tests/cells/test_cells_messaging.py b/nova/tests/unit/cells/test_cells_messaging.py similarity index 99% rename from nova/tests/cells/test_cells_messaging.py rename to nova/tests/unit/cells/test_cells_messaging.py index 079f97e08984..dc15fd107990 100644 --- a/nova/tests/cells/test_cells_messaging.py +++ b/nova/tests/unit/cells/test_cells_messaging.py @@ -41,8 +41,8 @@ from nova.objects import fields as objects_fields from nova.openstack.common import uuidutils from nova import rpc from nova import test -from nova.tests.cells import fakes -from nova.tests import fake_server_actions +from nova.tests.unit.cells import fakes +from nova.tests.unit import fake_server_actions CONF = cfg.CONF CONF.import_opt('name', 'nova.cells.opts', group='cells') diff --git a/nova/tests/cells/test_cells_rpc_driver.py b/nova/tests/unit/cells/test_cells_rpc_driver.py similarity index 99% rename from nova/tests/cells/test_cells_rpc_driver.py rename to nova/tests/unit/cells/test_cells_rpc_driver.py index 1414adfb1e7a..7efba3765b57 100644 --- a/nova/tests/cells/test_cells_rpc_driver.py +++ b/nova/tests/unit/cells/test_cells_rpc_driver.py @@ -26,7 +26,7 @@ from nova.cells import rpc_driver from nova import context from nova import rpc from nova import test -from nova.tests.cells import fakes +from nova.tests.unit.cells import fakes CONF = cfg.CONF CONF.import_opt('rpc_driver_queue_base', 'nova.cells.rpc_driver', diff --git a/nova/tests/cells/test_cells_rpcapi.py b/nova/tests/unit/cells/test_cells_rpcapi.py similarity index 99% rename from nova/tests/cells/test_cells_rpcapi.py rename to nova/tests/unit/cells/test_cells_rpcapi.py index 7292ee03fcd5..398b96d8aef2 100644 --- a/nova/tests/cells/test_cells_rpcapi.py +++ b/nova/tests/unit/cells/test_cells_rpcapi.py @@ -22,7 +22,7 @@ import six from nova.cells import rpcapi as cells_rpcapi from nova import exception from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance CONF = cfg.CONF CONF.import_opt('topic', 'nova.cells.opts', group='cells') diff --git a/nova/tests/cells/test_cells_scheduler.py b/nova/tests/unit/cells/test_cells_scheduler.py similarity index 98% rename from nova/tests/cells/test_cells_scheduler.py rename to nova/tests/unit/cells/test_cells_scheduler.py index 1a60c7394f38..23a115eaa127 100644 --- a/nova/tests/cells/test_cells_scheduler.py +++ b/nova/tests/unit/cells/test_cells_scheduler.py @@ -30,8 +30,8 @@ from nova import exception from nova.openstack.common import uuidutils from nova.scheduler import utils as scheduler_utils from nova import test -from nova.tests.cells import fakes -from nova.tests import fake_instance +from nova.tests.unit.cells import fakes +from nova.tests.unit import fake_instance from nova import utils CONF = cfg.CONF @@ -334,7 +334,7 @@ class CellsSchedulerTestCase(test.TestCase): def test_cells_filter_args_correct(self): # Re-init our fakes with some filters. - our_path = 'nova.tests.cells.test_cells_scheduler' + our_path = 'nova.tests.unit.cells.test_cells_scheduler' cls_names = [our_path + '.' + 'FakeFilterClass1', our_path + '.' + 'FakeFilterClass2'] self.flags(scheduler_filter_classes=cls_names, group='cells') @@ -416,7 +416,7 @@ class CellsSchedulerTestCase(test.TestCase): def test_cells_filter_returning_none(self): # Re-init our fakes with some filters. - our_path = 'nova.tests.cells.test_cells_scheduler' + our_path = 'nova.tests.unit.cells.test_cells_scheduler' cls_names = [our_path + '.' + 'FakeFilterClass1', our_path + '.' + 'FakeFilterClass2'] self.flags(scheduler_filter_classes=cls_names, group='cells') @@ -449,7 +449,7 @@ class CellsSchedulerTestCase(test.TestCase): def test_cells_weight_args_correct(self): # Re-init our fakes with some filters. - our_path = 'nova.tests.cells.test_cells_scheduler' + our_path = 'nova.tests.unit.cells.test_cells_scheduler' cls_names = [our_path + '.' + 'FakeWeightClass1', our_path + '.' + 'FakeWeightClass2'] self.flags(scheduler_weight_classes=cls_names, group='cells') diff --git a/nova/tests/cells/test_cells_state_manager.py b/nova/tests/unit/cells/test_cells_state_manager.py similarity index 100% rename from nova/tests/cells/test_cells_state_manager.py rename to nova/tests/unit/cells/test_cells_state_manager.py diff --git a/nova/tests/cells/test_cells_utils.py b/nova/tests/unit/cells/test_cells_utils.py similarity index 100% rename from nova/tests/cells/test_cells_utils.py rename to nova/tests/unit/cells/test_cells_utils.py diff --git a/nova/tests/cells/test_cells_weights.py b/nova/tests/unit/cells/test_cells_weights.py similarity index 100% rename from nova/tests/cells/test_cells_weights.py rename to nova/tests/unit/cells/test_cells_weights.py diff --git a/nova/tests/cert/__init__.py b/nova/tests/unit/cert/__init__.py similarity index 100% rename from nova/tests/cert/__init__.py rename to nova/tests/unit/cert/__init__.py diff --git a/nova/tests/cert/test_rpcapi.py b/nova/tests/unit/cert/test_rpcapi.py similarity index 100% rename from nova/tests/cert/test_rpcapi.py rename to nova/tests/unit/cert/test_rpcapi.py diff --git a/nova/tests/cmd/__init__.py b/nova/tests/unit/cmd/__init__.py similarity index 100% rename from nova/tests/cmd/__init__.py rename to nova/tests/unit/cmd/__init__.py diff --git a/nova/tests/cmd/test_idmapshift.py b/nova/tests/unit/cmd/test_idmapshift.py similarity index 100% rename from nova/tests/cmd/test_idmapshift.py rename to nova/tests/unit/cmd/test_idmapshift.py diff --git a/nova/tests/compute/__init__.py b/nova/tests/unit/compute/__init__.py similarity index 100% rename from nova/tests/compute/__init__.py rename to nova/tests/unit/compute/__init__.py diff --git a/nova/tests/compute/eventlet_utils.py b/nova/tests/unit/compute/eventlet_utils.py similarity index 100% rename from nova/tests/compute/eventlet_utils.py rename to nova/tests/unit/compute/eventlet_utils.py diff --git a/nova/tests/compute/fake_resource_tracker.py b/nova/tests/unit/compute/fake_resource_tracker.py similarity index 100% rename from nova/tests/compute/fake_resource_tracker.py rename to nova/tests/unit/compute/fake_resource_tracker.py diff --git a/nova/tests/compute/monitors/__init__.py b/nova/tests/unit/compute/monitors/__init__.py similarity index 100% rename from nova/tests/compute/monitors/__init__.py rename to nova/tests/unit/compute/monitors/__init__.py diff --git a/nova/tests/compute/monitors/test_cpu_monitor.py b/nova/tests/unit/compute/monitors/test_cpu_monitor.py similarity index 100% rename from nova/tests/compute/monitors/test_cpu_monitor.py rename to nova/tests/unit/compute/monitors/test_cpu_monitor.py diff --git a/nova/tests/compute/monitors/test_monitors.py b/nova/tests/unit/compute/monitors/test_monitors.py similarity index 96% rename from nova/tests/compute/monitors/test_monitors.py rename to nova/tests/unit/compute/monitors/test_monitors.py index 929e149bf6f0..e84647948357 100644 --- a/nova/tests/compute/monitors/test_monitors.py +++ b/nova/tests/unit/compute/monitors/test_monitors.py @@ -109,8 +109,8 @@ class ResourceMonitorsTestCase(test.TestCase): super(ResourceMonitorsTestCase, self).setUp() self.monitor_handler = monitors.ResourceMonitorHandler() fake_monitors = [ - 'nova.tests.compute.monitors.test_monitors.FakeMonitorClass1', - 'nova.tests.compute.monitors.test_monitors.FakeMonitorClass2'] + 'nova.tests.unit.compute.monitors.test_monitors.FakeMonitorClass1', + 'nova.tests.unit.compute.monitors.test_monitors.FakeMonitorClass2'] self.flags(compute_available_monitors=fake_monitors) classes = self.monitor_handler.get_matching_classes( diff --git a/nova/tests/compute/test_arch.py b/nova/tests/unit/compute/test_arch.py similarity index 100% rename from nova/tests/compute/test_arch.py rename to nova/tests/unit/compute/test_arch.py diff --git a/nova/tests/compute/test_claims.py b/nova/tests/unit/compute/test_claims.py similarity index 99% rename from nova/tests/compute/test_claims.py rename to nova/tests/unit/compute/test_claims.py index 8f945891678b..50218f24c7f2 100644 --- a/nova/tests/compute/test_claims.py +++ b/nova/tests/unit/compute/test_claims.py @@ -26,7 +26,7 @@ from nova import exception from nova import objects from nova.pci import manager as pci_manager from nova import test -from nova.tests.pci import fakes as pci_fakes +from nova.tests.unit.pci import fakes as pci_fakes from nova.virt import hardware diff --git a/nova/tests/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py similarity index 99% rename from nova/tests/compute/test_compute.py rename to nova/tests/unit/compute/test_compute.py index dcb0895fe49d..8f4d73dd79a4 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/unit/compute/test_compute.py @@ -72,19 +72,19 @@ from nova.openstack.common import uuidutils from nova import policy from nova import quota from nova import test -from nova.tests.compute import eventlet_utils -from nova.tests.compute import fake_resource_tracker -from nova.tests.db import fakes as db_fakes -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests import fake_network -from nova.tests import fake_network_cache_model -from nova.tests import fake_notifier -from nova.tests import fake_server_actions -from nova.tests.image import fake as fake_image -from nova.tests import matchers -from nova.tests.objects import test_flavor -from nova.tests.objects import test_migration +from nova.tests.unit.compute import eventlet_utils +from nova.tests.unit.compute import fake_resource_tracker +from nova.tests.unit.db import fakes as db_fakes +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_network +from nova.tests.unit import fake_network_cache_model +from nova.tests.unit import fake_notifier +from nova.tests.unit import fake_server_actions +from nova.tests.unit.image import fake as fake_image +from nova.tests.unit import matchers +from nova.tests.unit.objects import test_flavor +from nova.tests.unit.objects import test_migration from nova import utils from nova.virt import block_device as driver_block_device from nova.virt import event diff --git a/nova/tests/compute/test_compute_api.py b/nova/tests/unit/compute/test_compute_api.py similarity index 99% rename from nova/tests/compute/test_compute_api.py rename to nova/tests/unit/compute/test_compute_api.py index 932c6af3ae9d..10ac29d3dd09 100644 --- a/nova/tests/compute/test_compute_api.py +++ b/nova/tests/unit/compute/test_compute_api.py @@ -41,13 +41,13 @@ from nova.objects import quotas as quotas_obj from nova.openstack.common import uuidutils from nova import quota from nova import test -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests.image import fake as fake_image -from nova.tests import matchers -from nova.tests.objects import test_flavor -from nova.tests.objects import test_migration -from nova.tests.objects import test_service +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit.image import fake as fake_image +from nova.tests.unit import matchers +from nova.tests.unit.objects import test_flavor +from nova.tests.unit.objects import test_migration +from nova.tests.unit.objects import test_service from nova.volume import cinder diff --git a/nova/tests/compute/test_compute_cells.py b/nova/tests/unit/compute/test_compute_cells.py similarity index 99% rename from nova/tests/compute/test_compute_cells.py rename to nova/tests/unit/compute/test_compute_cells.py index b96a47a9265c..9908e6aad3ef 100644 --- a/nova/tests/compute/test_compute_cells.py +++ b/nova/tests/unit/compute/test_compute_cells.py @@ -33,8 +33,8 @@ from nova import db from nova import objects from nova import quota from nova import test -from nova.tests.compute import test_compute -from nova.tests import fake_instance +from nova.tests.unit.compute import test_compute +from nova.tests.unit import fake_instance ORIG_COMPUTE_API = None diff --git a/nova/tests/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py similarity index 99% rename from nova/tests/compute/test_compute_mgr.py rename to nova/tests/unit/compute/test_compute_mgr.py index 0a804ea2a942..04b9f6bdc6ab 100644 --- a/nova/tests/compute/test_compute_mgr.py +++ b/nova/tests/unit/compute/test_compute_mgr.py @@ -38,11 +38,11 @@ from nova import objects from nova.objects import block_device as block_device_obj from nova.openstack.common import uuidutils from nova import test -from nova.tests.compute import fake_resource_tracker -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests.objects import test_instance_fault -from nova.tests.objects import test_instance_info_cache +from nova.tests.unit.compute import fake_resource_tracker +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit.objects import test_instance_fault +from nova.tests.unit.objects import test_instance_info_cache from nova import utils diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/unit/compute/test_compute_utils.py similarity index 98% rename from nova/tests/compute/test_compute_utils.py rename to nova/tests/unit/compute/test_compute_utils.py index 28732ed3fb02..6234ae30f624 100644 --- a/nova/tests/compute/test_compute_utils.py +++ b/nova/tests/unit/compute/test_compute_utils.py @@ -40,13 +40,13 @@ from nova.objects import block_device as block_device_obj from nova.objects import instance as instance_obj from nova import rpc from nova import test -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests import fake_network -from nova.tests import fake_notifier -from nova.tests import fake_server_actions -import nova.tests.image.fake -from nova.tests import matchers +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_network +from nova.tests.unit import fake_notifier +from nova.tests.unit import fake_server_actions +import nova.tests.unit.image.fake +from nova.tests.unit import matchers from nova import utils from nova.virt import driver @@ -431,7 +431,7 @@ class UsageInfoTestCase(test.TestCase): def fake_show(meh, context, id, **kwargs): return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1}} - self.stubs.Set(nova.tests.image.fake._FakeImageService, + self.stubs.Set(nova.tests.unit.image.fake._FakeImageService, 'show', fake_show) fake_network.set_stub_network_methods(self.stubs) fake_server_actions.stub_out_action_events(self.stubs) diff --git a/nova/tests/compute/test_compute_xen.py b/nova/tests/unit/compute/test_compute_xen.py similarity index 95% rename from nova/tests/compute/test_compute_xen.py rename to nova/tests/unit/compute/test_compute_xen.py index 29300e651163..90a81e9d13b4 100644 --- a/nova/tests/compute/test_compute_xen.py +++ b/nova/tests/unit/compute/test_compute_xen.py @@ -19,9 +19,9 @@ from nova.compute import power_state from nova import context from nova import objects from nova.objects import instance as instance_obj -from nova.tests.compute import eventlet_utils -from nova.tests import fake_instance -from nova.tests.virt.xenapi import stubs +from nova.tests.unit.compute import eventlet_utils +from nova.tests.unit import fake_instance +from nova.tests.unit.virt.xenapi import stubs from nova.virt.xenapi import vm_utils CONF = cfg.CONF diff --git a/nova/tests/compute/test_flavors.py b/nova/tests/unit/compute/test_flavors.py similarity index 100% rename from nova/tests/compute/test_flavors.py rename to nova/tests/unit/compute/test_flavors.py diff --git a/nova/tests/compute/test_host_api.py b/nova/tests/unit/compute/test_host_api.py similarity index 99% rename from nova/tests/compute/test_host_api.py rename to nova/tests/unit/compute/test_host_api.py index eeebe0a3570f..348d2dea3d51 100644 --- a/nova/tests/compute/test_host_api.py +++ b/nova/tests/unit/compute/test_host_api.py @@ -24,9 +24,9 @@ from nova import context from nova import exception from nova import objects from nova import test -from nova.tests import fake_notifier -from nova.tests.objects import test_objects -from nova.tests.objects import test_service +from nova.tests.unit import fake_notifier +from nova.tests.unit.objects import test_objects +from nova.tests.unit.objects import test_service class ComputeHostAPITestCase(test.TestCase): diff --git a/nova/tests/compute/test_hvtype.py b/nova/tests/unit/compute/test_hvtype.py similarity index 100% rename from nova/tests/compute/test_hvtype.py rename to nova/tests/unit/compute/test_hvtype.py diff --git a/nova/tests/compute/test_keypairs.py b/nova/tests/unit/compute/test_keypairs.py similarity index 98% rename from nova/tests/compute/test_keypairs.py rename to nova/tests/unit/compute/test_keypairs.py index 2644250cc210..ecdbcff103c8 100644 --- a/nova/tests/compute/test_keypairs.py +++ b/nova/tests/unit/compute/test_keypairs.py @@ -23,9 +23,9 @@ from nova import db from nova import exception from nova.i18n import _ from nova import quota -from nova.tests.compute import test_compute -from nova.tests import fake_notifier -from nova.tests.objects import test_keypair +from nova.tests.unit.compute import test_compute +from nova.tests.unit import fake_notifier +from nova.tests.unit.objects import test_keypair CONF = cfg.CONF QUOTAS = quota.QUOTAS diff --git a/nova/tests/compute/test_multiple_nodes.py b/nova/tests/unit/compute/test_multiple_nodes.py similarity index 100% rename from nova/tests/compute/test_multiple_nodes.py rename to nova/tests/unit/compute/test_multiple_nodes.py diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/unit/compute/test_resource_tracker.py similarity index 99% rename from nova/tests/compute/test_resource_tracker.py rename to nova/tests/unit/compute/test_resource_tracker.py index af859d91ad7f..e646fb19ad27 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/unit/compute/test_resource_tracker.py @@ -33,9 +33,9 @@ from nova import objects from nova.objects import base as obj_base from nova import rpc from nova import test -from nova.tests.compute.monitors import test_monitors -from nova.tests.objects import test_migration -from nova.tests.pci import fakes as pci_fakes +from nova.tests.unit.compute.monitors import test_monitors +from nova.tests.unit.objects import test_migration +from nova.tests.unit.pci import fakes as pci_fakes from nova.virt import driver from nova.virt import hardware @@ -1339,8 +1339,8 @@ class ComputeMonitorTestCase(BaseTestCase): def setUp(self): super(ComputeMonitorTestCase, self).setUp() fake_monitors = [ - 'nova.tests.compute.monitors.test_monitors.FakeMonitorClass1', - 'nova.tests.compute.monitors.test_monitors.FakeMonitorClass2'] + 'nova.tests.unit.compute.monitors.test_monitors.FakeMonitorClass1', + 'nova.tests.unit.compute.monitors.test_monitors.FakeMonitorClass2'] self.flags(compute_available_monitors=fake_monitors) self.tracker = self._tracker() self.node_name = 'nodename' diff --git a/nova/tests/compute/test_resources.py b/nova/tests/unit/compute/test_resources.py similarity index 99% rename from nova/tests/compute/test_resources.py rename to nova/tests/unit/compute/test_resources.py index db2722ccb543..cdd1585e34d3 100644 --- a/nova/tests/compute/test_resources.py +++ b/nova/tests/unit/compute/test_resources.py @@ -27,7 +27,7 @@ from nova import context from nova.i18n import _ from nova.objects import flavor as flavor_obj from nova import test -from nova.tests.fake_instance import fake_instance_obj +from nova.tests.unit.fake_instance import fake_instance_obj CONF = cfg.CONF diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/unit/compute/test_rpcapi.py similarity index 99% rename from nova/tests/compute/test_rpcapi.py rename to nova/tests/unit/compute/test_rpcapi.py index df13dbff993c..bf8e41215e9a 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/unit/compute/test_rpcapi.py @@ -27,8 +27,8 @@ from nova import context from nova.objects import block_device as objects_block_dev from nova.objects import network_request as objects_network_request from nova import test -from nova.tests import fake_block_device -from nova.tests.fake_instance import fake_instance_obj +from nova.tests.unit import fake_block_device +from nova.tests.unit.fake_instance import fake_instance_obj CONF = cfg.CONF diff --git a/nova/tests/compute/test_shelve.py b/nova/tests/unit/compute/test_shelve.py similarity index 99% rename from nova/tests/compute/test_shelve.py rename to nova/tests/unit/compute/test_shelve.py index 3d8a0c7b6fce..3e792ae8932e 100644 --- a/nova/tests/compute/test_shelve.py +++ b/nova/tests/unit/compute/test_shelve.py @@ -22,8 +22,8 @@ from nova.compute import vm_states from nova import db from nova import objects from nova.objects import base as obj_base -from nova.tests.compute import test_compute -from nova.tests.image import fake as fake_image +from nova.tests.unit.compute import test_compute +from nova.tests.unit.image import fake as fake_image from nova import utils CONF = cfg.CONF diff --git a/nova/tests/compute/test_stats.py b/nova/tests/unit/compute/test_stats.py similarity index 100% rename from nova/tests/compute/test_stats.py rename to nova/tests/unit/compute/test_stats.py diff --git a/nova/tests/compute/test_tracker.py b/nova/tests/unit/compute/test_tracker.py similarity index 100% rename from nova/tests/compute/test_tracker.py rename to nova/tests/unit/compute/test_tracker.py diff --git a/nova/tests/compute/test_virtapi.py b/nova/tests/unit/compute/test_virtapi.py similarity index 100% rename from nova/tests/compute/test_virtapi.py rename to nova/tests/unit/compute/test_virtapi.py diff --git a/nova/tests/compute/test_vmmode.py b/nova/tests/unit/compute/test_vmmode.py similarity index 100% rename from nova/tests/compute/test_vmmode.py rename to nova/tests/unit/compute/test_vmmode.py diff --git a/nova/tests/conductor/__init__.py b/nova/tests/unit/conductor/__init__.py similarity index 100% rename from nova/tests/conductor/__init__.py rename to nova/tests/unit/conductor/__init__.py diff --git a/nova/tests/conductor/tasks/__init__.py b/nova/tests/unit/conductor/tasks/__init__.py similarity index 100% rename from nova/tests/conductor/tasks/__init__.py rename to nova/tests/unit/conductor/tasks/__init__.py diff --git a/nova/tests/conductor/tasks/test_live_migrate.py b/nova/tests/unit/conductor/tasks/test_live_migrate.py similarity index 99% rename from nova/tests/conductor/tasks/test_live_migrate.py rename to nova/tests/unit/conductor/tasks/test_live_migrate.py index fbf0bc802b9e..1d7c0340b923 100644 --- a/nova/tests/conductor/tasks/test_live_migrate.py +++ b/nova/tests/unit/conductor/tasks/test_live_migrate.py @@ -20,7 +20,7 @@ from nova import exception from nova import objects from nova.scheduler import utils as scheduler_utils from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance class LiveMigrationTaskTestCase(test.NoDBTestCase): diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/unit/conductor/test_conductor.py similarity index 99% rename from nova/tests/conductor/test_conductor.py rename to nova/tests/unit/conductor/test_conductor.py index 8f2d6bbe5f0e..0570ada2174a 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/unit/conductor/test_conductor.py @@ -50,13 +50,13 @@ from nova import rpc from nova.scheduler import driver as scheduler_driver from nova.scheduler import utils as scheduler_utils from nova import test -from nova.tests import cast_as_call -from nova.tests.compute import test_compute -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests import fake_notifier -from nova.tests import fake_server_actions -from nova.tests import fake_utils +from nova.tests.unit import cast_as_call +from nova.tests.unit.compute import test_compute +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_notifier +from nova.tests.unit import fake_server_actions +from nova.tests.unit import fake_utils from nova import utils diff --git a/nova/tests/conf_fixture.py b/nova/tests/unit/conf_fixture.py similarity index 94% rename from nova/tests/conf_fixture.py rename to nova/tests/unit/conf_fixture.py index 3dc7a1b72bb7..336ba61daf4a 100644 --- a/nova/tests/conf_fixture.py +++ b/nova/tests/unit/conf_fixture.py @@ -21,7 +21,7 @@ from nova import config from nova import ipv6 from nova.openstack.common.fixture import config as config_fixture from nova import paths -from nova.tests import utils +from nova.tests.unit import utils CONF = cfg.CONF CONF.import_opt('use_ipv6', 'nova.netconf') @@ -49,9 +49,9 @@ class ConfFixture(config_fixture.Config): self.conf.set_default('fake_network', True) self.conf.set_default('flat_network_bridge', 'br100') self.conf.set_default('floating_ip_dns_manager', - 'nova.tests.utils.dns_manager') + 'nova.tests.unit.utils.dns_manager') self.conf.set_default('instance_dns_manager', - 'nova.tests.utils.dns_manager') + 'nova.tests.unit.utils.dns_manager') self.conf.set_default('network_size', 8) self.conf.set_default('num_networks', 2) self.conf.set_default('use_ipv6', True) diff --git a/nova/tests/console/__init__.py b/nova/tests/unit/console/__init__.py similarity index 100% rename from nova/tests/console/__init__.py rename to nova/tests/unit/console/__init__.py diff --git a/nova/tests/console/test_console.py b/nova/tests/unit/console/test_console.py similarity index 100% rename from nova/tests/console/test_console.py rename to nova/tests/unit/console/test_console.py diff --git a/nova/tests/console/test_rpcapi.py b/nova/tests/unit/console/test_rpcapi.py similarity index 100% rename from nova/tests/console/test_rpcapi.py rename to nova/tests/unit/console/test_rpcapi.py diff --git a/nova/tests/console/test_serial.py b/nova/tests/unit/console/test_serial.py similarity index 100% rename from nova/tests/console/test_serial.py rename to nova/tests/unit/console/test_serial.py diff --git a/nova/tests/console/test_type.py b/nova/tests/unit/console/test_type.py similarity index 100% rename from nova/tests/console/test_type.py rename to nova/tests/unit/console/test_type.py diff --git a/nova/tests/console/test_websocketproxy.py b/nova/tests/unit/console/test_websocketproxy.py similarity index 100% rename from nova/tests/console/test_websocketproxy.py rename to nova/tests/unit/console/test_websocketproxy.py diff --git a/nova/tests/consoleauth/__init__.py b/nova/tests/unit/consoleauth/__init__.py similarity index 100% rename from nova/tests/consoleauth/__init__.py rename to nova/tests/unit/consoleauth/__init__.py diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/unit/consoleauth/test_consoleauth.py similarity index 100% rename from nova/tests/consoleauth/test_consoleauth.py rename to nova/tests/unit/consoleauth/test_consoleauth.py diff --git a/nova/tests/consoleauth/test_rpcapi.py b/nova/tests/unit/consoleauth/test_rpcapi.py similarity index 100% rename from nova/tests/consoleauth/test_rpcapi.py rename to nova/tests/unit/consoleauth/test_rpcapi.py diff --git a/nova/tests/db/__init__.py b/nova/tests/unit/db/__init__.py similarity index 100% rename from nova/tests/db/__init__.py rename to nova/tests/unit/db/__init__.py diff --git a/nova/tests/db/fakes.py b/nova/tests/unit/db/fakes.py similarity index 100% rename from nova/tests/db/fakes.py rename to nova/tests/unit/db/fakes.py diff --git a/nova/tests/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py similarity index 99% rename from nova/tests/db/test_db_api.py rename to nova/tests/unit/db/test_db_api.py index 03354d834ef6..f103dd49ce56 100644 --- a/nova/tests/db/test_db_api.py +++ b/nova/tests/unit/db/test_db_api.py @@ -54,7 +54,7 @@ from nova import exception from nova.openstack.common import uuidutils from nova import quota from nova import test -from nova.tests import matchers +from nova.tests.unit import matchers from nova import utils CONF = cfg.CONF diff --git a/nova/tests/db/test_migration_utils.py b/nova/tests/unit/db/test_migration_utils.py similarity index 99% rename from nova/tests/db/test_migration_utils.py rename to nova/tests/unit/db/test_migration_utils.py index b3035ca5bbc4..1d5d155894b3 100644 --- a/nova/tests/db/test_migration_utils.py +++ b/nova/tests/unit/db/test_migration_utils.py @@ -26,7 +26,7 @@ from sqlalchemy.types import UserDefinedType from nova.db.sqlalchemy import api as db from nova.db.sqlalchemy import utils from nova import exception -from nova.tests.db import test_migrations +from nova.tests.unit.db import test_migrations SA_VERSION = tuple(map(int, sqlalchemy.__version__.split('.'))) diff --git a/nova/tests/db/test_migrations.conf b/nova/tests/unit/db/test_migrations.conf similarity index 100% rename from nova/tests/db/test_migrations.conf rename to nova/tests/unit/db/test_migrations.conf diff --git a/nova/tests/db/test_migrations.py b/nova/tests/unit/db/test_migrations.py similarity index 100% rename from nova/tests/db/test_migrations.py rename to nova/tests/unit/db/test_migrations.py diff --git a/nova/tests/db/test_sqlite.py b/nova/tests/unit/db/test_sqlite.py similarity index 100% rename from nova/tests/db/test_sqlite.py rename to nova/tests/unit/db/test_sqlite.py diff --git a/nova/tests/fake_block_device.py b/nova/tests/unit/fake_block_device.py similarity index 100% rename from nova/tests/fake_block_device.py rename to nova/tests/unit/fake_block_device.py diff --git a/nova/tests/fake_crypto.py b/nova/tests/unit/fake_crypto.py similarity index 100% rename from nova/tests/fake_crypto.py rename to nova/tests/unit/fake_crypto.py diff --git a/nova/tests/fake_hosts.py b/nova/tests/unit/fake_hosts.py similarity index 96% rename from nova/tests/fake_hosts.py rename to nova/tests/unit/fake_hosts.py index bcf11bae68de..78fa414ac744 100644 --- a/nova/tests/fake_hosts.py +++ b/nova/tests/unit/fake_hosts.py @@ -17,7 +17,7 @@ Provides some fake hosts to test host and service related functions """ -from nova.tests.objects import test_service +from nova.tests.unit.objects import test_service HOST_LIST = [ diff --git a/nova/tests/fake_instance.py b/nova/tests/unit/fake_instance.py similarity index 100% rename from nova/tests/fake_instance.py rename to nova/tests/unit/fake_instance.py diff --git a/nova/tests/fake_ldap.py b/nova/tests/unit/fake_ldap.py similarity index 100% rename from nova/tests/fake_ldap.py rename to nova/tests/unit/fake_ldap.py diff --git a/nova/tests/fake_loadables/__init__.py b/nova/tests/unit/fake_loadables/__init__.py similarity index 100% rename from nova/tests/fake_loadables/__init__.py rename to nova/tests/unit/fake_loadables/__init__.py diff --git a/nova/tests/fake_loadables/fake_loadable1.py b/nova/tests/unit/fake_loadables/fake_loadable1.py similarity index 96% rename from nova/tests/fake_loadables/fake_loadable1.py rename to nova/tests/unit/fake_loadables/fake_loadable1.py index cc02fe717b0f..a30b66bdf7b6 100644 --- a/nova/tests/fake_loadables/fake_loadable1.py +++ b/nova/tests/unit/fake_loadables/fake_loadable1.py @@ -15,7 +15,7 @@ Fake Loadable subclasses module #1 """ -from nova.tests import fake_loadables +from nova.tests.unit import fake_loadables class FakeLoadableSubClass1(fake_loadables.FakeLoadable): diff --git a/nova/tests/fake_loadables/fake_loadable2.py b/nova/tests/unit/fake_loadables/fake_loadable2.py similarity index 96% rename from nova/tests/fake_loadables/fake_loadable2.py rename to nova/tests/unit/fake_loadables/fake_loadable2.py index e72b582000f2..a70ab5f952bc 100644 --- a/nova/tests/fake_loadables/fake_loadable2.py +++ b/nova/tests/unit/fake_loadables/fake_loadable2.py @@ -15,7 +15,7 @@ Fake Loadable subclasses module #2 """ -from nova.tests import fake_loadables +from nova.tests.unit import fake_loadables class FakeLoadableSubClass5(fake_loadables.FakeLoadable): diff --git a/nova/tests/fake_network.py b/nova/tests/unit/fake_network.py similarity index 99% rename from nova/tests/fake_network.py rename to nova/tests/unit/fake_network.py index bfb678c6db5c..09f54b13d389 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/unit/fake_network.py @@ -29,9 +29,9 @@ from nova import objects from nova.objects import base as obj_base from nova.objects import virtual_interface as vif_obj from nova.pci import device as pci_device -from nova.tests.objects import test_fixed_ip -from nova.tests.objects import test_instance_info_cache -from nova.tests.objects import test_pci_device +from nova.tests.unit.objects import test_fixed_ip +from nova.tests.unit.objects import test_instance_info_cache +from nova.tests.unit.objects import test_pci_device HOST = "testhost" diff --git a/nova/tests/fake_network_cache_model.py b/nova/tests/unit/fake_network_cache_model.py similarity index 100% rename from nova/tests/fake_network_cache_model.py rename to nova/tests/unit/fake_network_cache_model.py diff --git a/nova/tests/fake_notifier.py b/nova/tests/unit/fake_notifier.py similarity index 100% rename from nova/tests/fake_notifier.py rename to nova/tests/unit/fake_notifier.py diff --git a/nova/tests/fake_policy.py b/nova/tests/unit/fake_policy.py similarity index 100% rename from nova/tests/fake_policy.py rename to nova/tests/unit/fake_policy.py diff --git a/nova/tests/fake_processutils.py b/nova/tests/unit/fake_processutils.py similarity index 100% rename from nova/tests/fake_processutils.py rename to nova/tests/unit/fake_processutils.py diff --git a/nova/tests/fake_server_actions.py b/nova/tests/unit/fake_server_actions.py similarity index 100% rename from nova/tests/fake_server_actions.py rename to nova/tests/unit/fake_server_actions.py diff --git a/nova/tests/fake_utils.py b/nova/tests/unit/fake_utils.py similarity index 100% rename from nova/tests/fake_utils.py rename to nova/tests/unit/fake_utils.py diff --git a/nova/tests/fake_volume.py b/nova/tests/unit/fake_volume.py similarity index 100% rename from nova/tests/fake_volume.py rename to nova/tests/unit/fake_volume.py diff --git a/nova/tests/functional/__init__.py b/nova/tests/unit/functional/__init__.py similarity index 100% rename from nova/tests/functional/__init__.py rename to nova/tests/unit/functional/__init__.py diff --git a/nova/tests/image/__init__.py b/nova/tests/unit/image/__init__.py similarity index 100% rename from nova/tests/image/__init__.py rename to nova/tests/unit/image/__init__.py diff --git a/nova/tests/image/abs.tar.gz b/nova/tests/unit/image/abs.tar.gz similarity index 100% rename from nova/tests/image/abs.tar.gz rename to nova/tests/unit/image/abs.tar.gz diff --git a/nova/tests/image/fake.py b/nova/tests/unit/image/fake.py similarity index 100% rename from nova/tests/image/fake.py rename to nova/tests/unit/image/fake.py diff --git a/nova/tests/image/rel.tar.gz b/nova/tests/unit/image/rel.tar.gz similarity index 100% rename from nova/tests/image/rel.tar.gz rename to nova/tests/unit/image/rel.tar.gz diff --git a/nova/tests/image/test_fake.py b/nova/tests/unit/image/test_fake.py similarity index 96% rename from nova/tests/image/test_fake.py rename to nova/tests/unit/image/test_fake.py index 9088d58026df..0f985ee16e6a 100644 --- a/nova/tests/image/test_fake.py +++ b/nova/tests/unit/image/test_fake.py @@ -18,18 +18,18 @@ import StringIO from nova import context from nova import exception from nova import test -import nova.tests.image.fake +import nova.tests.unit.image.fake class FakeImageServiceTestCase(test.NoDBTestCase): def setUp(self): super(FakeImageServiceTestCase, self).setUp() - self.image_service = nova.tests.image.fake.FakeImageService() + self.image_service = nova.tests.unit.image.fake.FakeImageService() self.context = context.get_admin_context() def tearDown(self): super(FakeImageServiceTestCase, self).tearDown() - nova.tests.image.fake.FakeImageService_reset() + nova.tests.unit.image.fake.FakeImageService_reset() def test_detail(self): res = self.image_service.detail(self.context) diff --git a/nova/tests/image/test_glance.py b/nova/tests/unit/image/test_glance.py similarity index 100% rename from nova/tests/image/test_glance.py rename to nova/tests/unit/image/test_glance.py diff --git a/nova/tests/image/test_s3.py b/nova/tests/unit/image/test_s3.py similarity index 99% rename from nova/tests/image/test_s3.py rename to nova/tests/unit/image/test_s3.py index 7472e0fa79d2..d9ef08d3feae 100644 --- a/nova/tests/image/test_s3.py +++ b/nova/tests/unit/image/test_s3.py @@ -27,7 +27,7 @@ from nova import db from nova import exception from nova.image import s3 from nova import test -from nova.tests.image import fake +from nova.tests.unit.image import fake ami_manifest_xml = """ diff --git a/nova/tests/image/test_transfer_modules.py b/nova/tests/unit/image/test_transfer_modules.py similarity index 100% rename from nova/tests/image/test_transfer_modules.py rename to nova/tests/unit/image/test_transfer_modules.py diff --git a/nova/tests/image_fixtures.py b/nova/tests/unit/image_fixtures.py similarity index 100% rename from nova/tests/image_fixtures.py rename to nova/tests/unit/image_fixtures.py diff --git a/nova/tests/integrated/__init__.py b/nova/tests/unit/integrated/__init__.py similarity index 100% rename from nova/tests/integrated/__init__.py rename to nova/tests/unit/integrated/__init__.py diff --git a/nova/tests/integrated/api/__init__.py b/nova/tests/unit/integrated/api/__init__.py similarity index 100% rename from nova/tests/integrated/api/__init__.py rename to nova/tests/unit/integrated/api/__init__.py diff --git a/nova/tests/integrated/api/client.py b/nova/tests/unit/integrated/api/client.py similarity index 99% rename from nova/tests/integrated/api/client.py rename to nova/tests/unit/integrated/api/client.py index 44e2ba2dc4f0..733592ec2677 100644 --- a/nova/tests/integrated/api/client.py +++ b/nova/tests/unit/integrated/api/client.py @@ -19,7 +19,7 @@ import requests from nova.i18n import _ from nova.openstack.common import log as logging -from nova.tests.image import fake +from nova.tests.unit.image import fake LOG = logging.getLogger(__name__) diff --git a/nova/tests/integrated/api_samples/NMN/multinic-add-fixed-ip-req.json.tpl b/nova/tests/unit/integrated/api_samples/NMN/multinic-add-fixed-ip-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/NMN/multinic-add-fixed-ip-req.json.tpl rename to nova/tests/unit/integrated/api_samples/NMN/multinic-add-fixed-ip-req.json.tpl diff --git a/nova/tests/integrated/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl b/nova/tests/unit/integrated/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.json.tpl b/nova/tests/unit/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.json.tpl rename to nova/tests/unit/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.json.tpl diff --git a/nova/tests/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl b/nova/tests/unit/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/NMN/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/NMN/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/NMN/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/NMN/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/NMN/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/NMN/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/NMN/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/NMN/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/NMN/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/NMN/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/NMN/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/NMN/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/NMN/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/NMN/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/NMN/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/NMN/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/image-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/image-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/image-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/image-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/image-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/image-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/image-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/image-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/image-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/image-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/image-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/image-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/image-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/image-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/image-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/image-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/list-servers-detail-get.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/list-servers-detail-get.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-action-rebuild-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-action-rebuild-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-action-rebuild-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-action-rebuild-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-resize-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-resize-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-resize-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-resize-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-resize-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-resize-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-resize-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-resize-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-update-put-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-update-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-update-put-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-update-put-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-update-put-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-update-put-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-update-put-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-update-put-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-DCF/server-update-put-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-DCF/server-update-put-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-AZ/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-AZ/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-AZ/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-AZ/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-AZ/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-STS/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-STS/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-STS/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-STS/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-STS/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-VIF-NET/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-VIF-NET/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-VIF-NET/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-VIF-NET/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-VIF-NET/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-VIF-NET/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-VIF-NET/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-VIF-NET/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-VIF-NET/vifs-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/vifs-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-VIF-NET/vifs-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/vifs-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SRV-USG/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SRV-USG/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SRV-USG/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SRV-USG/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-SRV-USG/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/OS-SRV-USG/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/OS-SRV-USG/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/README.rst b/nova/tests/unit/integrated/api_samples/README.rst similarity index 94% rename from nova/tests/integrated/api_samples/README.rst rename to nova/tests/unit/integrated/api_samples/README.rst index 6395f48876cd..a08cac3a4292 100644 --- a/nova/tests/integrated/api_samples/README.rst +++ b/nova/tests/unit/integrated/api_samples/README.rst @@ -11,7 +11,7 @@ for your tests. There should be both JSON and XML tests included. Then run the following command: - GENERATE_SAMPLES=True tox -epy27 nova.tests.integrated + GENERATE_SAMPLES=True tox -epy27 nova.tests.unit.integrated Which will create the files on doc/api_samples. diff --git a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/flavors-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/flavors-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/flavors-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/flavors-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/flavors-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/flavors-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/flavors-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/flavors-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-changepassword.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-changepassword.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-changepassword.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-changepassword.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-changepassword.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-changepassword.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-changepassword.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-changepassword.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-confirmresize.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-confirmresize.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-confirmresize.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-confirmresize.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-confirmresize.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-confirmresize.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-confirmresize.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-confirmresize.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-createimage.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-createimage.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-createimage.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-createimage.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-createimage.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-createimage.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-createimage.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-createimage.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-reboot.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-reboot.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-reboot.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-reboot.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-reboot.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-reboot.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-rebuild.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-rebuild.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-resize.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-resize.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-resize.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-resize.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-resize.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-resize.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-resize.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-resize.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-revertresize.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-revertresize.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-revertresize.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-revertresize.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-revertresize.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-action-revertresize.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-action-revertresize.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-action-revertresize.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/servers-details-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/servers-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/servers-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/all_extensions/servers-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/servers-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/all_extensions/servers-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/flavor-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/flavor-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/flavor-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/flavor-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/flavor-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/flavors-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/flavors-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/flavors-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/flavors-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/flavors-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/flavors-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/flavors-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/image-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/image-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/image-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/image-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/image-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/image-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/image-meta-key-get.json.tpl b/nova/tests/unit/integrated/api_samples/image-meta-key-get.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-get.json.tpl rename to nova/tests/unit/integrated/api_samples/image-meta-key-get.json.tpl diff --git a/nova/tests/integrated/api_samples/image-meta-key-get.xml.tpl b/nova/tests/unit/integrated/api_samples/image-meta-key-get.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-get.xml.tpl rename to nova/tests/unit/integrated/api_samples/image-meta-key-get.xml.tpl diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-req.json.tpl b/nova/tests/unit/integrated/api_samples/image-meta-key-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-put-req.json.tpl rename to nova/tests/unit/integrated/api_samples/image-meta-key-put-req.json.tpl diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-req.xml.tpl b/nova/tests/unit/integrated/api_samples/image-meta-key-put-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-put-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/image-meta-key-put-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-resp.json.tpl b/nova/tests/unit/integrated/api_samples/image-meta-key-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-put-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/image-meta-key-put-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/image-meta-key-put-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-put-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/image-meta-key-put-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-put-req.json.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-put-req.json.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-put-req.json.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-put-req.xml.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-put-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-put-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-put-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-put-resp.json.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-put-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-put-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-put-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-put-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-put-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-put-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/image-metadata-resp.json.tpl b/nova/tests/unit/integrated/api_samples/image-metadata-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/image-metadata-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/images-details-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/images-details-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/images-details-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/images-details-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/images-details-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/images-details-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/images-details-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/images-details-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/images-details-resp.json.tpl b/nova/tests/unit/integrated/api_samples/images-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/images-details-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/images-details-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/images-details-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/images-details-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/images-details-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/images-details-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/images-list-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/images-list-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/images-list-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/images-list-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/images-list-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/images-list-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/images-list-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/images-list-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/images-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/images-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/images-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/images-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/images-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/images-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/images-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/images-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/limit-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/limit-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/limit-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/limit-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/limit-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/limit-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/limit-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/limit-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-backup-server.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-backup-server.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-backup-server.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-backup-server.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-backup-server.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-backup-server.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-backup-server.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-backup-server.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-inject-network-info.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-inject-network-info.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-inject-network-info.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-inject-network-info.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-live-migrate.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-live-migrate.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-live-migrate.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-live-migrate.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-live-migrate.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-live-migrate.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-live-migrate.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-live-migrate.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-lock-server.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-lock-server.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-lock-server.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-lock-server.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-lock-server.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-lock-server.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-lock-server.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-lock-server.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-migrate.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-migrate.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-migrate.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-migrate.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-migrate.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-migrate.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-migrate.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-migrate.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-pause.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-pause.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-pause.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-pause.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-pause.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-pause.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-pause.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-pause.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-network.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-network.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-network.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-network.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-server-state.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-server-state.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-server-state.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-server-state.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-state.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-state.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-reset-state.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-reset-state.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-resume.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-resume.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-resume.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-resume.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-resume.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-resume.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-resume.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-resume.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-suspend.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-suspend.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-suspend.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-suspend.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-suspend.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-suspend.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-suspend.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-suspend.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-unlock-server.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-unlock-server.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-unlock-server.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-unlock-server.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-unlock-server.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-unlock-server.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-unlock-server.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-unlock-server.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-unpause.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-unpause.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-unpause.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-unpause.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/admin-actions-unpause.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-unpause.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/admin-actions-unpause.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/admin-actions-unpause.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-admin-actions/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-admin-actions/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-admin-actions/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-admin-actions/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-agents/agent-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-agents/agent-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-agents/agent-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-agents/agent-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-agents/agent-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-agents/agent-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-agents/agent-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-agents/agent-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-agents/agent-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-agents/agent-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-agents/agent-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-agents/agent-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-agents/agent-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-agents/agent-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-agents/agent-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-agents/agent-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-agents/agent-update-put-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-agents/agent-update-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-agents/agent-update-put-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-agents/agent-update-put-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-agents/agent-update-put-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-agents/agent-update-put-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-agents/agent-update-put-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-agents/agent-update-put-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-agents/agent-update-put-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-agents/agent-update-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-agents/agent-update-put-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-agents/agent-update-put-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-agents/agent-update-put-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-agents/agent-update-put-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-agents/agent-update-put-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-agents/agent-update-put-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-agents/agents-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-agents/agents-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-agents/agents-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-agents/agents-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-agents/agents-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-agents/agents-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-agents/agents-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-agents/agents-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-update-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-update-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregates-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregates-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregates-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregates-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-aggregates/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-aggregates/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-aggregates/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-aggregates/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-attach-interfaces/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-attach-interfaces/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-attach-interfaces/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-attach-interfaces/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-details-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-availability-zone/availability-zone-details-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-details-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-details-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-details-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-availability-zone/availability-zone-details-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-details-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-availability-zone/availability-zone-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-availability-zone/availability-zone-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-cell-capacities/cells-capacities-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-cell-capacities/cells-capacities-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cell-capacities/cells-capacities-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-cell-capacities/cells-capacities-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-cell-capacities/cells-capacities-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-cell-capacities/cells-capacities-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cell-capacities/cells-capacities-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-cell-capacities/cells-capacities-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-cells/cells-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-cells/cells-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cells/cells-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-cells/cells-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-cells/cells-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-cells/cells-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cells/cells-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-cells/cells-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-cells/cells-list-empty-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-cells/cells-list-empty-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cells/cells-list-empty-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-cells/cells-list-empty-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-cells/cells-list-empty-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-cells/cells-list-empty-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cells/cells-list-empty-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-cells/cells-list-empty-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-cells/cells-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-cells/cells-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cells/cells-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-cells/cells-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-cells/cells-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-cells/cells-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cells/cells-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-cells/cells-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-certificates/certificate-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-certificates/certificate-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-certificates/certificate-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-certificates/certificate-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-certificates/certificate-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-certificates/certificate-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-certificates/certificate-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-certificates/certificate-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-certificates/certificate-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-certificates/certificate-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-certificates/certificate-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-certificates/certificate-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-certificates/certificate-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-certificates/certificate-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-certificates/certificate-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-certificates/certificate-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-certificates/certificate-get-root-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-certificates/certificate-get-root-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-certificates/certificate-get-root-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-certificates/certificate-get-root-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-certificates/certificate-get-root-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-certificates/certificate-get-root-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-certificates/certificate-get-root-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-certificates/certificate-get-root-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-cloudpipe-update/cloud-pipe-update-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-cloudpipe-update/cloud-pipe-update-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cloudpipe-update/cloud-pipe-update-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-cloudpipe-update/cloud-pipe-update-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-config-drive/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-config-drive/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-config-drive/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-config-drive/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-config-drive/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-config-drive/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-config-drive/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-config-drive/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-config-drive/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-config-drive/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-config-drive/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-config-drive/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-config-drive/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-config-drive/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-config-drive/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-config-drive/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-console-auth-tokens/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-console-auth-tokens/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-auth-tokens/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-console-auth-tokens/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-console-auth-tokens/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-console-auth-tokens/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-auth-tokens/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-console-auth-tokens/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-console-auth-tokens/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-console-auth-tokens/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-auth-tokens/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-console-auth-tokens/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-console-auth-tokens/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-console-auth-tokens/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-auth-tokens/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-console-auth-tokens/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-console-output/console-output-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-console-output/console-output-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-output/console-output-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-console-output/console-output-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-console-output/console-output-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-console-output/console-output-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-output/console-output-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-console-output/console-output-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-console-output/console-output-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-console-output/console-output-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-output/console-output-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-console-output/console-output-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-console-output/console-output-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-console-output/console-output-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-output/console-output-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-console-output/console-output-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-console-output/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-console-output/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-output/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-console-output/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-console-output/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-console-output/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-output/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-console-output/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-console-output/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-console-output/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-output/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-console-output/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-console-output/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-console-output/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-console-output/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-console-output/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-rdp-console-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-rdp-console-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-rdp-console-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-rdp-console-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-rdp-console-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-rdp-console-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-rdp-console-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-rdp-console-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-rdp-console-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-rdp-console-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-rdp-console-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-rdp-console-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-rdp-console-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-rdp-console-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-rdp-console-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-rdp-console-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-serial-console-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-serial-console-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-serial-console-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-serial-console-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-serial-console-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-serial-console-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-serial-console-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-serial-console-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-serial-console-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-serial-console-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-serial-console-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-serial-console-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-serial-console-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-serial-console-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-serial-console-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-serial-console-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-spice-console-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-spice-console-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-spice-console-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-spice-console-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-spice-console-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-spice-console-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-spice-console-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-spice-console-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-spice-console-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-spice-console-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-spice-console-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-spice-console-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-spice-console-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-spice-console-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-spice-console-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-spice-console-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-vnc-console-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-vnc-console-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-vnc-console-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-vnc-console-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/get-vnc-console-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/get-vnc-console-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-consoles/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-consoles/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-consoles/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-consoles/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-deferred-delete/force-delete-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-deferred-delete/force-delete-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-deferred-delete/restore-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-deferred-delete/restore-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-deferred-delete/restore-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-deferred-delete/restore-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-deferred-delete/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-deferred-delete/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-deferred-delete/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-deferred-delete/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-deferred-delete/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-deferred-delete/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-deferred-delete/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-deferred-delete/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-evacuate/server-evacuate-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-evacuate/server-evacuate-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-evacuate/server-evacuate-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-evacuate/server-evacuate-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-evacuate/server-evacuate-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-evacuate/server-evacuate-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-evacuate/server-evacuate-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-evacuate/server-evacuate-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-evacuate/server-evacuate-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-evacuate/server-evacuate-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-evacuate/server-evacuate-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-evacuate/server-evacuate-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-evacuate/server-evacuate-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-evacuate/server-evacuate-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-evacuate/server-evacuate-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-evacuate/server-evacuate-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-evacuate/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-evacuate/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-evacuate/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-evacuate/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-evacuate/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-evacuate/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-evacuate/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-evacuate/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-evacuate/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-evacuate/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-evacuate/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-evacuate/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-evacuate/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-evacuate/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-evacuate/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-evacuate/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-evacuate-find-host/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-evacuate-find-host/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-networks/network-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-networks/network-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-networks/network-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-networks/network-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-networks/network-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-networks/network-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-networks/network-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-networks/network-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-networks/network-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-networks/network-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-networks/network-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-networks/network-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-networks/network-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-networks/network-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-networks/network-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-networks/network-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-networks/network-show-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-networks/network-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-networks/network-show-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-networks/network-show-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-networks/network-show-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-networks/network-show-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-networks/network-show-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-networks/network-show-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-networks/networks-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-networks/networks-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-networks/networks-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-networks/networks-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-networks/networks-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-networks/networks-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-networks/networks-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-networks/networks-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-quotas/quotas-update-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-quotas/quotas-update-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-quotas/quotas-update-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-quotas/quotas-update-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-quotas/quotas-update-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-quotas/quotas-update-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-quotas/quotas-update-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-quotas/quotas-update-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-quotas/quotas-update-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-quotas/quotas-update-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-quotas/quotas-update-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-quotas/quotas-update-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-quotas/quotas-update-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-quotas/quotas-update-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-quotas/quotas-update-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-quotas/quotas-update-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-rescue-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-rescue-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-rescue-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-rescue-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-rescue-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-rescue-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-rescue-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-rescue-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-rescue.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-rescue.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-rescue.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-rescue.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-rescue.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-rescue.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-rescue.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-rescue-with-image/server-rescue.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-services-delete/services-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-services-delete/services-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-services-delete/services-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-services-delete/services-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-services-delete/services-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-services-delete/services-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-services-delete/services-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-services-delete/services-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-volumes/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-volumes/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-volumes/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-volumes/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-volumes/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-volumes/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-volumes/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-volumes/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-volumes/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-volumes/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-volumes/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-volumes/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-volumes/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-volumes/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-volumes/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-volumes/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-extended-volumes/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-volumes/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-fixed-ips/fixedip-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-fixed-ips/fixedip-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fixed-ips/fixedip-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-fixed-ips/fixedip-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-fixed-ips/fixedip-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-fixed-ips/fixedip-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fixed-ips/fixedip-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-fixed-ips/fixedip-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-fixed-ips/fixedips-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-fixed-ips/fixedips-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fixed-ips/fixedips-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-fixed-ips/fixedips-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-manage/flavor-create-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-manage/flavor-create-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-manage/flavor-create-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-manage/flavor-create-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-manage/flavor-create-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-manage/flavor-create-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-manage/flavor-create-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-manage/flavor-create-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-manage/flavor-create-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-manage/flavor-create-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-manage/flavor-create-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-manage/flavor-create-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-manage/flavor-create-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-manage/flavor-create-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-manage/flavor-create-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-manage/flavor-create-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-flavor-swap/flavor-swap-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-floating-ips/floating-ips-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-fping/fping-get-details-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-fping/fping-get-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fping/fping-get-details-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-fping/fping-get-details-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-fping/fping-get-details-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-fping/fping-get-details-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fping/fping-get-details-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-fping/fping-get-details-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-fping/fping-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-fping/fping-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fping/fping-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-fping/fping-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-fping/fping-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-fping/fping-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fping/fping-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-fping/fping-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-fping/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-fping/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fping/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-fping/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-fping/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-fping/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fping/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-fping/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-fping/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-fping/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fping/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-fping/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-fping/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-fping/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-fping/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-fping/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hide-server-addresses/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hide-server-addresses/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hide-server-addresses/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hide-server-addresses/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hide-server-addresses/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hide-server-addresses/servers-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hide-server-addresses/servers-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hide-server-addresses/servers-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-get-reboot.json.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-get-reboot.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-get-reboot.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-get-reboot.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-get-reboot.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-get-reboot.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-get-reboot.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-get-reboot.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-get-shutdown.json.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-get-shutdown.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-get-shutdown.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-get-shutdown.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-get-shutdown.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-get-shutdown.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-get-shutdown.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-get-shutdown.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-get-startup.json.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-get-startup.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-get-startup.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-get-startup.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-get-startup.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-get-startup.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-get-startup.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-get-startup.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-put-maintenance-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-put-maintenance-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-put-maintenance-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-put-maintenance-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-put-maintenance-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-put-maintenance-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-put-maintenance-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-put-maintenance-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-put-maintenance-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-put-maintenance-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-put-maintenance-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-put-maintenance-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/host-put-maintenance-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/host-put-maintenance-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/host-put-maintenance-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/host-put-maintenance-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/hosts-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/hosts-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-search-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-search-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-search-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-search-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-servers-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-servers-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-servers-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-servers-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-servers-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-servers-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-servers-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-servers-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-show-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-show-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-show-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-show-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-statistics-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-statistics-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-statistics-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-statistics-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-hypervisors/hypervisors-uptime-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-uptime-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-hypervisors/hypervisors-uptime-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-hypervisors/hypervisors-uptime-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-instance-actions/instance-action-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-instance-actions/instance-action-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-instance-actions/instance-action-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-instance-actions/instance-action-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-instance-actions/instance-action-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-instance-actions/instance-action-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-instance-actions/instance-action-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-instance-actions/instance-action-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-instance-actions/instance-actions-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-instance-actions/instance-actions-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-instance-actions/instance-actions-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-instance-actions/instance-actions-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-import-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-import-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-import-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-import-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-import-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-import-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-import-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-import-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-import-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-import-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-import-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-import-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-import-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-import-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-import-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-import-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-keypairs/keypairs-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-migrations/migrations-get.json.tpl b/nova/tests/unit/integrated/api_samples/os-migrations/migrations-get.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-migrations/migrations-get.json.tpl rename to nova/tests/unit/integrated/api_samples/os-migrations/migrations-get.json.tpl diff --git a/nova/tests/integrated/api_samples/os-migrations/migrations-get.xml.tpl b/nova/tests/unit/integrated/api_samples/os-migrations/migrations-get.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-migrations/migrations-get.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-migrations/migrations-get.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-multiple-create/multiple-create-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-multiple-create/multiple-create-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-multiple-create/multiple-create-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-multiple-create/multiple-create-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-multiple-create/multiple-create-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-multiple-create/multiple-create-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-multiple-create/multiple-create-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-networks-associate/network-associate-host-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-networks-associate/network-associate-host-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks-associate/network-associate-host-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-networks-associate/network-associate-host-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-networks-associate/network-associate-host-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-networks-associate/network-associate-host-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks-associate/network-associate-host-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-networks-associate/network-associate-host-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-host-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-host-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-host-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-host-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-project-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-project-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-project-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-project-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks-associate/network-disassociate-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-networks-associate/network-disassociate-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/network-add-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-networks/network-add-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/network-add-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/network-add-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/network-add-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-networks/network-add-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/network-add-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/network-add-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/network-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-networks/network-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/network-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/network-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/network-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-networks/network-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/network-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/network-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/network-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-networks/network-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/network-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/network-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/network-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-networks/network-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/network-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/network-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/network-show-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-networks/network-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/network-show-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/network-show-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/network-show-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-networks/network-show-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/network-show-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/network-show-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/networks-disassociate-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-networks/networks-disassociate-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/networks-disassociate-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/networks-disassociate-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/networks-disassociate-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-networks/networks-disassociate-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/networks-disassociate-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/networks-disassociate-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/networks-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-networks/networks-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/networks-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/networks-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-networks/networks-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-networks/networks-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-networks/networks-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-networks/networks-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.json.tpl b/nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.json.tpl rename to nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.json.tpl diff --git a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml.tpl b/nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-sets/quotas-show-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-show-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-sets/quotas-show-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-show-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-sets/quotas-update-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-update-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-sets/quotas-update-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-update-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-sets/quotas-update-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-update-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-sets/quotas-update-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-update-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-quota-sets/quotas-update-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-update-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-quota-sets/quotas-update-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-quota-sets/quotas-update-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.xml.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-get-resp-rescue.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-get-resp-rescue.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-rescue-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-rescue-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-rescue-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-rescue-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-rescue-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-rescue-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-rescue-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-rescue-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-rescue.json.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-rescue.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-rescue.json.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-rescue.json.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-rescue.xml.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-rescue.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-rescue.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-rescue.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-unrescue-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-unrescue-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-unrescue-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-unrescue-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-rescue/server-unrescue-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-rescue/server-unrescue-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-rescue/server-unrescue-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-rescue/server-unrescue-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-group-add-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-group-add-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-group-add-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-group-add-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-group-add-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-group-add-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-group-add-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-group-add-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-group-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-group-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-group-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-group-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-group-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-group-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-group-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-group-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-group-remove-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-group-remove-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-group-remove-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-group-remove-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-group-remove-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-group-remove-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-group-remove-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-group-remove-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-groups-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-groups-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-groups-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-groups-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-groups-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-groups-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-groups-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-groups-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/security-groups-list-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-list-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/security-groups-list-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/security-groups-list-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-security-groups/server-security-groups-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-security-groups/server-security-groups-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-security-groups/server-security-groups-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-security-groups/server-security-groups-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-diagnostics/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-diagnostics/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-diagnostics/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-diagnostics/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-diagnostics/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-diagnostics/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-diagnostics/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-diagnostics/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-diagnostics/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-external-events/event-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-external-events/event-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-external-events/event-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-external-events/event-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-external-events/event-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-external-events/event-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-external-events/event-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-external-events/event-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-external-events/event-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-external-events/event-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-external-events/event-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-external-events/event-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-external-events/event-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-external-events/event-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-external-events/event-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-external-events/event-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-external-events/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-external-events/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-external-events/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-external-events/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-external-events/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-external-events/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-external-events/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-external-events/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-external-events/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-external-events/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-external-events/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-external-events/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-external-events/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-external-events/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-external-events/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-external-events/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/limit-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/limit-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/limit-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/limit-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/limit-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/limit-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/limit-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/limit-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-show-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-show-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-show-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-show-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quotas-show-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-show-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quotas-show-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-show-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quotas-show-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-show-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quotas-show-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-show-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quotas-update-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-update-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quotas-update-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-update-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quotas-update-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-update-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quotas-update-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-update-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quotas-update-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-update-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quotas-update-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-update-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/quotas-update-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-update-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/quotas-update-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/quotas-update-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/usedlimits-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/usedlimits-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/usedlimits-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/usedlimits-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-group-quotas/usedlimits-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-group-quotas/usedlimits-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-group-quotas/usedlimits-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-group-quotas/usedlimits-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-groups/server-groups-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-groups/server-groups-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-groups/server-groups-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-groups/server-groups-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-groups/server-groups-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-groups/server-groups-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-groups/server-groups-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-groups/server-groups-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-groups/server-groups-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-groups/server-groups-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-groups/server-groups-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-groups/server-groups-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-groups/server-groups-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-groups/server-groups-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-groups/server-groups-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-groups/server-groups-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-groups/server-groups-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-list-multi-status/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-list-multi-status/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-list-multi-status/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-list-multi-status/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-list-multi-status/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-list-multi-status/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-list-multi-status/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-list-multi-status/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-list-multi-status/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-list-multi-status/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-list-multi-status/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-list-multi-status/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-list-multi-status/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-list-multi-status/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-list-multi-status/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-list-multi-status/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-list-multi-status/servers-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-list-multi-status/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-list-multi-status/servers-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-list-multi-status/servers-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-list-multi-status/servers-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-list-multi-status/servers-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-list-multi-status/servers-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-list-multi-status/servers-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-password/get-password-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-password/get-password-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-password/get-password-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-password/get-password-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-password/get-password-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-password/get-password-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-password/get-password-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-password/get-password-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-password/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-password/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-password/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-password/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-password/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-password/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-password/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-password/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-password/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-password/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-password/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-password/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-password/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-password/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-password/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-password/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-start-stop/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-start-stop/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-start-stop/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-start-stop/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-start-stop/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-start-stop/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-start-stop/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-start-stop/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-start-stop/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-start-stop/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-start-stop/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-start-stop/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-start-stop/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-start-stop/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-start-stop/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-start-stop/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-server-start-stop/server_start_stop.json.tpl b/nova/tests/unit/integrated/api_samples/os-server-start-stop/server_start_stop.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-start-stop/server_start_stop.json.tpl rename to nova/tests/unit/integrated/api_samples/os-server-start-stop/server_start_stop.json.tpl diff --git a/nova/tests/integrated/api_samples/os-server-start-stop/server_start_stop.xml.tpl b/nova/tests/unit/integrated/api_samples/os-server-start-stop/server_start_stop.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-server-start-stop/server_start_stop.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-server-start-stop/server_start_stop.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-disable-log-put-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-disable-log-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-disable-log-put-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-disable-log-put-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-disable-log-put-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-disable-log-put-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-disable-log-put-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-disable-log-put-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-disable-log-put-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-disable-log-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-disable-log-put-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-disable-log-put-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-disable-log-put-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-disable-log-put-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-disable-log-put-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-disable-log-put-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-disable-put-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-disable-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-disable-put-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-disable-put-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-disable-put-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-disable-put-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-disable-put-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-disable-put-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-disable-put-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-disable-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-disable-put-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-disable-put-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-disable-put-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-disable-put-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-disable-put-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-disable-put-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-enable-put-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-enable-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-enable-put-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-enable-put-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-enable-put-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-enable-put-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-enable-put-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-enable-put-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-enable-put-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-enable-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-enable-put-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-enable-put-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-services/service-enable-put-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-services/service-enable-put-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/service-enable-put-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-services/service-enable-put-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-services/services-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-services/services-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/services-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-services/services-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-services/services-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-services/services-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/services-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-services/services-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-services/services-list-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-services/services-list-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/services-list-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-services/services-list-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-services/services-list-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-services/services-list-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-services/services-list-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-services/services-list-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-shelve/os-shelve-offload.json.tpl b/nova/tests/unit/integrated/api_samples/os-shelve/os-shelve-offload.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-shelve/os-shelve-offload.json.tpl rename to nova/tests/unit/integrated/api_samples/os-shelve/os-shelve-offload.json.tpl diff --git a/nova/tests/integrated/api_samples/os-shelve/os-shelve-offload.xml.tpl b/nova/tests/unit/integrated/api_samples/os-shelve/os-shelve-offload.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-shelve/os-shelve-offload.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-shelve/os-shelve-offload.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-shelve/os-shelve.json.tpl b/nova/tests/unit/integrated/api_samples/os-shelve/os-shelve.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-shelve/os-shelve.json.tpl rename to nova/tests/unit/integrated/api_samples/os-shelve/os-shelve.json.tpl diff --git a/nova/tests/integrated/api_samples/os-shelve/os-shelve.xml.tpl b/nova/tests/unit/integrated/api_samples/os-shelve/os-shelve.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-shelve/os-shelve.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-shelve/os-shelve.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-shelve/os-unshelve.json.tpl b/nova/tests/unit/integrated/api_samples/os-shelve/os-unshelve.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-shelve/os-unshelve.json.tpl rename to nova/tests/unit/integrated/api_samples/os-shelve/os-unshelve.json.tpl diff --git a/nova/tests/integrated/api_samples/os-shelve/os-unshelve.xml.tpl b/nova/tests/unit/integrated/api_samples/os-shelve/os-unshelve.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-shelve/os-unshelve.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-shelve/os-unshelve.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-shelve/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-shelve/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-shelve/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-shelve/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-shelve/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-shelve/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-shelve/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-shelve/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-shelve/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-shelve/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-shelve/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-shelve/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-shelve/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-shelve/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-shelve/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-shelve/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-simple-tenant-usage/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-simple-tenant-usage/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-simple-tenant-usage/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl b/nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl rename to nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl b/nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl b/nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl rename to nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl b/nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-tenant-networks/networks-list-res.json.tpl b/nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-list-res.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-tenant-networks/networks-list-res.json.tpl rename to nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-list-res.json.tpl diff --git a/nova/tests/integrated/api_samples/os-tenant-networks/networks-list-res.xml.tpl b/nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-list-res.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-tenant-networks/networks-list-res.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-list-res.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-tenant-networks/networks-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-tenant-networks/networks-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-tenant-networks/networks-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-tenant-networks/networks-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-tenant-networks/networks-post-res.json.tpl b/nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-post-res.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-tenant-networks/networks-post-res.json.tpl rename to nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-post-res.json.tpl diff --git a/nova/tests/integrated/api_samples/os-tenant-networks/networks-post-res.xml.tpl b/nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-post-res.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-tenant-networks/networks-post-res.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-tenant-networks/networks-post-res.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-user-data/userdata-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-user-data/userdata-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-user-data/userdata-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-user-data/userdata-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-user-data/userdata-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-user-data/userdata-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-user-data/userdata-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-user-data/userdata-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-user-data/userdata-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-user-data/userdata-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-user-data/userdata-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-user-data/userdata-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-user-data/userdata-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-user-data/userdata-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-user-data/userdata-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-user-data/userdata-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-user-quotas/user-quotas-show-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-show-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-user-quotas/user-quotas-show-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-show-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-user-quotas/user-quotas-show-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-show-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-user-quotas/user-quotas-show-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-show-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-user-quotas/user-quotas-update-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-update-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-user-quotas/user-quotas-update-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-update-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-user-quotas/user-quotas-update-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-update-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-user-quotas/user-quotas-update-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-update-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-user-quotas/user-quotas-update-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-update-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-user-quotas/user-quotas-update-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-update-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-user-quotas/user-quotas-update-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-update-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-user-quotas/user-quotas-update-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-user-quotas/user-quotas-update-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-virtual-interfaces/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-virtual-interfaces/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-virtual-interfaces/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-virtual-interfaces/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-virtual-interfaces/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-virtual-interfaces/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-virtual-interfaces/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-virtual-interfaces/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volume-attachment-update/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-volume-attachment-update/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volume-attachment-update/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volume-attachment-update/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volume-attachment-update/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volume-attachment-update/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volume-attachment-update/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volume-attachment-update/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volume-attachment-update/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volume-attachment-update/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volume-attachment-update/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volume-attachment-update/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volume-attachment-update/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volume-attachment-update/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volume-attachment-update/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volume-attachment-update/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volume-attachment-update/update-volume-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-volume-attachment-update/update-volume-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volume-attachment-update/update-volume-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volume-attachment-update/update-volume-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volume-attachment-update/update-volume-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volume-attachment-update/update-volume-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volume-attachment-update/update-volume-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volume-attachment-update/update-volume-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/attach-volume-to-server-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/attach-volume-to-server-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/attach-volume-to-server-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/attach-volume-to-server-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/attach-volume-to-server-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/attach-volume-to-server-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/attach-volume-to-server-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/attach-volume-to-server-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/attach-volume-to-server-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/attach-volume-to-server-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/attach-volume-to-server-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/attach-volume-to-server-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/attach-volume-to-server-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/attach-volume-to-server-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/attach-volume-to-server-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/attach-volume-to-server-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/list-volume-attachments-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/list-volume-attachments-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/list-volume-attachments-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/list-volume-attachments-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/list-volume-attachments-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/list-volume-attachments-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/list-volume-attachments-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/list-volume-attachments-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/os-volumes-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/os-volumes-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/os-volumes-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/os-volumes-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/os-volumes-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/os-volumes-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/os-volumes-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/os-volumes-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/os-volumes-index-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-index-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/os-volumes-index-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-index-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/os-volumes-index-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-index-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/os-volumes-index-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-index-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/os-volumes-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/os-volumes-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/os-volumes-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/os-volumes-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/os-volumes-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/os-volumes-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/os-volumes-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/os-volumes-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/os-volumes-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshot-create-req.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/snapshot-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/snapshot-create-req.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/snapshot-create-req.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshot-create-req.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/snapshot-create-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/snapshot-create-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/snapshot-create-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/snapshot-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/snapshot-create-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/snapshot-create-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/snapshot-create-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshots-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/snapshots-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/snapshots-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/snapshots-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshots-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/snapshots-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/snapshots-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/snapshots-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshots-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/snapshots-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/snapshots-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/snapshots-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshots-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/snapshots-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/snapshots-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/snapshots-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshots-show-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/snapshots-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/snapshots-show-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/snapshots-show-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshots-show-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/snapshots-show-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/snapshots-show-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/snapshots-show-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/volume-attachment-detail-resp.json.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/volume-attachment-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/volume-attachment-detail-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/volume-attachment-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-volumes/volume-attachment-detail-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/os-volumes/volume-attachment-detail-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-volumes/volume-attachment-detail-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/os-volumes/volume-attachment-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-action-changepassword.json.tpl b/nova/tests/unit/integrated/api_samples/server-action-changepassword.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-changepassword.json.tpl rename to nova/tests/unit/integrated/api_samples/server-action-changepassword.json.tpl diff --git a/nova/tests/integrated/api_samples/server-action-changepassword.xml.tpl b/nova/tests/unit/integrated/api_samples/server-action-changepassword.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-changepassword.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-action-changepassword.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-action-confirmresize.json.tpl b/nova/tests/unit/integrated/api_samples/server-action-confirmresize.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-confirmresize.json.tpl rename to nova/tests/unit/integrated/api_samples/server-action-confirmresize.json.tpl diff --git a/nova/tests/integrated/api_samples/server-action-confirmresize.xml.tpl b/nova/tests/unit/integrated/api_samples/server-action-confirmresize.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-confirmresize.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-action-confirmresize.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-action-createimage.json.tpl b/nova/tests/unit/integrated/api_samples/server-action-createimage.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-createimage.json.tpl rename to nova/tests/unit/integrated/api_samples/server-action-createimage.json.tpl diff --git a/nova/tests/integrated/api_samples/server-action-createimage.xml.tpl b/nova/tests/unit/integrated/api_samples/server-action-createimage.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-createimage.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-action-createimage.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-action-reboot.json.tpl b/nova/tests/unit/integrated/api_samples/server-action-reboot.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-reboot.json.tpl rename to nova/tests/unit/integrated/api_samples/server-action-reboot.json.tpl diff --git a/nova/tests/integrated/api_samples/server-action-reboot.xml.tpl b/nova/tests/unit/integrated/api_samples/server-action-reboot.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-reboot.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-action-reboot.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl b/nova/tests/unit/integrated/api_samples/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/server-action-rebuild-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/server-action-rebuild-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-rebuild-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-action-rebuild-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-action-rebuild.json.tpl b/nova/tests/unit/integrated/api_samples/server-action-rebuild.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-rebuild.json.tpl rename to nova/tests/unit/integrated/api_samples/server-action-rebuild.json.tpl diff --git a/nova/tests/integrated/api_samples/server-action-rebuild.xml.tpl b/nova/tests/unit/integrated/api_samples/server-action-rebuild.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-rebuild.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-action-rebuild.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-action-resize.json.tpl b/nova/tests/unit/integrated/api_samples/server-action-resize.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-resize.json.tpl rename to nova/tests/unit/integrated/api_samples/server-action-resize.json.tpl diff --git a/nova/tests/integrated/api_samples/server-action-resize.xml.tpl b/nova/tests/unit/integrated/api_samples/server-action-resize.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-resize.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-action-resize.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-action-revertresize.json.tpl b/nova/tests/unit/integrated/api_samples/server-action-revertresize.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-revertresize.json.tpl rename to nova/tests/unit/integrated/api_samples/server-action-revertresize.json.tpl diff --git a/nova/tests/integrated/api_samples/server-action-revertresize.xml.tpl b/nova/tests/unit/integrated/api_samples/server-action-revertresize.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-action-revertresize.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-action-revertresize.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/server-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/server-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-ips-network-resp.json.tpl b/nova/tests/unit/integrated/api_samples/server-ips-network-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-ips-network-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/server-ips-network-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/server-ips-network-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/server-ips-network-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-ips-network-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-ips-network-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-ips-resp.json.tpl b/nova/tests/unit/integrated/api_samples/server-ips-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-ips-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/server-ips-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/server-ips-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/server-ips-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-ips-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-ips-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-metadata-all-req.json.tpl b/nova/tests/unit/integrated/api_samples/server-metadata-all-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-metadata-all-req.json.tpl rename to nova/tests/unit/integrated/api_samples/server-metadata-all-req.json.tpl diff --git a/nova/tests/integrated/api_samples/server-metadata-all-req.xml.tpl b/nova/tests/unit/integrated/api_samples/server-metadata-all-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-metadata-all-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-metadata-all-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-metadata-all-resp.json.tpl b/nova/tests/unit/integrated/api_samples/server-metadata-all-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-metadata-all-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/server-metadata-all-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/server-metadata-all-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/server-metadata-all-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-metadata-all-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-metadata-all-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-metadata-req.json.tpl b/nova/tests/unit/integrated/api_samples/server-metadata-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-metadata-req.json.tpl rename to nova/tests/unit/integrated/api_samples/server-metadata-req.json.tpl diff --git a/nova/tests/integrated/api_samples/server-metadata-req.xml.tpl b/nova/tests/unit/integrated/api_samples/server-metadata-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-metadata-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-metadata-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-metadata-resp.json.tpl b/nova/tests/unit/integrated/api_samples/server-metadata-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-metadata-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/server-metadata-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/server-metadata-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/server-metadata-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-metadata-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-metadata-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-post-req.json.tpl b/nova/tests/unit/integrated/api_samples/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-post-req.json.tpl rename to nova/tests/unit/integrated/api_samples/server-post-req.json.tpl diff --git a/nova/tests/integrated/api_samples/server-post-req.xml.tpl b/nova/tests/unit/integrated/api_samples/server-post-req.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-post-req.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-post-req.xml.tpl diff --git a/nova/tests/integrated/api_samples/server-post-resp.json.tpl b/nova/tests/unit/integrated/api_samples/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-post-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/server-post-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/server-post-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/server-post-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/server-post-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/server-post-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/servers-details-resp.json.tpl b/nova/tests/unit/integrated/api_samples/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/servers-details-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/servers-details-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/servers-details-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/servers-details-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/servers-details-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/servers-list-resp.json.tpl b/nova/tests/unit/integrated/api_samples/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/servers-list-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/servers-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/servers-list-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/servers-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/servers-list-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/servers-list-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/versions-get-resp.json.tpl b/nova/tests/unit/integrated/api_samples/versions-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/versions-get-resp.json.tpl rename to nova/tests/unit/integrated/api_samples/versions-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/versions-get-resp.xml.tpl b/nova/tests/unit/integrated/api_samples/versions-get-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/versions-get-resp.xml.tpl rename to nova/tests/unit/integrated/api_samples/versions-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples_test_base.py b/nova/tests/unit/integrated/api_samples_test_base.py similarity index 99% rename from nova/tests/integrated/api_samples_test_base.py rename to nova/tests/unit/integrated/api_samples_test_base.py index ea1884f91dd7..69f5f3eb2bd1 100644 --- a/nova/tests/integrated/api_samples_test_base.py +++ b/nova/tests/unit/integrated/api_samples_test_base.py @@ -23,7 +23,7 @@ import six from nova.i18n import _ from nova import test -from nova.tests.integrated import integrated_helpers +from nova.tests.unit.integrated import integrated_helpers class NoMatch(test.TestingException): @@ -88,7 +88,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): @classmethod def _get_sample(cls, name): dirname = os.path.dirname(os.path.abspath(__file__)) - dirname = os.path.normpath(os.path.join(dirname, "../../../doc")) + dirname = os.path.normpath(os.path.join(dirname, "../../../../doc")) return cls._get_sample_path(name, dirname) @classmethod diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/unit/integrated/integrated_helpers.py similarity index 94% rename from nova/tests/integrated/integrated_helpers.py rename to nova/tests/unit/integrated/integrated_helpers.py index 846066458344..e62d84f6428c 100644 --- a/nova/tests/integrated/integrated_helpers.py +++ b/nova/tests/unit/integrated/integrated_helpers.py @@ -27,10 +27,10 @@ import nova.image.glance from nova.openstack.common import log as logging from nova import service from nova import test -from nova.tests import cast_as_call -from nova.tests import fake_crypto -import nova.tests.image.fake -from nova.tests.integrated.api import client +from nova.tests.unit import cast_as_call +from nova.tests.unit import fake_crypto +import nova.tests.unit.image.fake +from nova.tests.unit.integrated.api import client CONF = cfg.CONF @@ -73,7 +73,7 @@ class _IntegratedTestBase(test.TestCase): self.flags(verbose=True) self.useFixture(test.ReplaceModule('crypto', fake_crypto)) - nova.tests.image.fake.stub_out_image_service(self.stubs) + nova.tests.unit.image.fake.stub_out_image_service(self.stubs) self.flags(scheduler_driver='nova.scheduler.' 'chance.ChanceScheduler') self._setup_services() @@ -95,7 +95,7 @@ class _IntegratedTestBase(test.TestCase): def tearDown(self): self.osapi.stop() - nova.tests.image.fake.FakeImageService_reset() + nova.tests.unit.image.fake.FakeImageService_reset() super(_IntegratedTestBase, self).tearDown() def _get_test_client(self): diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/unit/integrated/test_api_samples.py similarity index 99% rename from nova/tests/integrated/test_api_samples.py rename to nova/tests/unit/integrated/test_api_samples.py index f195287f91d1..676c7ee0e944 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/unit/integrated/test_api_samples.py @@ -51,21 +51,21 @@ from nova.openstack.common import log as logging import nova.quota from nova.servicegroup import api as service_group_api from nova import test -from nova.tests.api.openstack.compute.contrib import test_fping -from nova.tests.api.openstack.compute.contrib import test_networks -from nova.tests.api.openstack.compute.contrib import test_services -from nova.tests.api.openstack import fakes -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests import fake_network -from nova.tests import fake_network_cache_model -from nova.tests import fake_server_actions -from nova.tests import fake_utils -from nova.tests.image import fake -from nova.tests.integrated import api_samples_test_base -from nova.tests.integrated import integrated_helpers -from nova.tests.objects import test_network -from nova.tests import utils as test_utils +from nova.tests.unit.api.openstack.compute.contrib import test_fping +from nova.tests.unit.api.openstack.compute.contrib import test_networks +from nova.tests.unit.api.openstack.compute.contrib import test_services +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_network +from nova.tests.unit import fake_network_cache_model +from nova.tests.unit import fake_server_actions +from nova.tests.unit import fake_utils +from nova.tests.unit.image import fake +from nova.tests.unit.integrated import api_samples_test_base +from nova.tests.unit.integrated import integrated_helpers +from nova.tests.unit.objects import test_network +from nova.tests.unit import utils as test_utils from nova import utils from nova.volume import cinder diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/unit/integrated/test_extensions.py similarity index 92% rename from nova/tests/integrated/test_extensions.py rename to nova/tests/unit/integrated/test_extensions.py index 5f3420f37a5e..927b51b45375 100644 --- a/nova/tests/integrated/test_extensions.py +++ b/nova/tests/unit/integrated/test_extensions.py @@ -17,7 +17,7 @@ from oslo.config import cfg # Import extensions to pull in osapi_compute_extension CONF option used below. from nova.openstack.common import log as logging -from nova.tests.integrated import integrated_helpers +from nova.tests.unit.integrated import integrated_helpers CONF = cfg.CONF LOG = logging.getLogger(__name__) @@ -30,7 +30,7 @@ class ExtensionsTest(integrated_helpers._IntegratedTestBase): f = super(ExtensionsTest, self)._get_flags() f['osapi_compute_extension'] = CONF.osapi_compute_extension[:] f['osapi_compute_extension'].append( - 'nova.tests.api.openstack.compute.extensions.' + 'nova.tests.unit.api.openstack.compute.extensions.' 'foxinsocks.Foxinsocks') return f diff --git a/nova/tests/integrated/test_login.py b/nova/tests/unit/integrated/test_login.py similarity index 91% rename from nova/tests/integrated/test_login.py rename to nova/tests/unit/integrated/test_login.py index 4fd22ea060b7..851282000d79 100644 --- a/nova/tests/integrated/test_login.py +++ b/nova/tests/unit/integrated/test_login.py @@ -15,8 +15,8 @@ from nova.openstack.common import log as logging -from nova.tests.integrated.api import client -from nova.tests.integrated import integrated_helpers +from nova.tests.unit.integrated.api import client +from nova.tests.unit.integrated import integrated_helpers LOG = logging.getLogger(__name__) diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/unit/integrated/test_servers.py similarity index 99% rename from nova/tests/integrated/test_servers.py rename to nova/tests/unit/integrated/test_servers.py index c821cd461113..97f80d781359 100644 --- a/nova/tests/integrated/test_servers.py +++ b/nova/tests/unit/integrated/test_servers.py @@ -22,9 +22,9 @@ from oslo.utils import timeutils from nova import context from nova import exception from nova.openstack.common import log as logging -from nova.tests import fake_network -from nova.tests.integrated.api import client -from nova.tests.integrated import integrated_helpers +from nova.tests.unit import fake_network +from nova.tests.unit.integrated.api import client +from nova.tests.unit.integrated import integrated_helpers import nova.virt.fake diff --git a/nova/tests/integrated/test_xml.py b/nova/tests/unit/integrated/test_xml.py similarity index 96% rename from nova/tests/integrated/test_xml.py rename to nova/tests/unit/integrated/test_xml.py index a61c86f750fa..822a1db88b6b 100644 --- a/nova/tests/integrated/test_xml.py +++ b/nova/tests/unit/integrated/test_xml.py @@ -18,7 +18,7 @@ from lxml import etree from nova.api.openstack import common from nova.api.openstack import xmlutil from nova.openstack.common import log as logging -from nova.tests.integrated import integrated_helpers +from nova.tests.unit.integrated import integrated_helpers LOG = logging.getLogger(__name__) diff --git a/nova/tests/integrated/v3/__init__.py b/nova/tests/unit/integrated/v3/__init__.py similarity index 100% rename from nova/tests/integrated/v3/__init__.py rename to nova/tests/unit/integrated/v3/__init__.py diff --git a/nova/tests/integrated/v3/api_sample_base.py b/nova/tests/unit/integrated/v3/api_sample_base.py similarity index 91% rename from nova/tests/integrated/v3/api_sample_base.py rename to nova/tests/unit/integrated/v3/api_sample_base.py index 56c0e8bee7d9..dad804328d98 100644 --- a/nova/tests/integrated/v3/api_sample_base.py +++ b/nova/tests/unit/integrated/v3/api_sample_base.py @@ -18,9 +18,9 @@ from oslo.config import cfg from nova.api.openstack import API_V3_CORE_EXTENSIONS # noqa from nova import test -from nova.tests import fake_network -from nova.tests import fake_utils -from nova.tests.integrated import api_samples_test_base +from nova.tests.unit import fake_network +from nova.tests.unit import fake_utils +from nova.tests.unit.integrated import api_samples_test_base CONF = cfg.CONF @@ -69,7 +69,8 @@ class ApiSampleTestBaseV3(api_samples_test_base.ApiSampleTestBase): @classmethod def _get_sample(cls, name): dirname = os.path.dirname(os.path.abspath(__file__)) - dirname = os.path.normpath(os.path.join(dirname, "../../../../doc/v3")) + dirname = os.path.normpath(os.path.join(dirname, + "../../../../../doc/v3")) return cls._get_sample_path(name, dirname) @classmethod diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/all_extensions/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/all_extensions/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/all_extensions/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/servers-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/all_extensions/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/all_extensions/servers-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/all_extensions/servers-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/consoles/consoles-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/consoles/consoles-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/consoles/consoles-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/consoles/consoles-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/consoles/consoles-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/consoles/consoles-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/consoles/consoles-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/consoles/consoles-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/consoles/consoles-list-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/consoles/consoles-list-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/consoles/consoles-list-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/consoles/consoles-list-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/consoles/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/consoles/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/consoles/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/consoles/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/consoles/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/consoles/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/consoles/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/consoles/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/extension-info/extensions-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/extension-info/extensions-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/extension-info/extensions-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/extension-info/extensions-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/extension-info/extensions-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/extension-info/extensions-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/extension-info/extensions-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/extension-info/extensions-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-access/flavor-access-show-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-manage/flavor-create-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-manage/flavor-create-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavors-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/flavors/flavors-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/flavors/flavors-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/flavors/flavors-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/image-size/image-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/image-size/image-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/image-size/image-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/image-size/image-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/image-size/images-details-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/image-size/images-details-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/image-size/images-details-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/image-size/images-details-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/image-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/image-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/image-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/image-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/image-meta-key-get.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/image-meta-key-get.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/image-meta-key-get.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/image-meta-key-get.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/image-meta-key-put-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/image-meta-key-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/image-meta-key-put-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/image-meta-key-put-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/image-meta-key-put-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/image-meta-key-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/image-meta-key-put-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/image-meta-key-put-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/image-metadata-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/image-metadata-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/image-metadata-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/image-metadata-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/image-metadata-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/image-metadata-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/image-metadata-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/image-metadata-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/image-metadata-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/image-metadata-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/image-metadata-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/image-metadata-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/image-metadata-put-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/image-metadata-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/image-metadata-put-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/image-metadata-put-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/image-metadata-put-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/image-metadata-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/image-metadata-put-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/image-metadata-put-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/images-details-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/images-details-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/images-details-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/images-details-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/images/images-list-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/images/images-list-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/images/images-list-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/images/images-list-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/keypairs/keypairs-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/keypairs/keypairs-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/keypairs/keypairs-import-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-import-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/keypairs/keypairs-import-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-import-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/keypairs/keypairs-import-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-import-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/keypairs/keypairs-import-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-import-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/keypairs/keypairs-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/keypairs/keypairs-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/keypairs/keypairs-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/keypairs/keypairs-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/keypairs/keypairs-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/keypairs/keypairs-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/keypairs/keypairs-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/servers-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-access-ips/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-access-ips/servers-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-access-ips/servers-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-admin-actions/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-admin-actions/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-admin-actions/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-admin-actions/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-admin-password/admin-password-change-password.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-admin-password/admin-password-change-password.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-admin-password/admin-password-change-password.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-admin-password/admin-password-change-password.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-admin-password/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-admin-password/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-admin-password/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-admin-password/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-admin-password/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-admin-password/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-admin-password/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-admin-password/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-agents/agent-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-agents/agent-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-agents/agent-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-agents/agent-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-agents/agent-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-agents/agent-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-agents/agent-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-agents/agent-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-agents/agent-update-put-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-agents/agent-update-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-agents/agent-update-put-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-agents/agent-update-put-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-agents/agent-update-put-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-agents/agent-update-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-agents/agent-update-put-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-agents/agent-update-put-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-agents/agents-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-agents/agents-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-agents/agents-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-agents/agents-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-update-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-update-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-attach-interfaces/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-availability-zone/availability-zone-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-availability-zone/availability-zone-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-availability-zone/availability-zone-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-availability-zone/availability-zone-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-availability-zone/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-availability-zone/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-availability-zone/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-availability-zone/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-availability-zone/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-availability-zone/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-availability-zone/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-availability-zone/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-cells/cells-capacities-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-cells/cells-capacities-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-cells/cells-capacities-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-cells/cells-capacities-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-cells/cells-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-cells/cells-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-cells/cells-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-cells/cells-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-cells/cells-list-empty-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-cells/cells-list-empty-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-cells/cells-list-empty-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-cells/cells-list-empty-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-cells/cells-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-cells/cells-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-cells/cells-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-cells/cells-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-certificates/certificate-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-certificates/certificate-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-certificates/certificate-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-certificates/certificate-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-certificates/certificate-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-certificates/certificate-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-certificates/certificate-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-certificates/certificate-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-certificates/certificate-get-root-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-certificates/certificate-get-root-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-certificates/certificate-get-root-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-certificates/certificate-get-root-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-config-drive/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-config-drive/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-config-drive/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-config-drive/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-config-drive/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-config-drive/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-console-auth-tokens/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-console-auth-tokens/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-console-auth-tokens/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-console-auth-tokens/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-console-auth-tokens/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-console-auth-tokens/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-console-auth-tokens/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-console-auth-tokens/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-console-output/console-output-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-console-output/console-output-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-console-output/console-output-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-console-output/console-output-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-console-output/console-output-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-console-output/console-output-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-console-output/console-output-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-console-output/console-output-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-console-output/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-console-output/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-console-output/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-console-output/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-console-output/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-console-output/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-console-output/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-console-output/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-create-backup/create-backup-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-create-backup/create-backup-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-create-backup/create-backup-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-create-backup/create-backup-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-create-backup/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-create-backup/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-create-backup/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-create-backup/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-create-backup/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-create-backup/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-create-backup/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-create-backup/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-deferred-delete/force-delete-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-deferred-delete/force-delete-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-deferred-delete/force-delete-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-deferred-delete/force-delete-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-deferred-delete/restore-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-deferred-delete/restore-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-deferred-delete/restore-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-deferred-delete/restore-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-deferred-delete/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-deferred-delete/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-deferred-delete/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-deferred-delete/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/image-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/image-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/image-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/image-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/image-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/image-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/image-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/image-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-resize-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-resize-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/server-resize-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-resize-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-update-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-update-put-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-evacuate/server-evacuate-find-host-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-evacuate-find-host-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-evacuate/server-evacuate-find-host-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-evacuate-find-host-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-evacuate/server-evacuate-find-host-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-evacuate-find-host-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-evacuate/server-evacuate-find-host-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-evacuate-find-host-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-evacuate/server-evacuate-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-evacuate-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-evacuate/server-evacuate-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-evacuate-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-evacuate/server-evacuate-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-evacuate-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-evacuate/server-evacuate-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-evacuate-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-evacuate/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-evacuate/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-evacuate/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-evacuate/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-evacuate/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-availability-zone/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-availability-zone/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-server-attributes/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-server-attributes/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-status/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-status/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-status/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-status/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-status/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-status/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/attach-volume-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/attach-volume-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-volumes/attach-volume-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/attach-volume-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/detach-volume-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/detach-volume-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-volumes/detach-volume-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/detach-volume-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/swap-volume-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/swap-volume-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-extended-volumes/swap-volume-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-extended-volumes/swap-volume-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-fixed-ips/fixedip-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-fixed-ips/fixedip-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-fixed-ips/fixedip-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-fixed-ips/fixedip-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-fping/fping-get-details-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-fping/fping-get-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-fping/fping-get-details-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-fping/fping-get-details-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-fping/fping-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-fping/fping-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-fping/fping-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-fping/fping-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-fping/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-fping/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-fping/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-fping/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-fping/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-fping/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-fping/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-fping/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hide-server-addresses/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hide-server-addresses/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hosts/host-get-reboot.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hosts/host-get-reboot.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hosts/host-get-reboot.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hosts/host-get-reboot.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hosts/host-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hosts/host-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hosts/host-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hosts/host-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hosts/host-get-shutdown.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hosts/host-get-shutdown.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hosts/host-get-shutdown.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hosts/host-get-shutdown.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hosts/host-get-startup.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hosts/host-get-startup.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hosts/host-get-startup.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hosts/host-get-startup.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hosts/host-put-maintenance-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hosts/host-put-maintenance-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hosts/host-put-maintenance-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hosts/host-put-maintenance-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hosts/host-put-maintenance-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hosts/host-put-maintenance-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hosts/host-put-maintenance-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hosts/host-put-maintenance-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hosts/hosts-list-compute-service-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hosts/hosts-list-compute-service-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hosts/hosts-list-compute-service-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hosts/hosts-list-compute-service-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hosts/hosts-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hosts/hosts-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hosts/hosts-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hosts/hosts-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-servers-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-servers-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-servers-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-servers-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-instance-actions/instance-action-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-instance-actions/instance-action-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-instance-actions/instance-action-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-instance-actions/instance-action-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-instance-actions/instance-instance-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-instance-actions/instance-instance-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-instance-actions/instance-instance-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-instance-actions/instance-instance-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-lock-server/lock-server.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-lock-server/lock-server.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-lock-server/lock-server.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-lock-server/lock-server.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-lock-server/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-lock-server/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-lock-server/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-lock-server/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-lock-server/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-lock-server/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-lock-server/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-lock-server/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-lock-server/unlock-server.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-lock-server/unlock-server.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-lock-server/unlock-server.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-lock-server/unlock-server.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-migrate-server/live-migrate-server.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-migrate-server/live-migrate-server.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-migrate-server/live-migrate-server.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-migrate-server/live-migrate-server.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-migrate-server/migrate-server.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-migrate-server/migrate-server.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-migrate-server/migrate-server.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-migrate-server/migrate-server.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-migrate-server/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-migrate-server/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-migrate-server/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-migrate-server/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-migrate-server/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-migrate-server/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-migrate-server/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-migrate-server/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-migrations/migrations-get.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-migrations/migrations-get.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-migrations/migrations-get.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-migrations/migrations-get.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-multinic/multinic-add-fixed-ip-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-multinic/multinic-add-fixed-ip-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-multinic/multinic-add-fixed-ip-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-multinic/multinic-add-fixed-ip-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-multinic/multinic-remove-fixed-ip-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-multinic/multinic-remove-fixed-ip-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-multinic/multinic-remove-fixed-ip-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-multinic/multinic-remove-fixed-ip-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-multinic/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-multinic/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-multinic/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-multinic/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-multinic/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-multinic/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-multinic/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-multinic/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-multiple-create/multiple-create-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-multiple-create/multiple-create-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-multiple-create/multiple-create-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-multiple-create/multiple-create-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-networks-associate/network-associate-host-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-networks-associate/network-associate-host-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-networks-associate/network-associate-host-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-networks-associate/network-associate-host-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-networks-associate/network-disassociate-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-networks-associate/network-disassociate-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-networks-associate/network-disassociate-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-networks-associate/network-disassociate-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-networks/network-add-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-networks/network-add-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-networks/network-add-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-networks/network-add-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-networks/network-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-networks/network-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-networks/network-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-networks/network-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-networks/network-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-networks/network-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-networks/network-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-networks/network-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-networks/network-show-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-networks/network-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-networks/network-show-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-networks/network-show-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-networks/networks-disassociate-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-networks/networks-disassociate-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-networks/networks-disassociate-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-networks/networks-disassociate-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-networks/networks-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-networks/networks-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-networks/networks-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-networks/networks-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pause-server/pause-server.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pause-server/pause-server.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pause-server/pause-server.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pause-server/pause-server.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pause-server/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pause-server/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pause-server/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pause-server/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pause-server/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pause-server/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pause-server/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pause-server/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pause-server/unpause-server.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pause-server/unpause-server.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pause-server/unpause-server.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pause-server/unpause-server.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pci/hypervisors-pci-show-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pci/hypervisors-pci-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pci/hypervisors-pci-show-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pci/hypervisors-pci-show-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pci/pci-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pci/pci-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pci/pci-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pci/pci-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pci/pci-index-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pci/pci-index-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pci/pci-index-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pci/pci-index-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pci/pci-show-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pci/pci-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pci/pci-show-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pci/pci-show-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pci/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pci/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pci/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pci/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pci/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pci/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pci/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pci/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-update-force-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-update-force-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-update-force-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-update-force-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-update-force-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-update-force-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-update-force-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-update-force-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-update-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-update-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-update-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-update-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-quota-sets/user-quotas-update-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-quota-sets/user-quotas-update-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-quota-sets/user-quotas-update-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-quota-sets/user-quotas-update-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/get-rdp-console-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-rdp-console-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-remote-consoles/get-rdp-console-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-rdp-console-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/get-rdp-console-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-rdp-console-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-remote-consoles/get-rdp-console-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-rdp-console-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/get-serial-console-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-serial-console-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-remote-consoles/get-serial-console-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-serial-console-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/get-serial-console-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-serial-console-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-remote-consoles/get-serial-console-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-serial-console-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/get-spice-console-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-spice-console-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-remote-consoles/get-spice-console-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-spice-console-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/get-spice-console-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-spice-console-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-remote-consoles/get-spice-console-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-spice-console-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/get-vnc-console-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-vnc-console-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-remote-consoles/get-vnc-console-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-vnc-console-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/get-vnc-console-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-vnc-console-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-remote-consoles/get-vnc-console-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/get-vnc-console-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-remote-consoles/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-rescue/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-rescue/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-rescue/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-rescue/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-rescue/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-rescue/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-rescue-req-with-image-ref.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-rescue/server-rescue-req-with-image-ref.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-rescue/server-rescue-req-with-image-ref.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-rescue/server-rescue-req-with-image-ref.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-rescue-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-rescue/server-rescue-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-rescue/server-rescue-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-rescue/server-rescue-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-rescue.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-rescue/server-rescue.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-rescue/server-rescue.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-rescue/server-rescue.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-unrescue-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-rescue/server-unrescue-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-rescue/server-unrescue-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-rescue/server-unrescue-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/security-group-add-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-group-add-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/security-group-add-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-group-add-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/security-group-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-group-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/security-group-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-group-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/security-group-remove-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-group-remove-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/security-group-remove-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-group-remove-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/security-groups-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-groups-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/security-groups-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-groups-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/security-groups-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-groups-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/security-groups-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-groups-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-diagnostics/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-diagnostics/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-diagnostics/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-diagnostics/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-external-events/event-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-external-events/event-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-external-events/event-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-external-events/event-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-external-events/event-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-external-events/event-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-external-events/event-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-external-events/event-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-external-events/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-external-events/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-external-events/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-external-events/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-external-events/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-external-events/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-external-events/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-external-events/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-groups/server-groups-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-groups/server-groups-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-groups/server-groups-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-groups/server-groups-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-groups/server-groups-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-groups/server-groups-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-groups/server-groups-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-groups/server-groups-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-groups/server-groups-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-groups/server-groups-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-groups/server-groups-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-groups/server-groups-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-groups/server-groups-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-groups/server-groups-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-groups/server-groups-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-groups/server-groups-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-usage/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-usage/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-usage/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-usage/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-usage/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-usage/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-services/service-disable-log-put-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-services/service-disable-log-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-services/service-disable-log-put-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-services/service-disable-log-put-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-services/service-disable-log-put-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-services/service-disable-log-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-services/service-disable-log-put-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-services/service-disable-log-put-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-services/service-disable-put-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-services/service-disable-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-services/service-disable-put-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-services/service-disable-put-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-services/service-disable-put-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-services/service-disable-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-services/service-disable-put-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-services/service-disable-put-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-services/service-enable-put-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-services/service-enable-put-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-services/service-enable-put-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-services/service-enable-put-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-services/service-enable-put-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-services/service-enable-put-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-services/service-enable-put-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-services/service-enable-put-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-services/services-list-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-services/services-list-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-services/services-list-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-services/services-list-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-shelve/os-shelve-offload.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-shelve/os-shelve-offload.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-shelve/os-shelve-offload.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-shelve/os-shelve-offload.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-shelve/os-shelve.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-shelve/os-shelve.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-shelve/os-shelve.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-shelve/os-shelve.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-shelve/os-unshelve.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-shelve/os-unshelve.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-shelve/os-unshelve.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-shelve/os-unshelve.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-shelve/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-shelve/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-shelve/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-shelve/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-shelve/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-shelve/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-shelve/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-shelve/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-simple-tenant-usage/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-simple-tenant-usage/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-suspend-server/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-suspend-server/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-suspend-server/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-suspend-server/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-suspend-server/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-suspend-server/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-suspend-server/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-suspend-server/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-suspend-server/server-resume.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-suspend-server/server-resume.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-suspend-server/server-resume.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-suspend-server/server-resume.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-suspend-server/server-suspend.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-suspend-server/server-suspend.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-suspend-server/server-suspend.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-suspend-server/server-suspend.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-tenant-networks/networks-list-res.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-tenant-networks/networks-list-res.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-tenant-networks/networks-list-res.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-tenant-networks/networks-list-res.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-tenant-networks/networks-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-tenant-networks/networks-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-tenant-networks/networks-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-tenant-networks/networks-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-tenant-networks/networks-post-res.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-tenant-networks/networks-post-res.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-tenant-networks/networks-post-res.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-tenant-networks/networks-post-res.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-used-limits/usedlimits-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-used-limits/usedlimits-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-used-limits/usedlimits-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-used-limits/usedlimits-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-user-data/userdata-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-user-data/userdata-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-user-data/userdata-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-user-data/userdata-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/os-volumes-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/os-volumes-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/os-volumes-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/os-volumes-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/os-volumes-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/os-volumes-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/os-volumes-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/os-volumes-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/os-volumes-index-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/os-volumes-index-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/os-volumes-index-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/os-volumes-index-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/os-volumes-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/os-volumes-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/os-volumes-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/os-volumes-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/os-volumes-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/os-volumes-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/os-volumes-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/os-volumes-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/snapshot-create-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/snapshot-create-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/snapshot-create-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/snapshot-create-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/snapshot-create-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/snapshot-create-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/snapshot-create-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/snapshot-create-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/snapshots-detail-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/snapshots-detail-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/snapshots-detail-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/snapshots-detail-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/snapshots-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/snapshots-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/snapshots-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/snapshots-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/os-volumes/snapshots-show-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/os-volumes/snapshots-show-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/os-volumes/snapshots-show-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/os-volumes/snapshots-show-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/server-ips/server-ips-network-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/server-ips/server-ips-network-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/server-ips/server-ips-network-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/server-ips/server-ips-network-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/server-ips/server-ips-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/server-ips/server-ips-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/server-ips/server-ips-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/server-ips/server-ips-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/server-ips/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/server-ips/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/server-ips/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/server-ips/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/server-ips/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/server-ips/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/server-ips/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/server-ips/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/server-metadata/server-metadata-all-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/server-metadata/server-metadata-all-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/server-metadata/server-metadata-all-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/server-metadata/server-metadata-all-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/server-metadata/server-metadata-all-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/server-metadata/server-metadata-all-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/server-metadata/server-metadata-all-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/server-metadata/server-metadata-all-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/server-metadata/server-metadata-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/server-metadata/server-metadata-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/server-metadata/server-metadata-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/server-metadata/server-metadata-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/server-metadata/server-metadata-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/server-metadata/server-metadata-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/server-metadata/server-metadata-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/server-metadata/server-metadata-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/server-metadata/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/server-metadata/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/server-metadata/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/server-metadata/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/server-metadata/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/server-metadata/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/server-metadata/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/server-metadata/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-confirm-resize.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-confirm-resize.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-confirm-resize.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-confirm-resize.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-create-image.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-create-image.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-create-image.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-create-image.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-reboot.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-reboot.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-reboot.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-reboot.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-rebuild.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-rebuild.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-rebuild.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-resize.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-resize.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-resize.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-resize.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-revert-resize.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-revert-resize.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-revert-resize.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-revert-resize.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-start.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-start.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-start.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-start.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-stop.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-action-stop.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-action-stop.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-action-stop.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-get-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-get-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-post-req.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-post-req.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-post-req.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-post-req.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/server-post-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/server-post-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/server-post-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/server-post-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/servers-details-resp.json.tpl diff --git a/nova/tests/integrated/v3/api_samples/servers/servers-list-resp.json.tpl b/nova/tests/unit/integrated/v3/api_samples/servers/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/servers/servers-list-resp.json.tpl rename to nova/tests/unit/integrated/v3/api_samples/servers/servers-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/test_access_ips.py b/nova/tests/unit/integrated/v3/test_access_ips.py similarity index 97% rename from nova/tests/integrated/v3/test_access_ips.py rename to nova/tests/unit/integrated/v3/test_access_ips.py index 36af1e71e52a..d0af25f281fc 100644 --- a/nova/tests/integrated/v3/test_access_ips.py +++ b/nova/tests/unit/integrated/v3/test_access_ips.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.image import fake -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import api_sample_base class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_admin_actions.py b/nova/tests/unit/integrated/v3/test_admin_actions.py similarity index 97% rename from nova/tests/integrated/v3/test_admin_actions.py rename to nova/tests/unit/integrated/v3/test_admin_actions.py index edfce562f750..75300664381b 100644 --- a/nova/tests/integrated/v3/test_admin_actions.py +++ b/nova/tests/unit/integrated/v3/test_admin_actions.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class AdminActionsSamplesJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_admin_password.py b/nova/tests/unit/integrated/v3/test_admin_password.py similarity index 95% rename from nova/tests/integrated/v3/test_admin_password.py rename to nova/tests/unit/integrated/v3/test_admin_password.py index 4e5304e1bcb3..2062e857df88 100644 --- a/nova/tests/integrated/v3/test_admin_password.py +++ b/nova/tests/unit/integrated/v3/test_admin_password.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class AdminPasswordJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_agents.py b/nova/tests/unit/integrated/v3/test_agents.py similarity index 98% rename from nova/tests/integrated/v3/test_agents.py rename to nova/tests/unit/integrated/v3/test_agents.py index 991de50e1e0e..ade59e6ec095 100644 --- a/nova/tests/integrated/v3/test_agents.py +++ b/nova/tests/unit/integrated/v3/test_agents.py @@ -15,7 +15,7 @@ from nova import db from nova.db.sqlalchemy import models -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class AgentsJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_aggregates.py b/nova/tests/unit/integrated/v3/test_aggregates.py similarity index 98% rename from nova/tests/integrated/v3/test_aggregates.py rename to nova/tests/unit/integrated/v3/test_aggregates.py index 819cf3447a35..6e29ea04039c 100644 --- a/nova/tests/integrated/v3/test_aggregates.py +++ b/nova/tests/unit/integrated/v3/test_aggregates.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_attach_interfaces.py b/nova/tests/unit/integrated/v3/test_attach_interfaces.py similarity index 98% rename from nova/tests/integrated/v3/test_attach_interfaces.py rename to nova/tests/unit/integrated/v3/test_attach_interfaces.py index 50ea7910fb9b..f35edcb7403f 100644 --- a/nova/tests/integrated/v3/test_attach_interfaces.py +++ b/nova/tests/unit/integrated/v3/test_attach_interfaces.py @@ -16,8 +16,8 @@ from nova.compute import api as compute_api from nova import exception from nova.network import api as network_api -from nova.tests import fake_network_cache_model -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit import fake_network_cache_model +from nova.tests.unit.integrated.v3 import test_servers class AttachInterfacesSampleJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_availability_zone.py b/nova/tests/unit/integrated/v3/test_availability_zone.py similarity index 97% rename from nova/tests/integrated/v3/test_availability_zone.py rename to nova/tests/unit/integrated/v3/test_availability_zone.py index 31a5ae5925c3..6f59e2c2646c 100644 --- a/nova/tests/integrated/v3/test_availability_zone.py +++ b/nova/tests/unit/integrated/v3/test_availability_zone.py @@ -14,7 +14,7 @@ from oslo.config import cfg -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers CONF = cfg.CONF CONF.import_opt('manager', 'nova.cells.opts', group='cells') diff --git a/nova/tests/integrated/v3/test_cells.py b/nova/tests/unit/integrated/v3/test_cells.py similarity index 98% rename from nova/tests/integrated/v3/test_cells.py rename to nova/tests/unit/integrated/v3/test_cells.py index ec09aa4cf619..2d7aea9542a5 100644 --- a/nova/tests/integrated/v3/test_cells.py +++ b/nova/tests/unit/integrated/v3/test_cells.py @@ -18,7 +18,7 @@ from nova.cells import state from nova import db from nova.db.sqlalchemy import models from nova import exception -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class CellsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_certificates.py b/nova/tests/unit/integrated/v3/test_certificates.py similarity index 95% rename from nova/tests/integrated/v3/test_certificates.py rename to nova/tests/unit/integrated/v3/test_certificates.py index c04afc5faec7..96cbbc711c72 100644 --- a/nova/tests/integrated/v3/test_certificates.py +++ b/nova/tests/unit/integrated/v3/test_certificates.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class CertificatesSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_cloudpipe.py b/nova/tests/unit/integrated/v3/test_cloudpipe.py similarity index 96% rename from nova/tests/integrated/v3/test_cloudpipe.py rename to nova/tests/unit/integrated/v3/test_cloudpipe.py index 54c510feabb0..b8cb28d0776f 100644 --- a/nova/tests/integrated/v3/test_cloudpipe.py +++ b/nova/tests/unit/integrated/v3/test_cloudpipe.py @@ -18,8 +18,8 @@ from oslo.config import cfg from nova.cloudpipe import pipelib from nova.network import api as network_api -from nova.tests.image import fake -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import api_sample_base CONF = cfg.CONF diff --git a/nova/tests/integrated/v3/test_config_drive.py b/nova/tests/unit/integrated/v3/test_config_drive.py similarity index 92% rename from nova/tests/integrated/v3/test_config_drive.py rename to nova/tests/unit/integrated/v3/test_config_drive.py index 38189f233530..b8e7fc207a49 100644 --- a/nova/tests/integrated/v3/test_config_drive.py +++ b/nova/tests/unit/integrated/v3/test_config_drive.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.api.openstack import fakes -from nova.tests.image import fake -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import test_servers class ConfigDriveSampleJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_console_auth_tokens.py b/nova/tests/unit/integrated/v3/test_console_auth_tokens.py similarity index 97% rename from nova/tests/integrated/v3/test_console_auth_tokens.py rename to nova/tests/unit/integrated/v3/test_console_auth_tokens.py index 80ebbc67f231..d286458678c7 100644 --- a/nova/tests/integrated/v3/test_console_auth_tokens.py +++ b/nova/tests/unit/integrated/v3/test_console_auth_tokens.py @@ -16,7 +16,7 @@ import re from oslo.serialization import jsonutils -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ConsoleAuthTokensSampleJsonTests(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_console_output.py b/nova/tests/unit/integrated/v3/test_console_output.py similarity index 95% rename from nova/tests/integrated/v3/test_console_output.py rename to nova/tests/unit/integrated/v3/test_console_output.py index 47d39d64640b..6ad9a1d9e626 100644 --- a/nova/tests/integrated/v3/test_console_output.py +++ b/nova/tests/unit/integrated/v3/test_console_output.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ConsoleOutputSampleJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_consoles.py b/nova/tests/unit/integrated/v3/test_consoles.py similarity index 97% rename from nova/tests/integrated/v3/test_consoles.py rename to nova/tests/unit/integrated/v3/test_consoles.py index c7dcced092ae..7a889aa4cfe6 100644 --- a/nova/tests/integrated/v3/test_consoles.py +++ b/nova/tests/unit/integrated/v3/test_consoles.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ConsolesSamplesJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_create_backup.py b/nova/tests/unit/integrated/v3/test_create_backup.py similarity index 93% rename from nova/tests/integrated/v3/test_create_backup.py rename to nova/tests/unit/integrated/v3/test_create_backup.py index e90c29b1a0f3..089a61fb5f2b 100644 --- a/nova/tests/integrated/v3/test_create_backup.py +++ b/nova/tests/unit/integrated/v3/test_create_backup.py @@ -15,8 +15,8 @@ import mock -from nova.tests.image import fake -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import test_servers class CreateBackupSamplesJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_deferred_delete.py b/nova/tests/unit/integrated/v3/test_deferred_delete.py similarity index 96% rename from nova/tests/integrated/v3/test_deferred_delete.py rename to nova/tests/unit/integrated/v3/test_deferred_delete.py index 7a0e264539ad..0b8d970900d9 100644 --- a/nova/tests/integrated/v3/test_deferred_delete.py +++ b/nova/tests/unit/integrated/v3/test_deferred_delete.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class DeferredDeleteSampleJsonTests(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_disk_config.py b/nova/tests/unit/integrated/v3/test_disk_config.py similarity index 97% rename from nova/tests/integrated/v3/test_disk_config.py rename to nova/tests/unit/integrated/v3/test_disk_config.py index 6f40c43d0ee5..97eeb31ace0a 100644 --- a/nova/tests/integrated/v3/test_disk_config.py +++ b/nova/tests/unit/integrated/v3/test_disk_config.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.image import fake -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import test_servers class DiskConfigJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_evacuate.py b/nova/tests/unit/integrated/v3/test_evacuate.py similarity index 98% rename from nova/tests/integrated/v3/test_evacuate.py rename to nova/tests/unit/integrated/v3/test_evacuate.py index 0f17ad122066..1d63404b6d1d 100644 --- a/nova/tests/integrated/v3/test_evacuate.py +++ b/nova/tests/unit/integrated/v3/test_evacuate.py @@ -18,7 +18,7 @@ import mock from nova.compute import api as compute_api from nova.compute import manager as compute_manager from nova.servicegroup import api as service_group_api -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class EvacuateJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_extended_availability_zone.py b/nova/tests/unit/integrated/v3/test_extended_availability_zone.py similarity index 95% rename from nova/tests/integrated/v3/test_extended_availability_zone.py rename to nova/tests/unit/integrated/v3/test_extended_availability_zone.py index 631d46141d6d..accd4a2cdff7 100644 --- a/nova/tests/integrated/v3/test_extended_availability_zone.py +++ b/nova/tests/unit/integrated/v3/test_extended_availability_zone.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ExtendedAvailabilityZoneJsonTests(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_extended_server_attributes.py b/nova/tests/unit/integrated/v3/test_extended_server_attributes.py similarity index 96% rename from nova/tests/integrated/v3/test_extended_server_attributes.py rename to nova/tests/unit/integrated/v3/test_extended_server_attributes.py index 36c70fddbda5..1a00f45237da 100644 --- a/nova/tests/integrated/v3/test_extended_server_attributes.py +++ b/nova/tests/unit/integrated/v3/test_extended_server_attributes.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ExtendedServerAttributesJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_extended_status.py b/nova/tests/unit/integrated/v3/test_extended_status.py similarity index 95% rename from nova/tests/integrated/v3/test_extended_status.py rename to nova/tests/unit/integrated/v3/test_extended_status.py index cbdb4fb4833d..8f952eaacc67 100644 --- a/nova/tests/integrated/v3/test_extended_status.py +++ b/nova/tests/unit/integrated/v3/test_extended_status.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ExtendedStatusSampleJsonTests(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_extended_volumes.py b/nova/tests/unit/integrated/v3/test_extended_volumes.py similarity index 97% rename from nova/tests/integrated/v3/test_extended_volumes.py rename to nova/tests/unit/integrated/v3/test_extended_volumes.py index bb41b793ccb7..f6500eaac66e 100644 --- a/nova/tests/integrated/v3/test_extended_volumes.py +++ b/nova/tests/unit/integrated/v3/test_extended_volumes.py @@ -18,10 +18,10 @@ from nova.compute import manager as compute_manager from nova import context from nova import db from nova import objects -from nova.tests.api.openstack import fakes -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit.integrated.v3 import test_servers from nova.volume import cinder diff --git a/nova/tests/integrated/v3/test_extension_info.py b/nova/tests/unit/integrated/v3/test_extension_info.py similarity index 97% rename from nova/tests/integrated/v3/test_extension_info.py rename to nova/tests/unit/integrated/v3/test_extension_info.py index 26dd1861934a..c23339b96e61 100644 --- a/nova/tests/integrated/v3/test_extension_info.py +++ b/nova/tests/unit/integrated/v3/test_extension_info.py @@ -19,7 +19,7 @@ import mock from oslo.serialization import jsonutils from nova.api.openstack import extensions as api_extensions -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class ExtensionInfoSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_fixed_ips.py b/nova/tests/unit/integrated/v3/test_fixed_ips.py similarity index 96% rename from nova/tests/integrated/v3/test_fixed_ips.py rename to nova/tests/unit/integrated/v3/test_fixed_ips.py index 347aacfbc32d..cabeac018a16 100644 --- a/nova/tests/integrated/v3/test_fixed_ips.py +++ b/nova/tests/unit/integrated/v3/test_fixed_ips.py @@ -14,9 +14,9 @@ from nova import db from nova import exception -from nova.tests.integrated.v3 import test_servers -from nova.tests.objects import test_network -from nova.tests import utils as test_utils +from nova.tests.unit.integrated.v3 import test_servers +from nova.tests.unit.objects import test_network +from nova.tests.unit import utils as test_utils class FixedIpTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_flavor_access.py b/nova/tests/unit/integrated/v3/test_flavor_access.py similarity index 98% rename from nova/tests/integrated/v3/test_flavor_access.py rename to nova/tests/unit/integrated/v3/test_flavor_access.py index 7b9006bbf165..66316856a3b8 100644 --- a/nova/tests/integrated/v3/test_flavor_access.py +++ b/nova/tests/unit/integrated/v3/test_flavor_access.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class FlavorAccessSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_flavor_extraspecs.py b/nova/tests/unit/integrated/v3/test_flavor_extraspecs.py similarity index 97% rename from nova/tests/integrated/v3/test_flavor_extraspecs.py rename to nova/tests/unit/integrated/v3/test_flavor_extraspecs.py index 4a08d454a1aa..ba823c7c2452 100644 --- a/nova/tests/integrated/v3/test_flavor_extraspecs.py +++ b/nova/tests/unit/integrated/v3/test_flavor_extraspecs.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class FlavorExtraSpecsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_flavor_manage.py b/nova/tests/unit/integrated/v3/test_flavor_manage.py similarity index 96% rename from nova/tests/integrated/v3/test_flavor_manage.py rename to nova/tests/unit/integrated/v3/test_flavor_manage.py index 9b6d14301ed9..e7911ef0a6a1 100644 --- a/nova/tests/integrated/v3/test_flavor_manage.py +++ b/nova/tests/unit/integrated/v3/test_flavor_manage.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class FlavorManageSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_flavor_rxtx.py b/nova/tests/unit/integrated/v3/test_flavor_rxtx.py similarity index 96% rename from nova/tests/integrated/v3/test_flavor_rxtx.py rename to nova/tests/unit/integrated/v3/test_flavor_rxtx.py index 0de02d5c4d20..2b0840259ece 100644 --- a/nova/tests/integrated/v3/test_flavor_rxtx.py +++ b/nova/tests/unit/integrated/v3/test_flavor_rxtx.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class FlavorRxtxJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_flavors.py b/nova/tests/unit/integrated/v3/test_flavors.py similarity index 95% rename from nova/tests/integrated/v3/test_flavors.py rename to nova/tests/unit/integrated/v3/test_flavors.py index c821bd4764a2..e8db9bc5a1d7 100644 --- a/nova/tests/integrated/v3/test_flavors.py +++ b/nova/tests/unit/integrated/v3/test_flavors.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class FlavorsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_floating_ip_dns.py b/nova/tests/unit/integrated/v3/test_floating_ip_dns.py similarity index 98% rename from nova/tests/integrated/v3/test_floating_ip_dns.py rename to nova/tests/unit/integrated/v3/test_floating_ip_dns.py index 51cb543a806f..d0326b6535ae 100644 --- a/nova/tests/integrated/v3/test_floating_ip_dns.py +++ b/nova/tests/unit/integrated/v3/test_floating_ip_dns.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class FloatingIpDNSTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_floating_ip_pools.py b/nova/tests/unit/integrated/v3/test_floating_ip_pools.py similarity index 95% rename from nova/tests/integrated/v3/test_floating_ip_pools.py rename to nova/tests/unit/integrated/v3/test_floating_ip_pools.py index bea1123cb9e4..4db76801c7c7 100644 --- a/nova/tests/integrated/v3/test_floating_ip_pools.py +++ b/nova/tests/unit/integrated/v3/test_floating_ip_pools.py @@ -13,7 +13,7 @@ # under the License. from nova.network import api as network_api -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class FloatingIPPoolsSampleTests(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_floating_ips_bulk.py b/nova/tests/unit/integrated/v3/test_floating_ips_bulk.py similarity index 98% rename from nova/tests/integrated/v3/test_floating_ips_bulk.py rename to nova/tests/unit/integrated/v3/test_floating_ips_bulk.py index 630902572df7..9459b1bf6135 100644 --- a/nova/tests/integrated/v3/test_floating_ips_bulk.py +++ b/nova/tests/unit/integrated/v3/test_floating_ips_bulk.py @@ -16,7 +16,7 @@ from oslo.config import cfg from nova import context -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base CONF = cfg.CONF CONF.import_opt('default_floating_pool', 'nova.network.floating_ips') diff --git a/nova/tests/integrated/v3/test_fping.py b/nova/tests/unit/integrated/v3/test_fping.py similarity index 92% rename from nova/tests/integrated/v3/test_fping.py rename to nova/tests/unit/integrated/v3/test_fping.py index 2fa67427f2ba..000c6d248451 100644 --- a/nova/tests/integrated/v3/test_fping.py +++ b/nova/tests/unit/integrated/v3/test_fping.py @@ -15,8 +15,8 @@ from nova.api.openstack.compute.plugins.v3 import fping -from nova.tests.api.openstack.compute.contrib import test_fping -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.api.openstack.compute.contrib import test_fping +from nova.tests.unit.integrated.v3 import test_servers from nova import utils diff --git a/nova/tests/integrated/v3/test_hide_server_addresses.py b/nova/tests/unit/integrated/v3/test_hide_server_addresses.py similarity index 96% rename from nova/tests/integrated/v3/test_hide_server_addresses.py rename to nova/tests/unit/integrated/v3/test_hide_server_addresses.py index a530b70c8923..908fef62d158 100644 --- a/nova/tests/integrated/v3/test_hide_server_addresses.py +++ b/nova/tests/unit/integrated/v3/test_hide_server_addresses.py @@ -16,7 +16,7 @@ from oslo.config import cfg from nova.compute import vm_states -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers CONF = cfg.CONF CONF.import_opt('osapi_hide_server_address_states', diff --git a/nova/tests/integrated/v3/test_hosts.py b/nova/tests/unit/integrated/v3/test_hosts.py similarity index 97% rename from nova/tests/integrated/v3/test_hosts.py rename to nova/tests/unit/integrated/v3/test_hosts.py index f86ad6315320..7142ee885ad7 100644 --- a/nova/tests/integrated/v3/test_hosts.py +++ b/nova/tests/unit/integrated/v3/test_hosts.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class HostsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_hypervisors.py b/nova/tests/unit/integrated/v3/test_hypervisors.py similarity index 97% rename from nova/tests/integrated/v3/test_hypervisors.py rename to nova/tests/unit/integrated/v3/test_hypervisors.py index 9c2a2ba2ecac..f36f35ec8466 100644 --- a/nova/tests/integrated/v3/test_hypervisors.py +++ b/nova/tests/unit/integrated/v3/test_hypervisors.py @@ -14,7 +14,7 @@ # under the License. from nova.compute import api as compute_api -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class HypervisorsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_image_size.py b/nova/tests/unit/integrated/v3/test_image_size.py similarity index 93% rename from nova/tests/integrated/v3/test_image_size.py rename to nova/tests/unit/integrated/v3/test_image_size.py index e2037eb984a9..8aeb08e9d867 100644 --- a/nova/tests/integrated/v3/test_image_size.py +++ b/nova/tests/unit/integrated/v3/test_image_size.py @@ -14,8 +14,8 @@ # under the License. -from nova.tests.image import fake -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import api_sample_base class ImageSizeSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_images.py b/nova/tests/unit/integrated/v3/test_images.py similarity index 97% rename from nova/tests/integrated/v3/test_images.py rename to nova/tests/unit/integrated/v3/test_images.py index e6982d2963b4..95dd0c971b81 100644 --- a/nova/tests/integrated/v3/test_images.py +++ b/nova/tests/unit/integrated/v3/test_images.py @@ -14,8 +14,8 @@ # under the License. -from nova.tests.image import fake -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import api_sample_base class ImagesSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_instance_actions.py b/nova/tests/unit/integrated/v3/test_instance_actions.py similarity index 95% rename from nova/tests/integrated/v3/test_instance_actions.py rename to nova/tests/unit/integrated/v3/test_instance_actions.py index ca69b401e8cd..3285fa4a69b9 100644 --- a/nova/tests/integrated/v3/test_instance_actions.py +++ b/nova/tests/unit/integrated/v3/test_instance_actions.py @@ -17,9 +17,9 @@ import copy from nova.compute import api as compute_api from nova import db -from nova.tests import fake_server_actions -from nova.tests.integrated.v3 import api_sample_base -from nova.tests import utils as test_utils +from nova.tests.unit import fake_server_actions +from nova.tests.unit.integrated.v3 import api_sample_base +from nova.tests.unit import utils as test_utils class ServerActionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_keypairs.py b/nova/tests/unit/integrated/v3/test_keypairs.py similarity index 98% rename from nova/tests/integrated/v3/test_keypairs.py rename to nova/tests/unit/integrated/v3/test_keypairs.py index 6c888e090aa4..d07940798582 100644 --- a/nova/tests/integrated/v3/test_keypairs.py +++ b/nova/tests/unit/integrated/v3/test_keypairs.py @@ -15,7 +15,7 @@ import uuid -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_lock_server.py b/nova/tests/unit/integrated/v3/test_lock_server.py similarity index 96% rename from nova/tests/integrated/v3/test_lock_server.py rename to nova/tests/unit/integrated/v3/test_lock_server.py index 7991a3b8e35c..0eb9676fbfcb 100644 --- a/nova/tests/integrated/v3/test_lock_server.py +++ b/nova/tests/unit/integrated/v3/test_lock_server.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class LockServerSamplesJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_migrate_server.py b/nova/tests/unit/integrated/v3/test_migrate_server.py similarity index 98% rename from nova/tests/integrated/v3/test_migrate_server.py rename to nova/tests/unit/integrated/v3/test_migrate_server.py index 5b0d838152a4..a43703fbc27c 100644 --- a/nova/tests/integrated/v3/test_migrate_server.py +++ b/nova/tests/unit/integrated/v3/test_migrate_server.py @@ -17,7 +17,7 @@ import mock from nova.conductor import manager as conductor_manager from nova import db -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers from nova import utils diff --git a/nova/tests/integrated/v3/test_migrations.py b/nova/tests/unit/integrated/v3/test_migrations.py similarity index 97% rename from nova/tests/integrated/v3/test_migrations.py rename to nova/tests/unit/integrated/v3/test_migrations.py index 5ce42e07b7c6..ab8b214f6e25 100644 --- a/nova/tests/integrated/v3/test_migrations.py +++ b/nova/tests/unit/integrated/v3/test_migrations.py @@ -16,7 +16,7 @@ import datetime from nova.compute import api as compute_api -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class MigrationsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_multinic.py b/nova/tests/unit/integrated/v3/test_multinic.py similarity index 97% rename from nova/tests/integrated/v3/test_multinic.py rename to nova/tests/unit/integrated/v3/test_multinic.py index 68eb4573e287..3d5538763249 100644 --- a/nova/tests/integrated/v3/test_multinic.py +++ b/nova/tests/unit/integrated/v3/test_multinic.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class MultinicSampleJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_multiple_create.py b/nova/tests/unit/integrated/v3/test_multiple_create.py similarity index 94% rename from nova/tests/integrated/v3/test_multiple_create.py rename to nova/tests/unit/integrated/v3/test_multiple_create.py index b887878fbbc4..76c2083b0d7d 100644 --- a/nova/tests/integrated/v3/test_multiple_create.py +++ b/nova/tests/unit/integrated/v3/test_multiple_create.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.image import fake -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import test_servers class MultipleCreateJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_networks.py b/nova/tests/unit/integrated/v3/test_networks.py similarity index 95% rename from nova/tests/integrated/v3/test_networks.py rename to nova/tests/unit/integrated/v3/test_networks.py index df9a7184e74a..555c682c78af 100644 --- a/nova/tests/integrated/v3/test_networks.py +++ b/nova/tests/unit/integrated/v3/test_networks.py @@ -14,8 +14,8 @@ # under the License. from nova.network import api as network_api -from nova.tests.api.openstack.compute.contrib import test_networks -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.api.openstack.compute.contrib import test_networks +from nova.tests.unit.integrated.v3 import api_sample_base class NetworksJsonTests(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_networks_associate.py b/nova/tests/unit/integrated/v3/test_networks_associate.py similarity index 98% rename from nova/tests/integrated/v3/test_networks_associate.py rename to nova/tests/unit/integrated/v3/test_networks_associate.py index 3bd437a1cda5..fe109d4d6ce0 100644 --- a/nova/tests/integrated/v3/test_networks_associate.py +++ b/nova/tests/unit/integrated/v3/test_networks_associate.py @@ -16,7 +16,7 @@ from oslo.config import cfg from nova.network import api as network_api -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/integrated/v3/test_pause_server.py b/nova/tests/unit/integrated/v3/test_pause_server.py similarity index 96% rename from nova/tests/integrated/v3/test_pause_server.py rename to nova/tests/unit/integrated/v3/test_pause_server.py index 109906dc26bd..4993dc104836 100644 --- a/nova/tests/integrated/v3/test_pause_server.py +++ b/nova/tests/unit/integrated/v3/test_pause_server.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class PauseServerSamplesJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_pci.py b/nova/tests/unit/integrated/v3/test_pci.py similarity index 98% rename from nova/tests/integrated/v3/test_pci.py rename to nova/tests/unit/integrated/v3/test_pci.py index e20aeb7f5eee..bb655a0ef08c 100644 --- a/nova/tests/integrated/v3/test_pci.py +++ b/nova/tests/unit/integrated/v3/test_pci.py @@ -16,8 +16,8 @@ import mock from oslo.serialization import jsonutils from nova import db -from nova.tests.integrated.v3 import api_sample_base -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import test_servers fake_db_dev_1 = { diff --git a/nova/tests/integrated/v3/test_quota_sets.py b/nova/tests/unit/integrated/v3/test_quota_sets.py similarity index 98% rename from nova/tests/integrated/v3/test_quota_sets.py rename to nova/tests/unit/integrated/v3/test_quota_sets.py index 4153c3c3f6af..8848fd9d2ac7 100644 --- a/nova/tests/integrated/v3/test_quota_sets.py +++ b/nova/tests/unit/integrated/v3/test_quota_sets.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class QuotaSetsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_remote_consoles.py b/nova/tests/unit/integrated/v3/test_remote_consoles.py similarity index 98% rename from nova/tests/integrated/v3/test_remote_consoles.py rename to nova/tests/unit/integrated/v3/test_remote_consoles.py index 914c3f5767b5..6f35aafb3482 100644 --- a/nova/tests/integrated/v3/test_remote_consoles.py +++ b/nova/tests/unit/integrated/v3/test_remote_consoles.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ConsolesSampleJsonTests(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_rescue.py b/nova/tests/unit/integrated/v3/test_rescue.py similarity index 98% rename from nova/tests/integrated/v3/test_rescue.py rename to nova/tests/unit/integrated/v3/test_rescue.py index aee385dc99bf..65532607d5e3 100644 --- a/nova/tests/integrated/v3/test_rescue.py +++ b/nova/tests/unit/integrated/v3/test_rescue.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class RescueJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_scheduler_hints.py b/nova/tests/unit/integrated/v3/test_scheduler_hints.py similarity index 92% rename from nova/tests/integrated/v3/test_scheduler_hints.py rename to nova/tests/unit/integrated/v3/test_scheduler_hints.py index a0b9b6186e8e..6ecea5efc7f3 100644 --- a/nova/tests/integrated/v3/test_scheduler_hints.py +++ b/nova/tests/unit/integrated/v3/test_scheduler_hints.py @@ -15,8 +15,8 @@ import uuid -from nova.tests.image import fake -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import api_sample_base class SchedulerHintsJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_security_group_default_rules.py b/nova/tests/unit/integrated/v3/test_security_group_default_rules.py similarity index 96% rename from nova/tests/integrated/v3/test_security_group_default_rules.py rename to nova/tests/unit/integrated/v3/test_security_group_default_rules.py index 99882ce865d6..e0c2ec81321f 100644 --- a/nova/tests/integrated/v3/test_security_group_default_rules.py +++ b/nova/tests/unit/integrated/v3/test_security_group_default_rules.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class SecurityGroupDefaultRulesSampleJsonTest( diff --git a/nova/tests/integrated/v3/test_security_groups.py b/nova/tests/unit/integrated/v3/test_security_groups.py similarity index 99% rename from nova/tests/integrated/v3/test_security_groups.py rename to nova/tests/unit/integrated/v3/test_security_groups.py index 2859bf1f129f..3afb26a06f15 100644 --- a/nova/tests/integrated/v3/test_security_groups.py +++ b/nova/tests/unit/integrated/v3/test_security_groups.py @@ -14,7 +14,7 @@ # under the License. from nova.network.security_group import neutron_driver -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers def fake_get(*args, **kwargs): diff --git a/nova/tests/integrated/v3/test_server_diagnostics.py b/nova/tests/unit/integrated/v3/test_server_diagnostics.py similarity index 94% rename from nova/tests/integrated/v3/test_server_diagnostics.py rename to nova/tests/unit/integrated/v3/test_server_diagnostics.py index 9218066ad018..b2c41225e312 100644 --- a/nova/tests/integrated/v3/test_server_diagnostics.py +++ b/nova/tests/unit/integrated/v3/test_server_diagnostics.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ServerDiagnosticsSamplesJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_server_external_events.py b/nova/tests/unit/integrated/v3/test_server_external_events.py similarity index 96% rename from nova/tests/integrated/v3/test_server_external_events.py rename to nova/tests/unit/integrated/v3/test_server_external_events.py index 79b135b5e0de..9d2675a11c37 100644 --- a/nova/tests/integrated/v3/test_server_external_events.py +++ b/nova/tests/unit/integrated/v3/test_server_external_events.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ServerExternalEventsSamplesJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_server_groups.py b/nova/tests/unit/integrated/v3/test_server_groups.py similarity index 97% rename from nova/tests/integrated/v3/test_server_groups.py rename to nova/tests/unit/integrated/v3/test_server_groups.py index dcbe2afc3562..f5cc253cc947 100644 --- a/nova/tests/integrated/v3/test_server_groups.py +++ b/nova/tests/unit/integrated/v3/test_server_groups.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ServerGroupsSampleJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_server_metadata.py b/nova/tests/unit/integrated/v3/test_server_metadata.py similarity index 98% rename from nova/tests/integrated/v3/test_server_metadata.py rename to nova/tests/unit/integrated/v3/test_server_metadata.py index f85c8118bb5b..9b45af3d0799 100644 --- a/nova/tests/integrated/v3/test_server_metadata.py +++ b/nova/tests/unit/integrated/v3/test_server_metadata.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ServersMetadataJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_server_usage.py b/nova/tests/unit/integrated/v3/test_server_usage.py similarity index 96% rename from nova/tests/integrated/v3/test_server_usage.py rename to nova/tests/unit/integrated/v3/test_server_usage.py index ae0c393e787c..1b6358bd436a 100644 --- a/nova/tests/integrated/v3/test_server_usage.py +++ b/nova/tests/unit/integrated/v3/test_server_usage.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ServerUsageSampleJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_servers.py b/nova/tests/unit/integrated/v3/test_servers.py similarity index 98% rename from nova/tests/integrated/v3/test_servers.py rename to nova/tests/unit/integrated/v3/test_servers.py index 156870203b15..dfa8f5a9d90a 100644 --- a/nova/tests/integrated/v3/test_servers.py +++ b/nova/tests/unit/integrated/v3/test_servers.py @@ -14,8 +14,8 @@ # under the License. from nova.compute import api as compute_api -from nova.tests.image import fake -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import api_sample_base class ServersSampleBase(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_servers_ips.py b/nova/tests/unit/integrated/v3/test_servers_ips.py similarity index 96% rename from nova/tests/integrated/v3/test_servers_ips.py rename to nova/tests/unit/integrated/v3/test_servers_ips.py index 08cabe6a825a..7c0b24b66b85 100644 --- a/nova/tests/integrated/v3/test_servers_ips.py +++ b/nova/tests/unit/integrated/v3/test_servers_ips.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class ServersIpsJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_services.py b/nova/tests/unit/integrated/v3/test_services.py similarity index 96% rename from nova/tests/integrated/v3/test_services.py rename to nova/tests/unit/integrated/v3/test_services.py index b15701358cb3..9ce9ffdbe728 100644 --- a/nova/tests/integrated/v3/test_services.py +++ b/nova/tests/unit/integrated/v3/test_services.py @@ -16,8 +16,8 @@ from oslo.utils import timeutils from nova import db -from nova.tests.api.openstack.compute.plugins.v3 import test_services -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.api.openstack.compute.plugins.v3 import test_services +from nova.tests.unit.integrated.v3 import api_sample_base class ServicesJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_shelve.py b/nova/tests/unit/integrated/v3/test_shelve.py similarity index 97% rename from nova/tests/integrated/v3/test_shelve.py rename to nova/tests/unit/integrated/v3/test_shelve.py index 6913ab42cc5f..4a2224e7834c 100644 --- a/nova/tests/integrated/v3/test_shelve.py +++ b/nova/tests/unit/integrated/v3/test_shelve.py @@ -15,7 +15,7 @@ from oslo.config import cfg -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers CONF = cfg.CONF CONF.import_opt('shelved_offload_time', 'nova.compute.manager') diff --git a/nova/tests/integrated/v3/test_simple_tenant_usage.py b/nova/tests/unit/integrated/v3/test_simple_tenant_usage.py similarity index 97% rename from nova/tests/integrated/v3/test_simple_tenant_usage.py rename to nova/tests/unit/integrated/v3/test_simple_tenant_usage.py index 18d2e7ceb7e9..4508a36f8b08 100644 --- a/nova/tests/integrated/v3/test_simple_tenant_usage.py +++ b/nova/tests/unit/integrated/v3/test_simple_tenant_usage.py @@ -17,7 +17,7 @@ import urllib from oslo.utils import timeutils -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class SimpleTenantUsageSampleJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_suspend_server.py b/nova/tests/unit/integrated/v3/test_suspend_server.py similarity index 96% rename from nova/tests/integrated/v3/test_suspend_server.py rename to nova/tests/unit/integrated/v3/test_suspend_server.py index 2d9b1048ed88..11053b3e3e19 100644 --- a/nova/tests/integrated/v3/test_suspend_server.py +++ b/nova/tests/unit/integrated/v3/test_suspend_server.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.integrated.v3 import test_servers class SuspendServerSamplesJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/integrated/v3/test_tenant_networks.py b/nova/tests/unit/integrated/v3/test_tenant_networks.py similarity index 97% rename from nova/tests/integrated/v3/test_tenant_networks.py rename to nova/tests/unit/integrated/v3/test_tenant_networks.py index 6ea3c7d7c6c5..72a888ba936b 100644 --- a/nova/tests/integrated/v3/test_tenant_networks.py +++ b/nova/tests/unit/integrated/v3/test_tenant_networks.py @@ -18,7 +18,7 @@ from oslo.config import cfg from oslo.serialization import jsonutils import nova.quota -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base CONF = cfg.CONF CONF.import_opt('enable_network_quota', diff --git a/nova/tests/integrated/v3/test_used_limits.py b/nova/tests/unit/integrated/v3/test_used_limits.py similarity index 95% rename from nova/tests/integrated/v3/test_used_limits.py rename to nova/tests/unit/integrated/v3/test_used_limits.py index d9e424800128..6682246c9eb5 100644 --- a/nova/tests/integrated/v3/test_used_limits.py +++ b/nova/tests/unit/integrated/v3/test_used_limits.py @@ -14,7 +14,7 @@ # under the License. -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import api_sample_base class UsedLimitsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_user_data.py b/nova/tests/unit/integrated/v3/test_user_data.py similarity index 92% rename from nova/tests/integrated/v3/test_user_data.py rename to nova/tests/unit/integrated/v3/test_user_data.py index bdea92a8d8d6..6410fa5a244b 100644 --- a/nova/tests/integrated/v3/test_user_data.py +++ b/nova/tests/unit/integrated/v3/test_user_data.py @@ -15,8 +15,8 @@ import base64 -from nova.tests.image import fake -from nova.tests.integrated.v3 import api_sample_base +from nova.tests.unit.image import fake +from nova.tests.unit.integrated.v3 import api_sample_base class UserDataJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/integrated/v3/test_volumes.py b/nova/tests/unit/integrated/v3/test_volumes.py similarity index 97% rename from nova/tests/integrated/v3/test_volumes.py rename to nova/tests/unit/integrated/v3/test_volumes.py index 8c306ae347b4..3c7ff6e4605d 100644 --- a/nova/tests/integrated/v3/test_volumes.py +++ b/nova/tests/unit/integrated/v3/test_volumes.py @@ -15,9 +15,9 @@ import datetime -from nova.tests.api.openstack import fakes -from nova.tests.integrated.v3 import api_sample_base -from nova.tests.integrated.v3 import test_servers +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.integrated.v3 import api_sample_base +from nova.tests.unit.integrated.v3 import test_servers from nova.volume import cinder diff --git a/nova/tests/keymgr/__init__.py b/nova/tests/unit/keymgr/__init__.py similarity index 100% rename from nova/tests/keymgr/__init__.py rename to nova/tests/unit/keymgr/__init__.py diff --git a/nova/tests/keymgr/fake.py b/nova/tests/unit/keymgr/fake.py similarity index 100% rename from nova/tests/keymgr/fake.py rename to nova/tests/unit/keymgr/fake.py diff --git a/nova/tests/keymgr/test_conf_key_mgr.py b/nova/tests/unit/keymgr/test_conf_key_mgr.py similarity index 97% rename from nova/tests/keymgr/test_conf_key_mgr.py rename to nova/tests/unit/keymgr/test_conf_key_mgr.py index 8e2b1abcb916..38bed78acf82 100644 --- a/nova/tests/keymgr/test_conf_key_mgr.py +++ b/nova/tests/unit/keymgr/test_conf_key_mgr.py @@ -23,7 +23,7 @@ from oslo.config import cfg from nova.keymgr import conf_key_mgr from nova.keymgr import key -from nova.tests.keymgr import test_single_key_mgr +from nova.tests.unit.keymgr import test_single_key_mgr CONF = cfg.CONF diff --git a/nova/tests/keymgr/test_key.py b/nova/tests/unit/keymgr/test_key.py similarity index 100% rename from nova/tests/keymgr/test_key.py rename to nova/tests/unit/keymgr/test_key.py diff --git a/nova/tests/keymgr/test_key_mgr.py b/nova/tests/unit/keymgr/test_key_mgr.py similarity index 100% rename from nova/tests/keymgr/test_key_mgr.py rename to nova/tests/unit/keymgr/test_key_mgr.py diff --git a/nova/tests/keymgr/test_mock_key_mgr.py b/nova/tests/unit/keymgr/test_mock_key_mgr.py similarity index 98% rename from nova/tests/keymgr/test_mock_key_mgr.py rename to nova/tests/unit/keymgr/test_mock_key_mgr.py index 3d56da08a45f..9d0c2174d1c4 100644 --- a/nova/tests/keymgr/test_mock_key_mgr.py +++ b/nova/tests/unit/keymgr/test_mock_key_mgr.py @@ -23,7 +23,7 @@ from nova import context from nova import exception from nova.keymgr import key as keymgr_key from nova.keymgr import mock_key_mgr -from nova.tests.keymgr import test_key_mgr +from nova.tests.unit.keymgr import test_key_mgr class MockKeyManagerTestCase(test_key_mgr.KeyManagerTestCase): diff --git a/nova/tests/keymgr/test_not_implemented_key_mgr.py b/nova/tests/unit/keymgr/test_not_implemented_key_mgr.py similarity index 97% rename from nova/tests/keymgr/test_not_implemented_key_mgr.py rename to nova/tests/unit/keymgr/test_not_implemented_key_mgr.py index 0419dfc5f05a..8e6d0c8a275d 100644 --- a/nova/tests/keymgr/test_not_implemented_key_mgr.py +++ b/nova/tests/unit/keymgr/test_not_implemented_key_mgr.py @@ -18,7 +18,7 @@ Test cases for the not implemented key manager. """ from nova.keymgr import not_implemented_key_mgr -from nova.tests.keymgr import test_key_mgr +from nova.tests.unit.keymgr import test_key_mgr class NotImplementedKeyManagerTestCase(test_key_mgr.KeyManagerTestCase): diff --git a/nova/tests/keymgr/test_single_key_mgr.py b/nova/tests/unit/keymgr/test_single_key_mgr.py similarity index 97% rename from nova/tests/keymgr/test_single_key_mgr.py rename to nova/tests/unit/keymgr/test_single_key_mgr.py index d6e71a644185..3cf1de8da278 100644 --- a/nova/tests/keymgr/test_single_key_mgr.py +++ b/nova/tests/unit/keymgr/test_single_key_mgr.py @@ -22,7 +22,7 @@ import array from nova import exception from nova.keymgr import key from nova.keymgr import single_key_mgr -from nova.tests.keymgr import test_mock_key_mgr +from nova.tests.unit.keymgr import test_mock_key_mgr class SingleKeyManagerTestCase(test_mock_key_mgr.MockKeyManagerTestCase): diff --git a/nova/tests/matchers.py b/nova/tests/unit/matchers.py similarity index 100% rename from nova/tests/matchers.py rename to nova/tests/unit/matchers.py diff --git a/nova/tests/monkey_patch_example/__init__.py b/nova/tests/unit/monkey_patch_example/__init__.py similarity index 100% rename from nova/tests/monkey_patch_example/__init__.py rename to nova/tests/unit/monkey_patch_example/__init__.py diff --git a/nova/tests/monkey_patch_example/example_a.py b/nova/tests/unit/monkey_patch_example/example_a.py similarity index 100% rename from nova/tests/monkey_patch_example/example_a.py rename to nova/tests/unit/monkey_patch_example/example_a.py diff --git a/nova/tests/monkey_patch_example/example_b.py b/nova/tests/unit/monkey_patch_example/example_b.py similarity index 100% rename from nova/tests/monkey_patch_example/example_b.py rename to nova/tests/unit/monkey_patch_example/example_b.py diff --git a/nova/tests/network/__init__.py b/nova/tests/unit/network/__init__.py similarity index 100% rename from nova/tests/network/__init__.py rename to nova/tests/unit/network/__init__.py diff --git a/nova/tests/network/security_group/__init__.py b/nova/tests/unit/network/security_group/__init__.py similarity index 100% rename from nova/tests/network/security_group/__init__.py rename to nova/tests/unit/network/security_group/__init__.py diff --git a/nova/tests/network/security_group/test_neutron_driver.py b/nova/tests/unit/network/security_group/test_neutron_driver.py similarity index 100% rename from nova/tests/network/security_group/test_neutron_driver.py rename to nova/tests/unit/network/security_group/test_neutron_driver.py diff --git a/nova/tests/network/test_api.py b/nova/tests/unit/network/test_api.py similarity index 99% rename from nova/tests/network/test_api.py rename to nova/tests/unit/network/test_api.py index 2df0b294a2cc..efc7d29a4ac5 100644 --- a/nova/tests/network/test_api.py +++ b/nova/tests/unit/network/test_api.py @@ -34,10 +34,10 @@ from nova import objects from nova.objects import fields from nova import policy from nova import test -from nova.tests import fake_instance -from nova.tests.objects import test_fixed_ip -from nova.tests.objects import test_flavor -from nova.tests.objects import test_virtual_interface +from nova.tests.unit import fake_instance +from nova.tests.unit.objects import test_fixed_ip +from nova.tests.unit.objects import test_flavor +from nova.tests.unit.objects import test_virtual_interface from nova import utils FAKE_UUID = 'a47ae74e-ab08-547f-9eee-ffd23fc46c16' diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/unit/network/test_linux_net.py similarity index 100% rename from nova/tests/network/test_linux_net.py rename to nova/tests/unit/network/test_linux_net.py diff --git a/nova/tests/network/test_manager.py b/nova/tests/unit/network/test_manager.py similarity index 99% rename from nova/tests/network/test_manager.py rename to nova/tests/unit/network/test_manager.py index 06ac18c8d76d..776160cd0c3e 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/unit/network/test_manager.py @@ -43,14 +43,14 @@ from nova.objects import virtual_interface as vif_obj from nova.openstack.common import log as logging from nova import quota from nova import test -from nova.tests import fake_instance -from nova.tests import fake_ldap -from nova.tests import fake_network -from nova.tests import matchers -from nova.tests.objects import test_fixed_ip -from nova.tests.objects import test_floating_ip -from nova.tests.objects import test_network -from nova.tests.objects import test_service +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_ldap +from nova.tests.unit import fake_network +from nova.tests.unit import matchers +from nova.tests.unit.objects import test_fixed_ip +from nova.tests.unit.objects import test_floating_ip +from nova.tests.unit.objects import test_network +from nova.tests.unit.objects import test_service from nova import utils CONF = cfg.CONF diff --git a/nova/tests/network/test_network_info.py b/nova/tests/unit/network/test_network_info.py similarity index 99% rename from nova/tests/network/test_network_info.py rename to nova/tests/unit/network/test_network_info.py index aa5413efcbb0..456d4c3a18ab 100644 --- a/nova/tests/network/test_network_info.py +++ b/nova/tests/unit/network/test_network_info.py @@ -17,7 +17,7 @@ from nova import exception from nova.network import model from nova import test -from nova.tests import fake_network_cache_model +from nova.tests.unit import fake_network_cache_model from nova.virt import netutils diff --git a/nova/tests/network/test_neutronv2.py b/nova/tests/unit/network/test_neutronv2.py similarity index 99% rename from nova/tests/network/test_neutronv2.py rename to nova/tests/unit/network/test_neutronv2.py index f462fa8fa878..a34c8cc8994d 100644 --- a/nova/tests/network/test_neutronv2.py +++ b/nova/tests/unit/network/test_neutronv2.py @@ -40,7 +40,7 @@ from nova.pci import manager as pci_manager from nova.pci import whitelist as pci_whitelist from nova import policy from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance from nova import utils CONF = cfg.CONF diff --git a/nova/tests/network/test_rpcapi.py b/nova/tests/unit/network/test_rpcapi.py similarity index 99% rename from nova/tests/network/test_rpcapi.py rename to nova/tests/unit/network/test_rpcapi.py index f33128cae343..f24fdd02d2d6 100644 --- a/nova/tests/network/test_rpcapi.py +++ b/nova/tests/unit/network/test_rpcapi.py @@ -24,7 +24,7 @@ from oslo.config import cfg from nova import context from nova.network import rpcapi as network_rpcapi from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance CONF = cfg.CONF diff --git a/nova/tests/objects/__init__.py b/nova/tests/unit/objects/__init__.py similarity index 100% rename from nova/tests/objects/__init__.py rename to nova/tests/unit/objects/__init__.py diff --git a/nova/tests/objects/test_agent.py b/nova/tests/unit/objects/test_agent.py similarity index 98% rename from nova/tests/objects/test_agent.py rename to nova/tests/unit/objects/test_agent.py index d8d8a413566e..86be0cd361a6 100644 --- a/nova/tests/objects/test_agent.py +++ b/nova/tests/unit/objects/test_agent.py @@ -16,7 +16,7 @@ import mock from nova import exception from nova.objects import agent as agent_obj -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects fake_agent = { diff --git a/nova/tests/objects/test_aggregate.py b/nova/tests/unit/objects/test_aggregate.py similarity index 98% rename from nova/tests/objects/test_aggregate.py rename to nova/tests/unit/objects/test_aggregate.py index 9492b26cf8f5..67ea514bc7ed 100644 --- a/nova/tests/objects/test_aggregate.py +++ b/nova/tests/unit/objects/test_aggregate.py @@ -18,8 +18,8 @@ from oslo.utils import timeutils from nova import db from nova import exception from nova.objects import aggregate -from nova.tests import fake_notifier -from nova.tests.objects import test_objects +from nova.tests.unit import fake_notifier +from nova.tests.unit.objects import test_objects NOW = timeutils.utcnow().replace(microsecond=0) diff --git a/nova/tests/objects/test_bandwidth_usage.py b/nova/tests/unit/objects/test_bandwidth_usage.py similarity index 98% rename from nova/tests/objects/test_bandwidth_usage.py rename to nova/tests/unit/objects/test_bandwidth_usage.py index d7662210b669..933e7ff643c1 100644 --- a/nova/tests/objects/test_bandwidth_usage.py +++ b/nova/tests/unit/objects/test_bandwidth_usage.py @@ -20,7 +20,7 @@ from nova import context from nova import db from nova.objects import bandwidth_usage from nova import test -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects class _TestBandwidthUsage(test.TestCase): diff --git a/nova/tests/objects/test_block_device.py b/nova/tests/unit/objects/test_block_device.py similarity index 98% rename from nova/tests/objects/test_block_device.py rename to nova/tests/unit/objects/test_block_device.py index 03b7fc275641..32bb51fe9672 100644 --- a/nova/tests/objects/test_block_device.py +++ b/nova/tests/unit/objects/test_block_device.py @@ -21,9 +21,9 @@ from nova import db from nova import exception from nova import objects from nova.objects import block_device as block_device_obj -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests.objects import test_objects +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit.objects import test_objects class _TestBlockDeviceMappingObject(object): diff --git a/nova/tests/objects/test_compute_node.py b/nova/tests/unit/objects/test_compute_node.py similarity index 99% rename from nova/tests/objects/test_compute_node.py rename to nova/tests/unit/objects/test_compute_node.py index 49bb9684969c..0bbf8050c8db 100644 --- a/nova/tests/objects/test_compute_node.py +++ b/nova/tests/unit/objects/test_compute_node.py @@ -21,7 +21,7 @@ from nova import exception from nova.objects import compute_node from nova.objects import hv_spec from nova.objects import service -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects from nova.virt import hardware NOW = timeutils.utcnow().replace(microsecond=0) diff --git a/nova/tests/objects/test_dns_domain.py b/nova/tests/unit/objects/test_dns_domain.py similarity index 98% rename from nova/tests/objects/test_dns_domain.py rename to nova/tests/unit/objects/test_dns_domain.py index aff1a0eb9290..45f42ff2371a 100644 --- a/nova/tests/objects/test_dns_domain.py +++ b/nova/tests/unit/objects/test_dns_domain.py @@ -16,7 +16,7 @@ import mock from nova import db from nova.objects import dns_domain -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects fake_dnsd = { diff --git a/nova/tests/objects/test_ec2.py b/nova/tests/unit/objects/test_ec2.py similarity index 99% rename from nova/tests/objects/test_ec2.py rename to nova/tests/unit/objects/test_ec2.py index 9b3dc38b1806..cc79cb1e4922 100644 --- a/nova/tests/objects/test_ec2.py +++ b/nova/tests/unit/objects/test_ec2.py @@ -16,7 +16,7 @@ import mock from nova import db from nova.objects import ec2 as ec2_obj -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects fake_map = { diff --git a/nova/tests/objects/test_external_event.py b/nova/tests/unit/objects/test_external_event.py similarity index 97% rename from nova/tests/objects/test_external_event.py rename to nova/tests/unit/objects/test_external_event.py index 4674e3d315fe..c3e319243f9b 100644 --- a/nova/tests/objects/test_external_event.py +++ b/nova/tests/unit/objects/test_external_event.py @@ -15,7 +15,7 @@ import mock from nova.objects import external_event as external_event_obj -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects class _TestInstanceExternalEventObject(object): diff --git a/nova/tests/objects/test_fields.py b/nova/tests/unit/objects/test_fields.py similarity index 100% rename from nova/tests/objects/test_fields.py rename to nova/tests/unit/objects/test_fields.py diff --git a/nova/tests/objects/test_fixed_ip.py b/nova/tests/unit/objects/test_fixed_ip.py similarity index 99% rename from nova/tests/objects/test_fixed_ip.py rename to nova/tests/unit/objects/test_fixed_ip.py index a0e1b3aa1623..116827416db9 100644 --- a/nova/tests/objects/test_fixed_ip.py +++ b/nova/tests/unit/objects/test_fixed_ip.py @@ -21,9 +21,9 @@ from oslo.utils import timeutils from nova import exception from nova.objects import fixed_ip -from nova.tests import fake_instance -from nova.tests.objects import test_network -from nova.tests.objects import test_objects +from nova.tests.unit import fake_instance +from nova.tests.unit.objects import test_network +from nova.tests.unit.objects import test_objects fake_fixed_ip = { diff --git a/nova/tests/objects/test_flavor.py b/nova/tests/unit/objects/test_flavor.py similarity index 99% rename from nova/tests/objects/test_flavor.py rename to nova/tests/unit/objects/test_flavor.py index 134d767f51ef..a7189d4caaa3 100644 --- a/nova/tests/objects/test_flavor.py +++ b/nova/tests/unit/objects/test_flavor.py @@ -17,7 +17,7 @@ import mock from nova import db from nova import exception from nova.objects import flavor as flavor_obj -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects fake_flavor = { diff --git a/nova/tests/objects/test_floating_ip.py b/nova/tests/unit/objects/test_floating_ip.py similarity index 98% rename from nova/tests/objects/test_floating_ip.py rename to nova/tests/unit/objects/test_floating_ip.py index 39ac95a81be0..8454505bb073 100644 --- a/nova/tests/objects/test_floating_ip.py +++ b/nova/tests/unit/objects/test_floating_ip.py @@ -18,9 +18,9 @@ import netaddr from nova import exception from nova import objects from nova.objects import floating_ip -from nova.tests.objects import test_fixed_ip -from nova.tests.objects import test_network -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_fixed_ip +from nova.tests.unit.objects import test_network +from nova.tests.unit.objects import test_objects fake_floating_ip = { 'created_at': None, diff --git a/nova/tests/objects/test_hv_spec.py b/nova/tests/unit/objects/test_hv_spec.py similarity index 97% rename from nova/tests/objects/test_hv_spec.py rename to nova/tests/unit/objects/test_hv_spec.py index 589fb418c88a..94782cd3a17e 100644 --- a/nova/tests/objects/test_hv_spec.py +++ b/nova/tests/unit/objects/test_hv_spec.py @@ -17,7 +17,7 @@ from nova.compute import arch from nova.compute import hvtype from nova.compute import vm_mode from nova import objects -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects spec_dict = { diff --git a/nova/tests/objects/test_instance.py b/nova/tests/unit/objects/test_instance.py similarity index 99% rename from nova/tests/objects/test_instance.py rename to nova/tests/unit/objects/test_instance.py index c17061dd61f1..b24fd0143dbe 100644 --- a/nova/tests/objects/test_instance.py +++ b/nova/tests/unit/objects/test_instance.py @@ -33,14 +33,14 @@ from nova.objects import instance_numa_topology from nova.objects import pci_device from nova.objects import security_group from nova import test -from nova.tests.api.openstack import fakes -from nova.tests import fake_instance -from nova.tests.objects import test_instance_fault -from nova.tests.objects import test_instance_info_cache -from nova.tests.objects import test_instance_numa_topology -from nova.tests.objects import test_instance_pci_requests -from nova.tests.objects import test_objects -from nova.tests.objects import test_security_group +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit.objects import test_instance_fault +from nova.tests.unit.objects import test_instance_info_cache +from nova.tests.unit.objects import test_instance_numa_topology +from nova.tests.unit.objects import test_instance_pci_requests +from nova.tests.unit.objects import test_objects +from nova.tests.unit.objects import test_security_group from nova import utils diff --git a/nova/tests/objects/test_instance_action.py b/nova/tests/unit/objects/test_instance_action.py similarity index 99% rename from nova/tests/objects/test_instance_action.py rename to nova/tests/unit/objects/test_instance_action.py index 37804035dbfe..488ba6fa2a63 100644 --- a/nova/tests/objects/test_instance_action.py +++ b/nova/tests/unit/objects/test_instance_action.py @@ -20,7 +20,7 @@ from oslo.utils import timeutils from nova import db from nova.objects import instance_action from nova import test -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects NOW = timeutils.utcnow().replace(microsecond=0) diff --git a/nova/tests/objects/test_instance_fault.py b/nova/tests/unit/objects/test_instance_fault.py similarity index 99% rename from nova/tests/objects/test_instance_fault.py rename to nova/tests/unit/objects/test_instance_fault.py index f1bf217d8034..97716d42d3c2 100644 --- a/nova/tests/objects/test_instance_fault.py +++ b/nova/tests/unit/objects/test_instance_fault.py @@ -17,7 +17,7 @@ import mock from nova import db from nova import exception from nova.objects import instance_fault -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects fake_faults = { diff --git a/nova/tests/objects/test_instance_group.py b/nova/tests/unit/objects/test_instance_group.py similarity index 99% rename from nova/tests/objects/test_instance_group.py rename to nova/tests/unit/objects/test_instance_group.py index 77efcd014bde..0e20f541454a 100644 --- a/nova/tests/objects/test_instance_group.py +++ b/nova/tests/unit/objects/test_instance_group.py @@ -19,9 +19,9 @@ from nova import context from nova import db from nova import exception from nova.objects import instance_group -from nova.tests import fake_notifier -from nova.tests.objects import test_objects -from nova.tests import utils as tests_utils +from nova.tests.unit import fake_notifier +from nova.tests.unit.objects import test_objects +from nova.tests.unit import utils as tests_utils class _TestInstanceGroupObjects(object): diff --git a/nova/tests/objects/test_instance_info_cache.py b/nova/tests/unit/objects/test_instance_info_cache.py similarity index 98% rename from nova/tests/objects/test_instance_info_cache.py rename to nova/tests/unit/objects/test_instance_info_cache.py index f1e75ad87c3e..9a727720306c 100644 --- a/nova/tests/objects/test_instance_info_cache.py +++ b/nova/tests/unit/objects/test_instance_info_cache.py @@ -18,7 +18,7 @@ from nova import db from nova import exception from nova.network import model as network_model from nova.objects import instance_info_cache -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects fake_info_cache = { diff --git a/nova/tests/objects/test_instance_numa_topology.py b/nova/tests/unit/objects/test_instance_numa_topology.py similarity index 98% rename from nova/tests/objects/test_instance_numa_topology.py rename to nova/tests/unit/objects/test_instance_numa_topology.py index 1f9f3b40fec9..82c34ccda279 100644 --- a/nova/tests/objects/test_instance_numa_topology.py +++ b/nova/tests/unit/objects/test_instance_numa_topology.py @@ -16,7 +16,7 @@ import mock from nova import exception from nova import objects -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects from nova.virt import hardware fake_numa_topology = hardware.VirtNUMAInstanceTopology( diff --git a/nova/tests/objects/test_instance_pci_requests.py b/nova/tests/unit/objects/test_instance_pci_requests.py similarity index 99% rename from nova/tests/objects/test_instance_pci_requests.py rename to nova/tests/unit/objects/test_instance_pci_requests.py index e688a31e6304..541d503ff435 100644 --- a/nova/tests/objects/test_instance_pci_requests.py +++ b/nova/tests/unit/objects/test_instance_pci_requests.py @@ -14,7 +14,7 @@ import mock from oslo.serialization import jsonutils from nova import objects -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects FAKE_UUID = '79a53d6b-0893-4838-a971-15f4f382e7c2' diff --git a/nova/tests/objects/test_keypair.py b/nova/tests/unit/objects/test_keypair.py similarity index 98% rename from nova/tests/objects/test_keypair.py rename to nova/tests/unit/objects/test_keypair.py index 6ac66b04aeaa..da0d52831dc5 100644 --- a/nova/tests/objects/test_keypair.py +++ b/nova/tests/unit/objects/test_keypair.py @@ -17,7 +17,7 @@ from oslo.utils import timeutils from nova import db from nova import exception from nova.objects import keypair -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects NOW = timeutils.utcnow().replace(microsecond=0) fake_keypair = { diff --git a/nova/tests/objects/test_migration.py b/nova/tests/unit/objects/test_migration.py similarity index 98% rename from nova/tests/objects/test_migration.py rename to nova/tests/unit/objects/test_migration.py index 8d6d9c81133f..eeb57db618a3 100644 --- a/nova/tests/objects/test_migration.py +++ b/nova/tests/unit/objects/test_migration.py @@ -18,8 +18,8 @@ from nova import context from nova import db from nova import exception from nova.objects import migration -from nova.tests import fake_instance -from nova.tests.objects import test_objects +from nova.tests.unit import fake_instance +from nova.tests.unit.objects import test_objects NOW = timeutils.utcnow().replace(microsecond=0) diff --git a/nova/tests/objects/test_network.py b/nova/tests/unit/objects/test_network.py similarity index 99% rename from nova/tests/objects/test_network.py rename to nova/tests/unit/objects/test_network.py index 9c654f33a0a6..0ba6ed06e93f 100644 --- a/nova/tests/objects/test_network.py +++ b/nova/tests/unit/objects/test_network.py @@ -16,7 +16,7 @@ import mock import netaddr from nova.objects import network as network_obj -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects fake_network = { diff --git a/nova/tests/objects/test_network_request.py b/nova/tests/unit/objects/test_network_request.py similarity index 98% rename from nova/tests/objects/test_network_request.py rename to nova/tests/unit/objects/test_network_request.py index 4d74994e6f5d..bbe6010226e5 100644 --- a/nova/tests/objects/test_network_request.py +++ b/nova/tests/unit/objects/test_network_request.py @@ -15,7 +15,7 @@ import mock from nova import objects -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects FAKE_UUID = '0C5C9AD2-F967-4E92-A7F3-24410F697440' diff --git a/nova/tests/objects/test_objects.py b/nova/tests/unit/objects/test_objects.py similarity index 99% rename from nova/tests/objects/test_objects.py rename to nova/tests/unit/objects/test_objects.py index c26996f52e0b..f7eb53808b47 100644 --- a/nova/tests/objects/test_objects.py +++ b/nova/tests/unit/objects/test_objects.py @@ -34,7 +34,7 @@ from nova.objects import fields from nova.openstack.common import log from nova import rpc from nova import test -from nova.tests import fake_notifier +from nova.tests.unit import fake_notifier from nova import utils diff --git a/nova/tests/objects/test_pci_device.py b/nova/tests/unit/objects/test_pci_device.py similarity index 99% rename from nova/tests/objects/test_pci_device.py rename to nova/tests/unit/objects/test_pci_device.py index 521753a1b08a..804709a2629a 100644 --- a/nova/tests/objects/test_pci_device.py +++ b/nova/tests/unit/objects/test_pci_device.py @@ -19,7 +19,7 @@ from nova import context from nova import db from nova.objects import instance from nova.objects import pci_device -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects dev_dict = { 'compute_node_id': 1, diff --git a/nova/tests/objects/test_quotas.py b/nova/tests/unit/objects/test_quotas.py similarity index 98% rename from nova/tests/objects/test_quotas.py rename to nova/tests/unit/objects/test_quotas.py index c2a9892a7d7a..02781a7cd5f9 100644 --- a/nova/tests/objects/test_quotas.py +++ b/nova/tests/unit/objects/test_quotas.py @@ -18,8 +18,8 @@ from nova import context from nova.objects import quotas as quotas_obj from nova import quota from nova import test -from nova.tests import fake_instance -from nova.tests.objects import test_objects +from nova.tests.unit import fake_instance +from nova.tests.unit.objects import test_objects QUOTAS = quota.QUOTAS diff --git a/nova/tests/objects/test_security_group.py b/nova/tests/unit/objects/test_security_group.py similarity index 99% rename from nova/tests/objects/test_security_group.py rename to nova/tests/unit/objects/test_security_group.py index e957017db33c..91966d06761e 100644 --- a/nova/tests/objects/test_security_group.py +++ b/nova/tests/unit/objects/test_security_group.py @@ -15,7 +15,7 @@ from nova import db from nova.objects import instance from nova.objects import security_group -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects fake_secgroup = { diff --git a/nova/tests/objects/test_security_group_rule.py b/nova/tests/unit/objects/test_security_group_rule.py similarity index 97% rename from nova/tests/objects/test_security_group_rule.py rename to nova/tests/unit/objects/test_security_group_rule.py index e2c52944036e..481be189a524 100644 --- a/nova/tests/objects/test_security_group_rule.py +++ b/nova/tests/unit/objects/test_security_group_rule.py @@ -17,8 +17,8 @@ import mock from nova import db from nova import exception from nova import objects -from nova.tests.objects import test_objects -from nova.tests.objects import test_security_group +from nova.tests.unit.objects import test_objects +from nova.tests.unit.objects import test_security_group fake_rule = { 'created_at': None, diff --git a/nova/tests/objects/test_service.py b/nova/tests/unit/objects/test_service.py similarity index 98% rename from nova/tests/objects/test_service.py rename to nova/tests/unit/objects/test_service.py index 7494dc83bf9c..d8a72056a5e2 100644 --- a/nova/tests/objects/test_service.py +++ b/nova/tests/unit/objects/test_service.py @@ -19,8 +19,8 @@ from nova import db from nova import exception from nova.objects import aggregate from nova.objects import service -from nova.tests.objects import test_compute_node -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_compute_node +from nova.tests.unit.objects import test_objects NOW = timeutils.utcnow().replace(microsecond=0) fake_service = { diff --git a/nova/tests/objects/test_virtual_interface.py b/nova/tests/unit/objects/test_virtual_interface.py similarity index 98% rename from nova/tests/objects/test_virtual_interface.py rename to nova/tests/unit/objects/test_virtual_interface.py index 07e60c76f8be..6c416315c457 100644 --- a/nova/tests/objects/test_virtual_interface.py +++ b/nova/tests/unit/objects/test_virtual_interface.py @@ -16,7 +16,7 @@ import mock from nova import db from nova.objects import virtual_interface as vif_obj -from nova.tests.objects import test_objects +from nova.tests.unit.objects import test_objects fake_vif = { diff --git a/nova/tests/pci/__init__.py b/nova/tests/unit/pci/__init__.py similarity index 100% rename from nova/tests/pci/__init__.py rename to nova/tests/unit/pci/__init__.py diff --git a/nova/tests/pci/fakes.py b/nova/tests/unit/pci/fakes.py similarity index 100% rename from nova/tests/pci/fakes.py rename to nova/tests/unit/pci/fakes.py diff --git a/nova/tests/pci/test_device.py b/nova/tests/unit/pci/test_device.py similarity index 100% rename from nova/tests/pci/test_device.py rename to nova/tests/unit/pci/test_device.py diff --git a/nova/tests/pci/test_devspec.py b/nova/tests/unit/pci/test_devspec.py similarity index 100% rename from nova/tests/pci/test_devspec.py rename to nova/tests/unit/pci/test_devspec.py diff --git a/nova/tests/pci/test_manager.py b/nova/tests/unit/pci/test_manager.py similarity index 99% rename from nova/tests/pci/test_manager.py rename to nova/tests/unit/pci/test_manager.py index e37fd5b067f0..787ea41bd27e 100644 --- a/nova/tests/pci/test_manager.py +++ b/nova/tests/unit/pci/test_manager.py @@ -26,8 +26,8 @@ from nova import objects from nova.pci import device from nova.pci import manager from nova import test -from nova.tests.api.openstack import fakes -from nova.tests.pci import fakes as pci_fakes +from nova.tests.unit.api.openstack import fakes +from nova.tests.unit.pci import fakes as pci_fakes fake_pci = { diff --git a/nova/tests/pci/test_request.py b/nova/tests/unit/pci/test_request.py similarity index 100% rename from nova/tests/pci/test_request.py rename to nova/tests/unit/pci/test_request.py diff --git a/nova/tests/pci/test_stats.py b/nova/tests/unit/pci/test_stats.py similarity index 99% rename from nova/tests/pci/test_stats.py rename to nova/tests/unit/pci/test_stats.py index 9a4d1afd1d52..6960cf93cf91 100644 --- a/nova/tests/pci/test_stats.py +++ b/nova/tests/unit/pci/test_stats.py @@ -21,7 +21,7 @@ from nova import objects from nova.pci import stats from nova.pci import whitelist from nova import test -from nova.tests.pci import fakes +from nova.tests.unit.pci import fakes fake_pci_1 = { 'compute_node_id': 1, diff --git a/nova/tests/pci/test_utils.py b/nova/tests/unit/pci/test_utils.py similarity index 100% rename from nova/tests/pci/test_utils.py rename to nova/tests/unit/pci/test_utils.py diff --git a/nova/tests/pci/test_whitelist.py b/nova/tests/unit/pci/test_whitelist.py similarity index 100% rename from nova/tests/pci/test_whitelist.py rename to nova/tests/unit/pci/test_whitelist.py diff --git a/nova/tests/policy_fixture.py b/nova/tests/unit/policy_fixture.py similarity index 98% rename from nova/tests/policy_fixture.py rename to nova/tests/unit/policy_fixture.py index 18010d67569f..cf288752402b 100644 --- a/nova/tests/policy_fixture.py +++ b/nova/tests/unit/policy_fixture.py @@ -20,7 +20,7 @@ from oslo.serialization import jsonutils from nova.openstack.common import policy as common_policy import nova.policy -from nova.tests import fake_policy +from nova.tests.unit import fake_policy CONF = cfg.CONF diff --git a/nova/tests/scheduler/__init__.py b/nova/tests/unit/scheduler/__init__.py similarity index 100% rename from nova/tests/scheduler/__init__.py rename to nova/tests/unit/scheduler/__init__.py diff --git a/nova/tests/scheduler/fakes.py b/nova/tests/unit/scheduler/fakes.py similarity index 100% rename from nova/tests/scheduler/fakes.py rename to nova/tests/unit/scheduler/fakes.py diff --git a/nova/tests/scheduler/filters/__init__.py b/nova/tests/unit/scheduler/filters/__init__.py similarity index 100% rename from nova/tests/scheduler/filters/__init__.py rename to nova/tests/unit/scheduler/filters/__init__.py diff --git a/nova/tests/scheduler/filters/test_affinity_filters.py b/nova/tests/unit/scheduler/filters/test_affinity_filters.py similarity index 99% rename from nova/tests/scheduler/filters/test_affinity_filters.py rename to nova/tests/unit/scheduler/filters/test_affinity_filters.py index ba6f58bc37ff..d47d10a57d7d 100644 --- a/nova/tests/scheduler/filters/test_affinity_filters.py +++ b/nova/tests/unit/scheduler/filters/test_affinity_filters.py @@ -15,7 +15,7 @@ from oslo.config import cfg from nova.scheduler.filters import affinity_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes CONF = cfg.CONF diff --git a/nova/tests/scheduler/filters/test_aggregate_image_properties_isolation_filters.py b/nova/tests/unit/scheduler/filters/test_aggregate_image_properties_isolation_filters.py similarity index 99% rename from nova/tests/scheduler/filters/test_aggregate_image_properties_isolation_filters.py rename to nova/tests/unit/scheduler/filters/test_aggregate_image_properties_isolation_filters.py index b574350f0ea0..b4eacf321fd9 100644 --- a/nova/tests/scheduler/filters/test_aggregate_image_properties_isolation_filters.py +++ b/nova/tests/unit/scheduler/filters/test_aggregate_image_properties_isolation_filters.py @@ -14,7 +14,7 @@ import mock from nova.scheduler.filters import aggregate_image_properties_isolation as aipi from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes @mock.patch('nova.db.aggregate_metadata_get_by_host') diff --git a/nova/tests/scheduler/filters/test_aggregate_instance_extra_specs_filters.py b/nova/tests/unit/scheduler/filters/test_aggregate_instance_extra_specs_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_aggregate_instance_extra_specs_filters.py rename to nova/tests/unit/scheduler/filters/test_aggregate_instance_extra_specs_filters.py index c534b6c3ff26..45128410628c 100644 --- a/nova/tests/scheduler/filters/test_aggregate_instance_extra_specs_filters.py +++ b/nova/tests/unit/scheduler/filters/test_aggregate_instance_extra_specs_filters.py @@ -14,7 +14,7 @@ import mock from nova.scheduler.filters import aggregate_instance_extra_specs as agg_specs from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes @mock.patch('nova.db.aggregate_metadata_get_by_host') diff --git a/nova/tests/scheduler/filters/test_aggregate_multitenancy_isolation_filters.py b/nova/tests/unit/scheduler/filters/test_aggregate_multitenancy_isolation_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_aggregate_multitenancy_isolation_filters.py rename to nova/tests/unit/scheduler/filters/test_aggregate_multitenancy_isolation_filters.py index 5691f40a2ac6..70fe5e2d41f2 100644 --- a/nova/tests/scheduler/filters/test_aggregate_multitenancy_isolation_filters.py +++ b/nova/tests/unit/scheduler/filters/test_aggregate_multitenancy_isolation_filters.py @@ -14,7 +14,7 @@ import mock from nova.scheduler.filters import aggregate_multitenancy_isolation as ami from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes @mock.patch('nova.db.aggregate_metadata_get_by_host') diff --git a/nova/tests/scheduler/filters/test_availability_zone_filters.py b/nova/tests/unit/scheduler/filters/test_availability_zone_filters.py similarity index 97% rename from nova/tests/scheduler/filters/test_availability_zone_filters.py rename to nova/tests/unit/scheduler/filters/test_availability_zone_filters.py index ca4a4cb589c2..3cf860dfb2b8 100644 --- a/nova/tests/scheduler/filters/test_availability_zone_filters.py +++ b/nova/tests/unit/scheduler/filters/test_availability_zone_filters.py @@ -14,7 +14,7 @@ import mock from nova.scheduler.filters import availability_zone_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes @mock.patch('nova.db.aggregate_metadata_get_by_host') diff --git a/nova/tests/scheduler/filters/test_compute_capabilities_filters.py b/nova/tests/unit/scheduler/filters/test_compute_capabilities_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_compute_capabilities_filters.py rename to nova/tests/unit/scheduler/filters/test_compute_capabilities_filters.py index 7f54d818ad62..506b207d2ab5 100644 --- a/nova/tests/scheduler/filters/test_compute_capabilities_filters.py +++ b/nova/tests/unit/scheduler/filters/test_compute_capabilities_filters.py @@ -14,7 +14,7 @@ import six from nova.scheduler.filters import compute_capabilities_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestComputeCapabilitiesFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_compute_filters.py b/nova/tests/unit/scheduler/filters/test_compute_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_compute_filters.py rename to nova/tests/unit/scheduler/filters/test_compute_filters.py index beab03b952fe..7e31e1ef5a7c 100644 --- a/nova/tests/scheduler/filters/test_compute_filters.py +++ b/nova/tests/unit/scheduler/filters/test_compute_filters.py @@ -14,7 +14,7 @@ import mock from nova.scheduler.filters import compute_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes @mock.patch('nova.servicegroup.API.service_is_up') diff --git a/nova/tests/scheduler/filters/test_core_filters.py b/nova/tests/unit/scheduler/filters/test_core_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_core_filters.py rename to nova/tests/unit/scheduler/filters/test_core_filters.py index 44e74cb8119b..cfe2c51be67b 100644 --- a/nova/tests/scheduler/filters/test_core_filters.py +++ b/nova/tests/unit/scheduler/filters/test_core_filters.py @@ -14,7 +14,7 @@ import mock from nova.scheduler.filters import core_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestCoreFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_disk_filters.py b/nova/tests/unit/scheduler/filters/test_disk_filters.py similarity index 99% rename from nova/tests/scheduler/filters/test_disk_filters.py rename to nova/tests/unit/scheduler/filters/test_disk_filters.py index 8ae7b86fa61c..14e932873251 100644 --- a/nova/tests/scheduler/filters/test_disk_filters.py +++ b/nova/tests/unit/scheduler/filters/test_disk_filters.py @@ -14,7 +14,7 @@ import mock from nova.scheduler.filters import disk_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestDiskFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_extra_specs_ops.py b/nova/tests/unit/scheduler/filters/test_extra_specs_ops.py similarity index 100% rename from nova/tests/scheduler/filters/test_extra_specs_ops.py rename to nova/tests/unit/scheduler/filters/test_extra_specs_ops.py diff --git a/nova/tests/scheduler/filters/test_image_props_filters.py b/nova/tests/unit/scheduler/filters/test_image_props_filters.py similarity index 99% rename from nova/tests/scheduler/filters/test_image_props_filters.py rename to nova/tests/unit/scheduler/filters/test_image_props_filters.py index 72102b82eff3..ee3a175dcece 100644 --- a/nova/tests/scheduler/filters/test_image_props_filters.py +++ b/nova/tests/unit/scheduler/filters/test_image_props_filters.py @@ -15,7 +15,7 @@ from nova.compute import hvtype from nova.compute import vm_mode from nova.scheduler.filters import image_props_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes from nova import utils diff --git a/nova/tests/scheduler/filters/test_io_ops_filters.py b/nova/tests/unit/scheduler/filters/test_io_ops_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_io_ops_filters.py rename to nova/tests/unit/scheduler/filters/test_io_ops_filters.py index b84c25b9b252..c558b7711f11 100644 --- a/nova/tests/scheduler/filters/test_io_ops_filters.py +++ b/nova/tests/unit/scheduler/filters/test_io_ops_filters.py @@ -15,7 +15,7 @@ import mock from nova.scheduler.filters import io_ops_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestNumInstancesFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_isolated_hosts_filter.py b/nova/tests/unit/scheduler/filters/test_isolated_hosts_filter.py similarity index 99% rename from nova/tests/scheduler/filters/test_isolated_hosts_filter.py rename to nova/tests/unit/scheduler/filters/test_isolated_hosts_filter.py index 05e26f84ea67..343c86264c5f 100644 --- a/nova/tests/scheduler/filters/test_isolated_hosts_filter.py +++ b/nova/tests/unit/scheduler/filters/test_isolated_hosts_filter.py @@ -12,7 +12,7 @@ from nova.scheduler.filters import isolated_hosts_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestIsolatedHostsFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_json_filters.py b/nova/tests/unit/scheduler/filters/test_json_filters.py similarity index 99% rename from nova/tests/scheduler/filters/test_json_filters.py rename to nova/tests/unit/scheduler/filters/test_json_filters.py index 3c7d924cf68f..c5ddca7520f9 100644 --- a/nova/tests/scheduler/filters/test_json_filters.py +++ b/nova/tests/unit/scheduler/filters/test_json_filters.py @@ -14,7 +14,7 @@ from oslo.serialization import jsonutils from nova.scheduler.filters import json_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestJsonFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_metrics_filters.py b/nova/tests/unit/scheduler/filters/test_metrics_filters.py similarity index 97% rename from nova/tests/scheduler/filters/test_metrics_filters.py rename to nova/tests/unit/scheduler/filters/test_metrics_filters.py index 1693681a1637..9ae0f6c77c02 100644 --- a/nova/tests/scheduler/filters/test_metrics_filters.py +++ b/nova/tests/unit/scheduler/filters/test_metrics_filters.py @@ -12,7 +12,7 @@ from nova.scheduler.filters import metrics_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestMetricsFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_num_instances_filters.py b/nova/tests/unit/scheduler/filters/test_num_instances_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_num_instances_filters.py rename to nova/tests/unit/scheduler/filters/test_num_instances_filters.py index 6fe0153df6e0..3db0eeb6e755 100644 --- a/nova/tests/scheduler/filters/test_num_instances_filters.py +++ b/nova/tests/unit/scheduler/filters/test_num_instances_filters.py @@ -14,7 +14,7 @@ import mock from nova.scheduler.filters import num_instances_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestNumInstancesFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_numa_topology_filters.py b/nova/tests/unit/scheduler/filters/test_numa_topology_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_numa_topology_filters.py rename to nova/tests/unit/scheduler/filters/test_numa_topology_filters.py index 9b52373283d4..3c8eb049c8d5 100644 --- a/nova/tests/scheduler/filters/test_numa_topology_filters.py +++ b/nova/tests/unit/scheduler/filters/test_numa_topology_filters.py @@ -17,8 +17,8 @@ from nova import objects from nova.objects import base as obj_base from nova.scheduler.filters import numa_topology_filter from nova import test -from nova.tests import fake_instance -from nova.tests.scheduler import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit.scheduler import fakes from nova.virt import hardware diff --git a/nova/tests/scheduler/filters/test_pci_passthrough_filters.py b/nova/tests/unit/scheduler/filters/test_pci_passthrough_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_pci_passthrough_filters.py rename to nova/tests/unit/scheduler/filters/test_pci_passthrough_filters.py index 0c7aa29638d9..57dd5ebc02b0 100644 --- a/nova/tests/scheduler/filters/test_pci_passthrough_filters.py +++ b/nova/tests/unit/scheduler/filters/test_pci_passthrough_filters.py @@ -15,7 +15,7 @@ import mock from nova import objects from nova.scheduler.filters import pci_passthrough_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestPCIPassthroughFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_ram_filters.py b/nova/tests/unit/scheduler/filters/test_ram_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_ram_filters.py rename to nova/tests/unit/scheduler/filters/test_ram_filters.py index 880cdac296fc..c7a6df58c972 100644 --- a/nova/tests/scheduler/filters/test_ram_filters.py +++ b/nova/tests/unit/scheduler/filters/test_ram_filters.py @@ -14,7 +14,7 @@ import mock from nova.scheduler.filters import ram_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestRamFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_retry_filters.py b/nova/tests/unit/scheduler/filters/test_retry_filters.py similarity index 97% rename from nova/tests/scheduler/filters/test_retry_filters.py rename to nova/tests/unit/scheduler/filters/test_retry_filters.py index a80f0f587987..04510cd419a4 100644 --- a/nova/tests/scheduler/filters/test_retry_filters.py +++ b/nova/tests/unit/scheduler/filters/test_retry_filters.py @@ -12,7 +12,7 @@ from nova.scheduler.filters import retry_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestRetryFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/filters/test_trusted_filters.py b/nova/tests/unit/scheduler/filters/test_trusted_filters.py similarity index 99% rename from nova/tests/scheduler/filters/test_trusted_filters.py rename to nova/tests/unit/scheduler/filters/test_trusted_filters.py index 4b0b84a4136c..b6afb92ae0a6 100644 --- a/nova/tests/scheduler/filters/test_trusted_filters.py +++ b/nova/tests/unit/scheduler/filters/test_trusted_filters.py @@ -17,7 +17,7 @@ import requests from nova.scheduler.filters import trusted_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes CONF = cfg.CONF diff --git a/nova/tests/scheduler/filters/test_type_filters.py b/nova/tests/unit/scheduler/filters/test_type_filters.py similarity index 98% rename from nova/tests/scheduler/filters/test_type_filters.py rename to nova/tests/unit/scheduler/filters/test_type_filters.py index 981a798fe2b4..3aebba1a7626 100644 --- a/nova/tests/scheduler/filters/test_type_filters.py +++ b/nova/tests/unit/scheduler/filters/test_type_filters.py @@ -14,7 +14,7 @@ import mock from nova.scheduler.filters import type_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class TestTypeFilter(test.NoDBTestCase): diff --git a/nova/tests/scheduler/ironic_fakes.py b/nova/tests/unit/scheduler/ironic_fakes.py similarity index 100% rename from nova/tests/scheduler/ironic_fakes.py rename to nova/tests/unit/scheduler/ironic_fakes.py diff --git a/nova/tests/scheduler/test_baremetal_host_manager.py b/nova/tests/unit/scheduler/test_baremetal_host_manager.py similarity index 100% rename from nova/tests/scheduler/test_baremetal_host_manager.py rename to nova/tests/unit/scheduler/test_baremetal_host_manager.py diff --git a/nova/tests/scheduler/test_caching_scheduler.py b/nova/tests/unit/scheduler/test_caching_scheduler.py similarity index 98% rename from nova/tests/scheduler/test_caching_scheduler.py rename to nova/tests/unit/scheduler/test_caching_scheduler.py index def432328f06..15525f1b2004 100644 --- a/nova/tests/scheduler/test_caching_scheduler.py +++ b/nova/tests/unit/scheduler/test_caching_scheduler.py @@ -19,7 +19,7 @@ from oslo.utils import timeutils from nova import exception from nova.scheduler import caching_scheduler from nova.scheduler import host_manager -from nova.tests.scheduler import test_scheduler +from nova.tests.unit.scheduler import test_scheduler ENABLE_PROFILER = False @@ -172,7 +172,7 @@ class CachingSchedulerTestCase(test_scheduler.SchedulerTestCase): config.trace_filter = pycallgraph.GlobbingFilter(exclude=[ 'pycallgraph.*', 'unittest.*', - 'nova.tests.*', + 'nova.tests.unit.*', ]) graphviz = output.GraphvizOutput(output_file='scheduler.png') diff --git a/nova/tests/scheduler/test_chance_scheduler.py b/nova/tests/unit/scheduler/test_chance_scheduler.py similarity index 99% rename from nova/tests/scheduler/test_chance_scheduler.py rename to nova/tests/unit/scheduler/test_chance_scheduler.py index 3f542e6b88eb..73a4696ec3e4 100644 --- a/nova/tests/scheduler/test_chance_scheduler.py +++ b/nova/tests/unit/scheduler/test_chance_scheduler.py @@ -28,7 +28,7 @@ from nova import db from nova import exception from nova.scheduler import chance from nova.scheduler import driver -from nova.tests.scheduler import test_scheduler +from nova.tests.unit.scheduler import test_scheduler class ChanceSchedulerTestCase(test_scheduler.SchedulerTestCase): diff --git a/nova/tests/scheduler/test_client.py b/nova/tests/unit/scheduler/test_client.py similarity index 100% rename from nova/tests/scheduler/test_client.py rename to nova/tests/unit/scheduler/test_client.py diff --git a/nova/tests/scheduler/test_filter_scheduler.py b/nova/tests/unit/scheduler/test_filter_scheduler.py similarity index 99% rename from nova/tests/scheduler/test_filter_scheduler.py rename to nova/tests/unit/scheduler/test_filter_scheduler.py index f5e6924c10ee..96231ef13af0 100644 --- a/nova/tests/scheduler/test_filter_scheduler.py +++ b/nova/tests/unit/scheduler/test_filter_scheduler.py @@ -29,8 +29,8 @@ from nova.scheduler import filter_scheduler from nova.scheduler import host_manager from nova.scheduler import utils as scheduler_utils from nova.scheduler import weights -from nova.tests.scheduler import fakes -from nova.tests.scheduler import test_scheduler +from nova.tests.unit.scheduler import fakes +from nova.tests.unit.scheduler import test_scheduler def fake_get_filtered_hosts(hosts, filter_properties, index): diff --git a/nova/tests/scheduler/test_filters.py b/nova/tests/unit/scheduler/test_filters.py similarity index 100% rename from nova/tests/scheduler/test_filters.py rename to nova/tests/unit/scheduler/test_filters.py diff --git a/nova/tests/scheduler/test_filters_utils.py b/nova/tests/unit/scheduler/test_filters_utils.py similarity index 100% rename from nova/tests/scheduler/test_filters_utils.py rename to nova/tests/unit/scheduler/test_filters_utils.py diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/unit/scheduler/test_host_filters.py similarity index 97% rename from nova/tests/scheduler/test_host_filters.py rename to nova/tests/unit/scheduler/test_host_filters.py index b3483b169a88..caed938aa31b 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/unit/scheduler/test_host_filters.py @@ -19,7 +19,7 @@ from nova.scheduler import filters from nova.scheduler.filters import all_hosts_filter from nova.scheduler.filters import compute_filter from nova import test -from nova.tests.scheduler import fakes +from nova.tests.unit.scheduler import fakes class HostFiltersTestCase(test.NoDBTestCase): diff --git a/nova/tests/scheduler/test_host_manager.py b/nova/tests/unit/scheduler/test_host_manager.py similarity index 99% rename from nova/tests/scheduler/test_host_manager.py rename to nova/tests/unit/scheduler/test_host_manager.py index ec28e2d95970..b891baf7b417 100644 --- a/nova/tests/scheduler/test_host_manager.py +++ b/nova/tests/unit/scheduler/test_host_manager.py @@ -29,8 +29,8 @@ from nova.i18n import _LW from nova.scheduler import filters from nova.scheduler import host_manager from nova import test -from nova.tests import matchers -from nova.tests.scheduler import fakes +from nova.tests.unit import matchers +from nova.tests.unit.scheduler import fakes from nova import utils from nova.virt import hardware diff --git a/nova/tests/scheduler/test_ironic_host_manager.py b/nova/tests/unit/scheduler/test_ironic_host_manager.py similarity index 99% rename from nova/tests/scheduler/test_ironic_host_manager.py rename to nova/tests/unit/scheduler/test_ironic_host_manager.py index 1a779e76c327..50ec038cb3f5 100644 --- a/nova/tests/scheduler/test_ironic_host_manager.py +++ b/nova/tests/unit/scheduler/test_ironic_host_manager.py @@ -26,7 +26,7 @@ from nova.scheduler import filters from nova.scheduler import host_manager from nova.scheduler import ironic_host_manager from nova import test -from nova.tests.scheduler import ironic_fakes +from nova.tests.unit.scheduler import ironic_fakes class FakeFilterClass1(filters.BaseHostFilter): diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/unit/scheduler/test_rpcapi.py similarity index 100% rename from nova/tests/scheduler/test_rpcapi.py rename to nova/tests/unit/scheduler/test_rpcapi.py diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/unit/scheduler/test_scheduler.py similarity index 98% rename from nova/tests/scheduler/test_scheduler.py rename to nova/tests/unit/scheduler/test_scheduler.py index eb1f3d488855..2435d60343c0 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/unit/scheduler/test_scheduler.py @@ -33,11 +33,11 @@ from nova.scheduler import driver from nova.scheduler import manager from nova import servicegroup from nova import test -from nova.tests import fake_instance -from nova.tests import fake_server_actions -from nova.tests.image import fake as fake_image -from nova.tests.objects import test_instance_fault -from nova.tests.scheduler import fakes +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_server_actions +from nova.tests.unit.image import fake as fake_image +from nova.tests.unit.objects import test_instance_fault +from nova.tests.unit.scheduler import fakes CONF = cfg.CONF diff --git a/nova/tests/scheduler/test_scheduler_options.py b/nova/tests/unit/scheduler/test_scheduler_options.py similarity index 100% rename from nova/tests/scheduler/test_scheduler_options.py rename to nova/tests/unit/scheduler/test_scheduler_options.py diff --git a/nova/tests/scheduler/test_scheduler_utils.py b/nova/tests/unit/scheduler/test_scheduler_utils.py similarity index 99% rename from nova/tests/scheduler/test_scheduler_utils.py rename to nova/tests/unit/scheduler/test_scheduler_utils.py index 6af2c7dd55e1..0dfade7deb8f 100644 --- a/nova/tests/scheduler/test_scheduler_utils.py +++ b/nova/tests/unit/scheduler/test_scheduler_utils.py @@ -31,7 +31,7 @@ from nova import objects from nova import rpc from nova.scheduler import utils as scheduler_utils from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance CONF = cfg.CONF diff --git a/nova/tests/scheduler/test_weights.py b/nova/tests/unit/scheduler/test_weights.py similarity index 99% rename from nova/tests/scheduler/test_weights.py rename to nova/tests/unit/scheduler/test_weights.py index 6a2be9ecee1a..5f168bf5df95 100644 --- a/nova/tests/scheduler/test_weights.py +++ b/nova/tests/unit/scheduler/test_weights.py @@ -23,8 +23,8 @@ from nova import exception from nova.openstack.common.fixture import mockpatch from nova.scheduler import weights from nova import test -from nova.tests import matchers -from nova.tests.scheduler import fakes +from nova.tests.unit import matchers +from nova.tests.unit.scheduler import fakes class TestWeighedHost(test.NoDBTestCase): diff --git a/nova/tests/servicegroup/__init__.py b/nova/tests/unit/servicegroup/__init__.py similarity index 100% rename from nova/tests/servicegroup/__init__.py rename to nova/tests/unit/servicegroup/__init__.py diff --git a/nova/tests/servicegroup/test_db_servicegroup.py b/nova/tests/unit/servicegroup/test_db_servicegroup.py similarity index 98% rename from nova/tests/servicegroup/test_db_servicegroup.py rename to nova/tests/unit/servicegroup/test_db_servicegroup.py index 6f08e6fb5051..1cb47a6ce435 100644 --- a/nova/tests/servicegroup/test_db_servicegroup.py +++ b/nova/tests/unit/servicegroup/test_db_servicegroup.py @@ -38,7 +38,7 @@ class ServiceFixture(fixtures.Fixture): self.serv = service.Service(self.host, self.binary, self.topic, - 'nova.tests.test_service.FakeManager', + 'nova.tests.unit.test_service.FakeManager', 1, 1) self.addCleanup(self.serv.kill) diff --git a/nova/tests/servicegroup/test_mc_servicegroup.py b/nova/tests/unit/servicegroup/test_mc_servicegroup.py similarity index 99% rename from nova/tests/servicegroup/test_mc_servicegroup.py rename to nova/tests/unit/servicegroup/test_mc_servicegroup.py index f49e6f752f59..b04d86de7da3 100644 --- a/nova/tests/servicegroup/test_mc_servicegroup.py +++ b/nova/tests/unit/servicegroup/test_mc_servicegroup.py @@ -39,7 +39,7 @@ class ServiceFixture(fixtures.Fixture): self.serv = service.Service(self.host, self.binary, self.topic, - 'nova.tests.test_service.FakeManager', + 'nova.tests.unit.test_service.FakeManager', 1, 1) self.addCleanup(self.serv.kill) diff --git a/nova/tests/servicegroup/test_zk_driver.py b/nova/tests/unit/servicegroup/test_zk_driver.py similarity index 97% rename from nova/tests/servicegroup/test_zk_driver.py rename to nova/tests/unit/servicegroup/test_zk_driver.py index 43b56590cfbf..5a9f23f5e0c7 100644 --- a/nova/tests/servicegroup/test_zk_driver.py +++ b/nova/tests/unit/servicegroup/test_zk_driver.py @@ -22,7 +22,7 @@ in venv so you might have to run the test without it. To set up in Ubuntu 12.04: $ sudo apt-get install zookeeper zookeeperd python-zookeeper $ sudo pip install evzookeeper -$ nosetests nova.tests.servicegroup.test_zk_driver +$ nosetests nova.tests.unit.servicegroup.test_zk_driver """ import eventlet diff --git a/nova/tests/ssl_cert/ca.crt b/nova/tests/unit/ssl_cert/ca.crt similarity index 100% rename from nova/tests/ssl_cert/ca.crt rename to nova/tests/unit/ssl_cert/ca.crt diff --git a/nova/tests/ssl_cert/certificate.crt b/nova/tests/unit/ssl_cert/certificate.crt similarity index 100% rename from nova/tests/ssl_cert/certificate.crt rename to nova/tests/unit/ssl_cert/certificate.crt diff --git a/nova/tests/ssl_cert/privatekey.key b/nova/tests/unit/ssl_cert/privatekey.key similarity index 100% rename from nova/tests/ssl_cert/privatekey.key rename to nova/tests/unit/ssl_cert/privatekey.key diff --git a/nova/tests/test_api_validation.py b/nova/tests/unit/test_api_validation.py similarity index 100% rename from nova/tests/test_api_validation.py rename to nova/tests/unit/test_api_validation.py diff --git a/nova/tests/test_availability_zones.py b/nova/tests/unit/test_availability_zones.py similarity index 99% rename from nova/tests/test_availability_zones.py rename to nova/tests/unit/test_availability_zones.py index b7c78048f216..2066a8f37021 100644 --- a/nova/tests/test_availability_zones.py +++ b/nova/tests/unit/test_availability_zones.py @@ -23,7 +23,7 @@ from nova import availability_zones as az from nova import context from nova import db from nova import test -from nova.tests.api.openstack import fakes +from nova.tests.unit.api.openstack import fakes CONF = cfg.CONF CONF.import_opt('internal_service_availability_zone', diff --git a/nova/tests/test_baserpc.py b/nova/tests/unit/test_baserpc.py similarity index 100% rename from nova/tests/test_baserpc.py rename to nova/tests/unit/test_baserpc.py diff --git a/nova/tests/test_bdm.py b/nova/tests/unit/test_bdm.py similarity index 99% rename from nova/tests/test_bdm.py rename to nova/tests/unit/test_bdm.py index 31ec68b87acd..52a0ca45ef6f 100644 --- a/nova/tests/test_bdm.py +++ b/nova/tests/unit/test_bdm.py @@ -20,7 +20,7 @@ Tests for Block Device Mapping Code. from nova.api.ec2 import cloud from nova.api.ec2 import ec2utils from nova import test -from nova.tests import matchers +from nova.tests.unit import matchers class BlockDeviceMappingEc2CloudTestCase(test.NoDBTestCase): diff --git a/nova/tests/test_block_device.py b/nova/tests/unit/test_block_device.py similarity index 99% rename from nova/tests/test_block_device.py rename to nova/tests/unit/test_block_device.py index 3b817ac3383c..2dff327e88ec 100644 --- a/nova/tests/test_block_device.py +++ b/nova/tests/unit/test_block_device.py @@ -21,8 +21,8 @@ from nova import block_device from nova import exception from nova import objects from nova import test -from nova.tests import fake_block_device -from nova.tests import matchers +from nova.tests.unit import fake_block_device +from nova.tests.unit import matchers class BlockDeviceTestCase(test.NoDBTestCase): diff --git a/nova/tests/test_cinder.py b/nova/tests/unit/test_cinder.py similarity index 100% rename from nova/tests/test_cinder.py rename to nova/tests/unit/test_cinder.py diff --git a/nova/tests/test_configdrive2.py b/nova/tests/unit/test_configdrive2.py similarity index 98% rename from nova/tests/test_configdrive2.py rename to nova/tests/unit/test_configdrive2.py index 1f4397b57230..f6bcaea99d8c 100644 --- a/nova/tests/test_configdrive2.py +++ b/nova/tests/unit/test_configdrive2.py @@ -23,7 +23,7 @@ from oslo.config import cfg from nova import context from nova.openstack.common import fileutils from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance from nova import utils from nova.virt import configdrive diff --git a/nova/tests/test_context.py b/nova/tests/unit/test_context.py similarity index 100% rename from nova/tests/test_context.py rename to nova/tests/unit/test_context.py diff --git a/nova/tests/test_crypto.py b/nova/tests/unit/test_crypto.py similarity index 100% rename from nova/tests/test_crypto.py rename to nova/tests/unit/test_crypto.py diff --git a/nova/tests/test_exception.py b/nova/tests/unit/test_exception.py similarity index 100% rename from nova/tests/test_exception.py rename to nova/tests/unit/test_exception.py diff --git a/nova/tests/test_flavors.py b/nova/tests/unit/test_flavors.py similarity index 100% rename from nova/tests/test_flavors.py rename to nova/tests/unit/test_flavors.py diff --git a/nova/tests/test_hacking.py b/nova/tests/unit/test_hacking.py similarity index 100% rename from nova/tests/test_hacking.py rename to nova/tests/unit/test_hacking.py diff --git a/nova/tests/test_hooks.py b/nova/tests/unit/test_hooks.py similarity index 100% rename from nova/tests/test_hooks.py rename to nova/tests/unit/test_hooks.py diff --git a/nova/tests/test_instance_types_extra_specs.py b/nova/tests/unit/test_instance_types_extra_specs.py similarity index 100% rename from nova/tests/test_instance_types_extra_specs.py rename to nova/tests/unit/test_instance_types_extra_specs.py diff --git a/nova/tests/test_iptables_network.py b/nova/tests/unit/test_iptables_network.py similarity index 100% rename from nova/tests/test_iptables_network.py rename to nova/tests/unit/test_iptables_network.py diff --git a/nova/tests/test_ipv6.py b/nova/tests/unit/test_ipv6.py similarity index 100% rename from nova/tests/test_ipv6.py rename to nova/tests/unit/test_ipv6.py diff --git a/nova/tests/test_linuxscsi.py b/nova/tests/unit/test_linuxscsi.py similarity index 100% rename from nova/tests/test_linuxscsi.py rename to nova/tests/unit/test_linuxscsi.py diff --git a/nova/tests/test_loadables.py b/nova/tests/unit/test_loadables.py similarity index 98% rename from nova/tests/test_loadables.py rename to nova/tests/unit/test_loadables.py index df023d1e5a28..9f29d850e960 100644 --- a/nova/tests/test_loadables.py +++ b/nova/tests/unit/test_loadables.py @@ -17,7 +17,7 @@ Tests For Loadable class handling. from nova import exception from nova import test -from nova.tests import fake_loadables +from nova.tests.unit import fake_loadables class LoadablesTestCase(test.NoDBTestCase): @@ -25,7 +25,7 @@ class LoadablesTestCase(test.NoDBTestCase): super(LoadablesTestCase, self).setUp() self.fake_loader = fake_loadables.FakeLoader() # The name that we imported above for testing - self.test_package = 'nova.tests.fake_loadables' + self.test_package = 'nova.tests.unit.fake_loadables' def test_loader_init(self): self.assertEqual(self.fake_loader.package, self.test_package) diff --git a/nova/tests/test_matchers.py b/nova/tests/unit/test_matchers.py similarity index 99% rename from nova/tests/test_matchers.py rename to nova/tests/unit/test_matchers.py index 0e4596244121..77fefafca86c 100644 --- a/nova/tests/test_matchers.py +++ b/nova/tests/unit/test_matchers.py @@ -15,7 +15,7 @@ import testtools from testtools.tests.matchers import helpers -from nova.tests import matchers +from nova.tests.unit import matchers class TestDictMatches(testtools.TestCase, helpers.TestMatchersInterface): diff --git a/nova/tests/test_metadata.py b/nova/tests/unit/test_metadata.py similarity index 99% rename from nova/tests/test_metadata.py rename to nova/tests/unit/test_metadata.py index e38f8332982b..90f57f1af2f8 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/unit/test_metadata.py @@ -44,11 +44,11 @@ from nova import exception from nova.network import api as network_api from nova import objects from nova import test -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests import fake_network -from nova.tests.objects import test_instance_info_cache -from nova.tests.objects import test_security_group +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_network +from nova.tests.unit.objects import test_instance_info_cache +from nova.tests.unit.objects import test_security_group from nova.virt import netutils CONF = cfg.CONF diff --git a/nova/tests/test_notifications.py b/nova/tests/unit/test_notifications.py similarity index 99% rename from nova/tests/test_notifications.py rename to nova/tests/unit/test_notifications.py index 21508ec2f7b5..bce03da1c391 100644 --- a/nova/tests/test_notifications.py +++ b/nova/tests/unit/test_notifications.py @@ -28,8 +28,8 @@ from nova import db from nova.network import api as network_api from nova import notifications from nova import test -from nova.tests import fake_network -from nova.tests import fake_notifier +from nova.tests.unit import fake_network +from nova.tests.unit import fake_notifier CONF = cfg.CONF CONF.import_opt('compute_driver', 'nova.virt.driver') diff --git a/nova/tests/test_nova_manage.py b/nova/tests/unit/test_nova_manage.py similarity index 99% rename from nova/tests/test_nova_manage.py rename to nova/tests/unit/test_nova_manage.py index 98f5636cbca5..9ffaf66e816c 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/unit/test_nova_manage.py @@ -25,8 +25,8 @@ from nova import db from nova import exception from nova.i18n import _ from nova import test -from nova.tests.db import fakes as db_fakes -from nova.tests.objects import test_network +from nova.tests.unit.db import fakes as db_fakes +from nova.tests.unit.objects import test_network class FixedIpCommandsTestCase(test.TestCase): diff --git a/nova/tests/test_objectstore.py b/nova/tests/unit/test_objectstore.py similarity index 100% rename from nova/tests/test_objectstore.py rename to nova/tests/unit/test_objectstore.py diff --git a/nova/tests/test_pipelib.py b/nova/tests/unit/test_pipelib.py similarity index 100% rename from nova/tests/test_pipelib.py rename to nova/tests/unit/test_pipelib.py diff --git a/nova/tests/test_policy.py b/nova/tests/unit/test_policy.py similarity index 99% rename from nova/tests/test_policy.py rename to nova/tests/unit/test_policy.py index a7174b13845c..59663076bee5 100644 --- a/nova/tests/test_policy.py +++ b/nova/tests/unit/test_policy.py @@ -26,7 +26,7 @@ from nova import exception from nova.openstack.common import policy as common_policy from nova import policy from nova import test -from nova.tests import policy_fixture +from nova.tests.unit import policy_fixture from nova import utils diff --git a/nova/tests/test_quota.py b/nova/tests/unit/test_quota.py similarity index 99% rename from nova/tests/test_quota.py rename to nova/tests/unit/test_quota.py index d1589d348154..9152f09a5734 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/unit/test_quota.py @@ -28,7 +28,7 @@ from nova.db.sqlalchemy import models as sqa_models from nova import exception from nova import quota from nova import test -import nova.tests.image.fake +import nova.tests.unit.image.fake CONF = cfg.CONF CONF.import_opt('compute_driver', 'nova.virt.driver') @@ -55,13 +55,13 @@ class QuotaIntegrationTestCase(test.TestCase): self.project_id, is_admin=True) - nova.tests.image.fake.stub_out_image_service(self.stubs) + nova.tests.unit.image.fake.stub_out_image_service(self.stubs) self.compute_api = compute.API() def tearDown(self): super(QuotaIntegrationTestCase, self).tearDown() - nova.tests.image.fake.FakeImageService_reset() + nova.tests.unit.image.fake.FakeImageService_reset() def _create_instance(self, cores=2): """Create a test instance.""" @@ -481,7 +481,7 @@ class QuotaEngineTestCase(test.TestCase): def test_init_override_string(self): quota_obj = quota.QuotaEngine( - quota_driver_class='nova.tests.test_quota.FakeDriver') + quota_driver_class='nova.tests.unit.test_quota.FakeDriver') self.assertEqual(quota_obj._resources, {}) self.assertIsInstance(quota_obj._driver, FakeDriver) diff --git a/nova/tests/test_safeutils.py b/nova/tests/unit/test_safeutils.py similarity index 100% rename from nova/tests/test_safeutils.py rename to nova/tests/unit/test_safeutils.py diff --git a/nova/tests/test_service.py b/nova/tests/unit/test_service.py similarity index 94% rename from nova/tests/test_service.py rename to nova/tests/unit/test_service.py index 4bc71049451f..bb3614386913 100644 --- a/nova/tests/test_service.py +++ b/nova/tests/unit/test_service.py @@ -34,12 +34,12 @@ from nova.openstack.common import service as _service from nova import rpc from nova import service from nova import test -from nova.tests import utils +from nova.tests.unit import utils from nova import wsgi test_service_opts = [ cfg.StrOpt("fake_manager", - default="nova.tests.test_service.FakeManager", + default="nova.tests.unit.test_service.FakeManager", help="Manager for testing"), cfg.StrOpt("test_service_listen", default='127.0.0.1', @@ -71,7 +71,7 @@ class ServiceManagerTestCase(test.TestCase): serv = service.Service('test', 'test', 'test', - 'nova.tests.test_service.FakeManager') + 'nova.tests.unit.test_service.FakeManager') serv.start() self.assertEqual(serv.test_method(), 'manager') @@ -79,7 +79,7 @@ class ServiceManagerTestCase(test.TestCase): serv = ExtendedService('test', 'test', 'test', - 'nova.tests.test_service.FakeManager') + 'nova.tests.unit.test_service.FakeManager') serv.start() self.assertEqual(serv.test_method(), 'service') @@ -89,7 +89,7 @@ class ServiceManagerTestCase(test.TestCase): serv = service.Service('test', 'test', 'test', - 'nova.tests.test_service.FakeManager') + 'nova.tests.unit.test_service.FakeManager') serv.start() self.assertEqual(CONF.service_down_time, 25) @@ -183,7 +183,7 @@ class ServiceTestCase(test.TestCase): serv = service.Service(self.host, self.binary, self.topic, - 'nova.tests.test_service.FakeManager') + 'nova.tests.unit.test_service.FakeManager') serv.start() def _test_service_check_create_race(self, ex): @@ -215,7 +215,7 @@ class ServiceTestCase(test.TestCase): serv = service.Service(self.host, self.binary, self.topic, - 'nova.tests.test_service.FakeManager') + 'nova.tests.unit.test_service.FakeManager') self.assertRaises(TestException, serv.start) def test_service_check_create_race_topic_exists(self): @@ -257,7 +257,7 @@ class ServiceTestCase(test.TestCase): serv = service.Service(self.host, self.binary, self.topic, - 'nova.tests.test_service.FakeManager') + 'nova.tests.unit.test_service.FakeManager') serv.start() serv.stop() @@ -273,7 +273,7 @@ class ServiceTestCase(test.TestCase): serv = service.Service(self.host, self.binary, self.topic, - 'nova.tests.test_service.FakeManager') + 'nova.tests.unit.test_service.FakeManager') serv.manager = mock_manager serv.manager.additional_endpoints = [] @@ -293,7 +293,7 @@ class ServiceTestCase(test.TestCase): serv = service.Service(self.host, self.binary, self.topic, - 'nova.tests.test_service.FakeManager') + 'nova.tests.unit.test_service.FakeManager') serv.start() serv.stop() serv.rpcserver.start.assert_called_once_with() diff --git a/nova/tests/test_test.py b/nova/tests/unit/test_test.py similarity index 100% rename from nova/tests/test_test.py rename to nova/tests/unit/test_test.py diff --git a/nova/tests/test_test_utils.py b/nova/tests/unit/test_test_utils.py similarity index 98% rename from nova/tests/test_test_utils.py rename to nova/tests/unit/test_test_utils.py index a7b6f430fe9e..8cc87fba6529 100644 --- a/nova/tests/test_test_utils.py +++ b/nova/tests/unit/test_test_utils.py @@ -20,7 +20,7 @@ import fixtures from nova import db from nova import test -from nova.tests import utils as test_utils +from nova.tests.unit import utils as test_utils class TestUtilsTestCase(test.TestCase): diff --git a/nova/tests/test_utils.py b/nova/tests/unit/test_utils.py similarity index 98% rename from nova/tests/test_utils.py rename to nova/tests/unit/test_utils.py index 548e973b6a3c..8c26a38998aa 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/unit/test_utils.py @@ -313,7 +313,7 @@ class MonkeyPatchTestCase(test.NoDBTestCase): """Unit test for utils.monkey_patch().""" def setUp(self): super(MonkeyPatchTestCase, self).setUp() - self.example_package = 'nova.tests.monkey_patch_example.' + self.example_package = 'nova.tests.unit.monkey_patch_example.' self.flags( monkey_patch=True, monkey_patch_modules=[self.example_package + 'example_a' + ':' @@ -321,9 +321,9 @@ class MonkeyPatchTestCase(test.NoDBTestCase): def test_monkey_patch(self): utils.monkey_patch() - nova.tests.monkey_patch_example.CALLED_FUNCTION = [] - from nova.tests.monkey_patch_example import example_a - from nova.tests.monkey_patch_example import example_b + nova.tests.unit.monkey_patch_example.CALLED_FUNCTION = [] + from nova.tests.unit.monkey_patch_example import example_a + from nova.tests.unit.monkey_patch_example import example_b self.assertEqual('Example function', example_a.example_function_a()) exampleA = example_a.ExampleClassA() @@ -339,19 +339,19 @@ class MonkeyPatchTestCase(test.NoDBTestCase): self.assertEqual(ret_b, 8) package_a = self.example_package + 'example_a.' self.assertIn(package_a + 'example_function_a', - nova.tests.monkey_patch_example.CALLED_FUNCTION) + nova.tests.unit.monkey_patch_example.CALLED_FUNCTION) self.assertIn(package_a + 'ExampleClassA.example_method', - nova.tests.monkey_patch_example.CALLED_FUNCTION) + nova.tests.unit.monkey_patch_example.CALLED_FUNCTION) self.assertIn(package_a + 'ExampleClassA.example_method_add', - nova.tests.monkey_patch_example.CALLED_FUNCTION) + nova.tests.unit.monkey_patch_example.CALLED_FUNCTION) package_b = self.example_package + 'example_b.' self.assertNotIn(package_b + 'example_function_b', - nova.tests.monkey_patch_example.CALLED_FUNCTION) + nova.tests.unit.monkey_patch_example.CALLED_FUNCTION) self.assertNotIn(package_b + 'ExampleClassB.example_method', - nova.tests.monkey_patch_example.CALLED_FUNCTION) + nova.tests.unit.monkey_patch_example.CALLED_FUNCTION) self.assertNotIn(package_b + 'ExampleClassB.example_method_add', - nova.tests.monkey_patch_example.CALLED_FUNCTION) + nova.tests.unit.monkey_patch_example.CALLED_FUNCTION) class MonkeyPatchDefaultTestCase(test.NoDBTestCase): diff --git a/nova/tests/test_versions.py b/nova/tests/unit/test_versions.py similarity index 100% rename from nova/tests/test_versions.py rename to nova/tests/unit/test_versions.py diff --git a/nova/tests/test_weights.py b/nova/tests/unit/test_weights.py similarity index 100% rename from nova/tests/test_weights.py rename to nova/tests/unit/test_weights.py diff --git a/nova/tests/test_wsgi.py b/nova/tests/unit/test_wsgi.py similarity index 99% rename from nova/tests/test_wsgi.py rename to nova/tests/unit/test_wsgi.py index 8efee518f738..0a08a7651fc3 100644 --- a/nova/tests/test_wsgi.py +++ b/nova/tests/unit/test_wsgi.py @@ -30,7 +30,7 @@ import webob import nova.exception from nova import test -from nova.tests import utils +from nova.tests.unit import utils import nova.wsgi SSL_CERT_DIR = os.path.normpath(os.path.join( diff --git a/nova/tests/utils.py b/nova/tests/unit/utils.py similarity index 100% rename from nova/tests/utils.py rename to nova/tests/unit/utils.py diff --git a/nova/tests/virt/__init__.py b/nova/tests/unit/virt/__init__.py similarity index 100% rename from nova/tests/virt/__init__.py rename to nova/tests/unit/virt/__init__.py diff --git a/nova/tests/virt/disk/__init__.py b/nova/tests/unit/virt/disk/__init__.py similarity index 100% rename from nova/tests/virt/disk/__init__.py rename to nova/tests/unit/virt/disk/__init__.py diff --git a/nova/tests/virt/disk/mount/__init__.py b/nova/tests/unit/virt/disk/mount/__init__.py similarity index 100% rename from nova/tests/virt/disk/mount/__init__.py rename to nova/tests/unit/virt/disk/mount/__init__.py diff --git a/nova/tests/virt/disk/mount/test_loop.py b/nova/tests/unit/virt/disk/mount/test_loop.py similarity index 100% rename from nova/tests/virt/disk/mount/test_loop.py rename to nova/tests/unit/virt/disk/mount/test_loop.py diff --git a/nova/tests/virt/disk/mount/test_nbd.py b/nova/tests/unit/virt/disk/mount/test_nbd.py similarity index 100% rename from nova/tests/virt/disk/mount/test_nbd.py rename to nova/tests/unit/virt/disk/mount/test_nbd.py diff --git a/nova/tests/virt/disk/test_api.py b/nova/tests/unit/virt/disk/test_api.py similarity index 100% rename from nova/tests/virt/disk/test_api.py rename to nova/tests/unit/virt/disk/test_api.py diff --git a/nova/tests/virt/disk/test_inject.py b/nova/tests/unit/virt/disk/test_inject.py similarity index 99% rename from nova/tests/virt/disk/test_inject.py rename to nova/tests/unit/virt/disk/test_inject.py index 9685c2e6f20e..97c8a0801346 100644 --- a/nova/tests/virt/disk/test_inject.py +++ b/nova/tests/unit/virt/disk/test_inject.py @@ -17,7 +17,7 @@ import sys from nova import exception from nova import test -from nova.tests.virt.disk.vfs import fakeguestfs +from nova.tests.unit.virt.disk.vfs import fakeguestfs from nova.virt.disk import api as diskapi from nova.virt.disk.vfs import guestfs as vfsguestfs diff --git a/nova/tests/virt/disk/vfs/__init__.py b/nova/tests/unit/virt/disk/vfs/__init__.py similarity index 100% rename from nova/tests/virt/disk/vfs/__init__.py rename to nova/tests/unit/virt/disk/vfs/__init__.py diff --git a/nova/tests/virt/disk/vfs/fakeguestfs.py b/nova/tests/unit/virt/disk/vfs/fakeguestfs.py similarity index 100% rename from nova/tests/virt/disk/vfs/fakeguestfs.py rename to nova/tests/unit/virt/disk/vfs/fakeguestfs.py diff --git a/nova/tests/virt/disk/vfs/test_guestfs.py b/nova/tests/unit/virt/disk/vfs/test_guestfs.py similarity index 99% rename from nova/tests/virt/disk/vfs/test_guestfs.py rename to nova/tests/unit/virt/disk/vfs/test_guestfs.py index cf954e9a35e0..33dd1003297c 100644 --- a/nova/tests/virt/disk/vfs/test_guestfs.py +++ b/nova/tests/unit/virt/disk/vfs/test_guestfs.py @@ -16,7 +16,7 @@ import sys from nova import exception from nova import test -from nova.tests.virt.disk.vfs import fakeguestfs +from nova.tests.unit.virt.disk.vfs import fakeguestfs from nova.virt.disk.vfs import guestfs as vfsimpl diff --git a/nova/tests/virt/disk/vfs/test_localfs.py b/nova/tests/unit/virt/disk/vfs/test_localfs.py similarity index 99% rename from nova/tests/virt/disk/vfs/test_localfs.py rename to nova/tests/unit/virt/disk/vfs/test_localfs.py index 16935498ac95..6e7780e74bb0 100644 --- a/nova/tests/virt/disk/vfs/test_localfs.py +++ b/nova/tests/unit/virt/disk/vfs/test_localfs.py @@ -17,7 +17,7 @@ from oslo.config import cfg from nova import exception from nova import test -from nova.tests import utils as tests_utils +from nova.tests.unit import utils as tests_utils import nova.utils from nova.virt.disk.vfs import localfs as vfsimpl diff --git a/nova/tests/virt/hyperv/__init__.py b/nova/tests/unit/virt/hyperv/__init__.py similarity index 100% rename from nova/tests/virt/hyperv/__init__.py rename to nova/tests/unit/virt/hyperv/__init__.py diff --git a/nova/tests/virt/hyperv/db_fakes.py b/nova/tests/unit/virt/hyperv/db_fakes.py similarity index 100% rename from nova/tests/virt/hyperv/db_fakes.py rename to nova/tests/unit/virt/hyperv/db_fakes.py diff --git a/nova/tests/virt/hyperv/fake.py b/nova/tests/unit/virt/hyperv/fake.py similarity index 100% rename from nova/tests/virt/hyperv/fake.py rename to nova/tests/unit/virt/hyperv/fake.py diff --git a/nova/tests/virt/hyperv/test_basevolumeutils.py b/nova/tests/unit/virt/hyperv/test_basevolumeutils.py similarity index 100% rename from nova/tests/virt/hyperv/test_basevolumeutils.py rename to nova/tests/unit/virt/hyperv/test_basevolumeutils.py diff --git a/nova/tests/virt/hyperv/test_hostutils.py b/nova/tests/unit/virt/hyperv/test_hostutils.py similarity index 100% rename from nova/tests/virt/hyperv/test_hostutils.py rename to nova/tests/unit/virt/hyperv/test_hostutils.py diff --git a/nova/tests/virt/hyperv/test_hypervapi.py b/nova/tests/unit/virt/hyperv/test_hypervapi.py similarity index 99% rename from nova/tests/virt/hyperv/test_hypervapi.py rename to nova/tests/unit/virt/hyperv/test_hypervapi.py index 94d9f63918a1..375420a48433 100644 --- a/nova/tests/virt/hyperv/test_hypervapi.py +++ b/nova/tests/unit/virt/hyperv/test_hypervapi.py @@ -40,11 +40,11 @@ from nova.i18n import _ from nova.image import glance from nova.openstack.common import fileutils from nova import test -from nova.tests import fake_network -from nova.tests.image import fake as fake_image -from nova.tests import matchers -from nova.tests.virt.hyperv import db_fakes -from nova.tests.virt.hyperv import fake +from nova.tests.unit import fake_network +from nova.tests.unit.image import fake as fake_image +from nova.tests.unit import matchers +from nova.tests.unit.virt.hyperv import db_fakes +from nova.tests.unit.virt.hyperv import fake from nova import utils from nova.virt import configdrive from nova.virt import driver diff --git a/nova/tests/virt/hyperv/test_ioutils.py b/nova/tests/unit/virt/hyperv/test_ioutils.py similarity index 100% rename from nova/tests/virt/hyperv/test_ioutils.py rename to nova/tests/unit/virt/hyperv/test_ioutils.py diff --git a/nova/tests/virt/hyperv/test_migrationops.py b/nova/tests/unit/virt/hyperv/test_migrationops.py similarity index 98% rename from nova/tests/virt/hyperv/test_migrationops.py rename to nova/tests/unit/virt/hyperv/test_migrationops.py index 4e715a2988e6..8cda2ccd4883 100644 --- a/nova/tests/virt/hyperv/test_migrationops.py +++ b/nova/tests/unit/virt/hyperv/test_migrationops.py @@ -15,7 +15,7 @@ import mock from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance from nova.virt.hyperv import migrationops from nova.virt.hyperv import vmutils diff --git a/nova/tests/virt/hyperv/test_networkutils.py b/nova/tests/unit/virt/hyperv/test_networkutils.py similarity index 100% rename from nova/tests/virt/hyperv/test_networkutils.py rename to nova/tests/unit/virt/hyperv/test_networkutils.py diff --git a/nova/tests/virt/hyperv/test_networkutilsv2.py b/nova/tests/unit/virt/hyperv/test_networkutilsv2.py similarity index 96% rename from nova/tests/virt/hyperv/test_networkutilsv2.py rename to nova/tests/unit/virt/hyperv/test_networkutilsv2.py index bd79709d780e..1038e8868270 100644 --- a/nova/tests/virt/hyperv/test_networkutilsv2.py +++ b/nova/tests/unit/virt/hyperv/test_networkutilsv2.py @@ -14,7 +14,7 @@ import mock -from nova.tests.virt.hyperv import test_networkutils +from nova.tests.unit.virt.hyperv import test_networkutils from nova.virt.hyperv import networkutilsv2 diff --git a/nova/tests/virt/hyperv/test_pathutils.py b/nova/tests/unit/virt/hyperv/test_pathutils.py similarity index 100% rename from nova/tests/virt/hyperv/test_pathutils.py rename to nova/tests/unit/virt/hyperv/test_pathutils.py diff --git a/nova/tests/virt/hyperv/test_rdpconsoleutils.py b/nova/tests/unit/virt/hyperv/test_rdpconsoleutils.py similarity index 100% rename from nova/tests/virt/hyperv/test_rdpconsoleutils.py rename to nova/tests/unit/virt/hyperv/test_rdpconsoleutils.py diff --git a/nova/tests/virt/hyperv/test_rdpconsoleutilsv2.py b/nova/tests/unit/virt/hyperv/test_rdpconsoleutilsv2.py similarity index 100% rename from nova/tests/virt/hyperv/test_rdpconsoleutilsv2.py rename to nova/tests/unit/virt/hyperv/test_rdpconsoleutilsv2.py diff --git a/nova/tests/virt/hyperv/test_utilsfactory.py b/nova/tests/unit/virt/hyperv/test_utilsfactory.py similarity index 100% rename from nova/tests/virt/hyperv/test_utilsfactory.py rename to nova/tests/unit/virt/hyperv/test_utilsfactory.py diff --git a/nova/tests/virt/hyperv/test_vhdutils.py b/nova/tests/unit/virt/hyperv/test_vhdutils.py similarity index 100% rename from nova/tests/virt/hyperv/test_vhdutils.py rename to nova/tests/unit/virt/hyperv/test_vhdutils.py diff --git a/nova/tests/virt/hyperv/test_vhdutilsv2.py b/nova/tests/unit/virt/hyperv/test_vhdutilsv2.py similarity index 100% rename from nova/tests/virt/hyperv/test_vhdutilsv2.py rename to nova/tests/unit/virt/hyperv/test_vhdutilsv2.py diff --git a/nova/tests/virt/hyperv/test_vmops.py b/nova/tests/unit/virt/hyperv/test_vmops.py similarity index 99% rename from nova/tests/virt/hyperv/test_vmops.py rename to nova/tests/unit/virt/hyperv/test_vmops.py index b0c1bfd26087..5ec107747e67 100644 --- a/nova/tests/virt/hyperv/test_vmops.py +++ b/nova/tests/unit/virt/hyperv/test_vmops.py @@ -17,7 +17,7 @@ import mock from nova import exception from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance from nova.virt.hyperv import constants from nova.virt.hyperv import pathutils from nova.virt.hyperv import vmops diff --git a/nova/tests/virt/hyperv/test_vmutils.py b/nova/tests/unit/virt/hyperv/test_vmutils.py similarity index 100% rename from nova/tests/virt/hyperv/test_vmutils.py rename to nova/tests/unit/virt/hyperv/test_vmutils.py diff --git a/nova/tests/virt/hyperv/test_vmutilsv2.py b/nova/tests/unit/virt/hyperv/test_vmutilsv2.py similarity index 99% rename from nova/tests/virt/hyperv/test_vmutilsv2.py rename to nova/tests/unit/virt/hyperv/test_vmutilsv2.py index e19ec217aecc..e4c24683eb8c 100644 --- a/nova/tests/virt/hyperv/test_vmutilsv2.py +++ b/nova/tests/unit/virt/hyperv/test_vmutilsv2.py @@ -14,7 +14,7 @@ import mock -from nova.tests.virt.hyperv import test_vmutils +from nova.tests.unit.virt.hyperv import test_vmutils from nova.virt.hyperv import vmutilsv2 diff --git a/nova/tests/virt/hyperv/test_volumeutils.py b/nova/tests/unit/virt/hyperv/test_volumeutils.py similarity index 98% rename from nova/tests/virt/hyperv/test_volumeutils.py rename to nova/tests/unit/virt/hyperv/test_volumeutils.py index f44ee14594ac..98ffcce5336d 100644 --- a/nova/tests/virt/hyperv/test_volumeutils.py +++ b/nova/tests/unit/virt/hyperv/test_volumeutils.py @@ -17,7 +17,7 @@ import mock from oslo.config import cfg -from nova.tests.virt.hyperv import test_basevolumeutils +from nova.tests.unit.virt.hyperv import test_basevolumeutils from nova.virt.hyperv import vmutils from nova.virt.hyperv import volumeutils diff --git a/nova/tests/virt/hyperv/test_volumeutilsv2.py b/nova/tests/unit/virt/hyperv/test_volumeutilsv2.py similarity index 100% rename from nova/tests/virt/hyperv/test_volumeutilsv2.py rename to nova/tests/unit/virt/hyperv/test_volumeutilsv2.py diff --git a/nova/tests/virt/ironic/__init__.py b/nova/tests/unit/virt/ironic/__init__.py similarity index 100% rename from nova/tests/virt/ironic/__init__.py rename to nova/tests/unit/virt/ironic/__init__.py diff --git a/nova/tests/virt/ironic/test_client_wrapper.py b/nova/tests/unit/virt/ironic/test_client_wrapper.py similarity index 98% rename from nova/tests/virt/ironic/test_client_wrapper.py rename to nova/tests/unit/virt/ironic/test_client_wrapper.py index 9b1b923580ab..025d2616ddeb 100644 --- a/nova/tests/virt/ironic/test_client_wrapper.py +++ b/nova/tests/unit/virt/ironic/test_client_wrapper.py @@ -20,7 +20,7 @@ from oslo.config import cfg from nova import exception from nova import test -from nova.tests.virt.ironic import utils as ironic_utils +from nova.tests.unit.virt.ironic import utils as ironic_utils from nova.virt.ironic import client_wrapper CONF = cfg.CONF diff --git a/nova/tests/virt/ironic/test_driver.py b/nova/tests/unit/virt/ironic/test_driver.py similarity index 99% rename from nova/tests/virt/ironic/test_driver.py rename to nova/tests/unit/virt/ironic/test_driver.py index 32d1bb7a15f3..0e24c7bab40f 100644 --- a/nova/tests/virt/ironic/test_driver.py +++ b/nova/tests/unit/virt/ironic/test_driver.py @@ -28,9 +28,9 @@ from nova import objects from nova.openstack.common import loopingcall from nova.openstack.common import uuidutils from nova import test -from nova.tests import fake_instance -from nova.tests import utils -from nova.tests.virt.ironic import utils as ironic_utils +from nova.tests.unit import fake_instance +from nova.tests.unit import utils +from nova.tests.unit.virt.ironic import utils as ironic_utils from nova.virt import driver from nova.virt import fake from nova.virt import firewall diff --git a/nova/tests/virt/ironic/test_patcher.py b/nova/tests/unit/virt/ironic/test_patcher.py similarity index 98% rename from nova/tests/virt/ironic/test_patcher.py rename to nova/tests/unit/virt/ironic/test_patcher.py index d37620b0e8b0..a69e8cacfe39 100644 --- a/nova/tests/virt/ironic/test_patcher.py +++ b/nova/tests/unit/virt/ironic/test_patcher.py @@ -17,8 +17,8 @@ from oslo.config import cfg from nova import context as nova_context from nova import test -from nova.tests import fake_instance -from nova.tests.virt.ironic import utils as ironic_utils +from nova.tests.unit import fake_instance +from nova.tests.unit.virt.ironic import utils as ironic_utils from nova.virt.ironic import patcher CONF = cfg.CONF diff --git a/nova/tests/virt/ironic/utils.py b/nova/tests/unit/virt/ironic/utils.py similarity index 100% rename from nova/tests/virt/ironic/utils.py rename to nova/tests/unit/virt/ironic/utils.py diff --git a/nova/tests/virt/libvirt/__init__.py b/nova/tests/unit/virt/libvirt/__init__.py similarity index 100% rename from nova/tests/virt/libvirt/__init__.py rename to nova/tests/unit/virt/libvirt/__init__.py diff --git a/nova/tests/virt/libvirt/fake_imagebackend.py b/nova/tests/unit/virt/libvirt/fake_imagebackend.py similarity index 100% rename from nova/tests/virt/libvirt/fake_imagebackend.py rename to nova/tests/unit/virt/libvirt/fake_imagebackend.py diff --git a/nova/tests/virt/libvirt/fake_libvirt_utils.py b/nova/tests/unit/virt/libvirt/fake_libvirt_utils.py similarity index 100% rename from nova/tests/virt/libvirt/fake_libvirt_utils.py rename to nova/tests/unit/virt/libvirt/fake_libvirt_utils.py diff --git a/nova/tests/virt/libvirt/fakelibvirt.py b/nova/tests/unit/virt/libvirt/fakelibvirt.py similarity index 100% rename from nova/tests/virt/libvirt/fakelibvirt.py rename to nova/tests/unit/virt/libvirt/fakelibvirt.py diff --git a/nova/tests/virt/libvirt/test_blockinfo.py b/nova/tests/unit/virt/libvirt/test_blockinfo.py similarity index 99% rename from nova/tests/virt/libvirt/test_blockinfo.py rename to nova/tests/unit/virt/libvirt/test_blockinfo.py index b7ee6e3c648c..f849bc59a733 100644 --- a/nova/tests/virt/libvirt/test_blockinfo.py +++ b/nova/tests/unit/virt/libvirt/test_blockinfo.py @@ -23,8 +23,8 @@ from nova import context from nova import exception from nova import objects from nova import test -from nova.tests import fake_block_device -import nova.tests.image.fake +from nova.tests.unit import fake_block_device +import nova.tests.unit.image.fake from nova.virt import block_device as driver_block_device from nova.virt.libvirt import blockinfo @@ -37,7 +37,7 @@ class LibvirtBlockInfoTest(test.NoDBTestCase): self.user_id = 'fake' self.project_id = 'fake' self.context = context.get_admin_context() - nova.tests.image.fake.stub_out_image_service(self.stubs) + nova.tests.unit.image.fake.stub_out_image_service(self.stubs) self.test_instance = { 'uuid': '32dfcb37-5af1-552b-357c-be8c3aa38310', 'memory_kb': '1024000', diff --git a/nova/tests/virt/libvirt/test_config.py b/nova/tests/unit/virt/libvirt/test_config.py similarity index 99% rename from nova/tests/virt/libvirt/test_config.py rename to nova/tests/unit/virt/libvirt/test_config.py index 2e4682395ce6..192d0756400e 100644 --- a/nova/tests/virt/libvirt/test_config.py +++ b/nova/tests/unit/virt/libvirt/test_config.py @@ -17,7 +17,7 @@ from oslo.utils import units from nova.compute import arch from nova import test -from nova.tests import matchers +from nova.tests.unit import matchers from nova.virt.libvirt import config diff --git a/nova/tests/virt/libvirt/test_designer.py b/nova/tests/unit/virt/libvirt/test_designer.py similarity index 100% rename from nova/tests/virt/libvirt/test_designer.py rename to nova/tests/unit/virt/libvirt/test_designer.py diff --git a/nova/tests/virt/libvirt/test_dmcrypt.py b/nova/tests/unit/virt/libvirt/test_dmcrypt.py similarity index 100% rename from nova/tests/virt/libvirt/test_dmcrypt.py rename to nova/tests/unit/virt/libvirt/test_dmcrypt.py diff --git a/nova/tests/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py similarity index 99% rename from nova/tests/virt/libvirt/test_driver.py rename to nova/tests/unit/virt/libvirt/test_driver.py index 505ad6d7865a..90e25e1b3b4e 100644 --- a/nova/tests/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -60,15 +60,15 @@ from nova.openstack.common import loopingcall from nova.openstack.common import uuidutils from nova.pci import manager as pci_manager from nova import test -from nova.tests import fake_block_device -from nova.tests import fake_instance -from nova.tests import fake_network -import nova.tests.image.fake -from nova.tests import matchers -from nova.tests.objects import test_pci_device -from nova.tests.virt.libvirt import fake_imagebackend -from nova.tests.virt.libvirt import fake_libvirt_utils -from nova.tests.virt.libvirt import fakelibvirt +from nova.tests.unit import fake_block_device +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_network +import nova.tests.unit.image.fake +from nova.tests.unit import matchers +from nova.tests.unit.objects import test_pci_device +from nova.tests.unit.virt.libvirt import fake_imagebackend +from nova.tests.unit.virt.libvirt import fake_libvirt_utils +from nova.tests.unit.virt.libvirt import fakelibvirt from nova import utils from nova import version from nova.virt import block_device as driver_block_device @@ -426,7 +426,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): 'nova.virt.libvirt.driver.libvirt_utils', fake_libvirt_utils)) # Force libvirt to return a host UUID that matches the serial in - # nova.tests.fakelibvirt. This is necessary because the host UUID + # nova.tests.unit.fakelibvirt. This is necessary because the host UUID # returned by libvirt becomes the serial whose value is checked for in # test_xml_and_uri_* below. self.useFixture(fixtures.MonkeyPatch( @@ -527,7 +527,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): 'instance_type_vcpus': 1 } - self.image_service = nova.tests.image.fake.stub_out_image_service( + self.image_service = nova.tests.unit.image.fake.stub_out_image_service( self.stubs) self.test_instance = { 'id': 1, @@ -560,7 +560,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): return os.path.relpath(path, CONF.instances_path) def tearDown(self): - nova.tests.image.fake.FakeImageService_reset() + nova.tests.unit.image.fake.FakeImageService_reset() super(LibvirtConnTestCase, self).tearDown() def create_fake_libvirt_mock(self, **kwargs): @@ -572,7 +572,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): return FakeVirtDomain() # Creating mocks - volume_driver = ('iscsi=nova.tests.virt.libvirt.test_driver' + volume_driver = ('iscsi=nova.tests.unit.virt.libvirt.test_driver' '.FakeVolumeDriver') self.flags(volume_drivers=[volume_driver], group='libvirt') @@ -4286,7 +4286,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): libvirt_driver.libvirt_utils.disk_type = "lvm" # Start test - image_service = nova.tests.image.fake.FakeImageService() + image_service = nova.tests.unit.image.fake.FakeImageService() instance_ref = objects.Instance(**self.test_instance) instance_ref.info_cache = objects.InstanceInfoCache( network_info=None) @@ -4519,7 +4519,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): libvirt_driver.libvirt_utils.disk_type = "lvm" # Start test - image_service = nova.tests.image.fake.FakeImageService() + image_service = nova.tests.unit.image.fake.FakeImageService() instance_ref = objects.Instance(**self.test_instance) instance_ref.info_cache = objects.InstanceInfoCache( network_info=None) diff --git a/nova/tests/virt/libvirt/test_fakelibvirt.py b/nova/tests/unit/virt/libvirt/test_fakelibvirt.py similarity index 99% rename from nova/tests/virt/libvirt/test_fakelibvirt.py rename to nova/tests/unit/virt/libvirt/test_fakelibvirt.py index c2200f6aff77..7a6d0204260b 100644 --- a/nova/tests/virt/libvirt/test_fakelibvirt.py +++ b/nova/tests/unit/virt/libvirt/test_fakelibvirt.py @@ -17,7 +17,7 @@ from nova import test from lxml import etree from nova.compute import arch -import nova.tests.virt.libvirt.fakelibvirt as libvirt +import nova.tests.unit.virt.libvirt.fakelibvirt as libvirt def get_vm_xml(name="testname", uuid=None, source_type='file', diff --git a/nova/tests/virt/libvirt/test_firewall.py b/nova/tests/unit/virt/libvirt/test_firewall.py similarity index 99% rename from nova/tests/virt/libvirt/test_firewall.py rename to nova/tests/unit/virt/libvirt/test_firewall.py index f928825fba67..b6d4cddf5153 100644 --- a/nova/tests/virt/libvirt/test_firewall.py +++ b/nova/tests/unit/virt/libvirt/test_firewall.py @@ -28,8 +28,8 @@ from nova import exception from nova.network import linux_net from nova import objects from nova import test -from nova.tests import fake_network -from nova.tests.virt.libvirt import fakelibvirt +from nova.tests.unit import fake_network +from nova.tests.unit.virt.libvirt import fakelibvirt from nova.virt.libvirt import firewall from nova.virt import netutils from nova.virt import virtapi diff --git a/nova/tests/virt/libvirt/test_imagebackend.py b/nova/tests/unit/virt/libvirt/test_imagebackend.py similarity index 99% rename from nova/tests/virt/libvirt/test_imagebackend.py rename to nova/tests/unit/virt/libvirt/test_imagebackend.py index 17d0791856b0..e865c165dac6 100644 --- a/nova/tests/virt/libvirt/test_imagebackend.py +++ b/nova/tests/unit/virt/libvirt/test_imagebackend.py @@ -32,8 +32,8 @@ from nova.openstack.common.fixture import config as config_fixture from nova.openstack.common import imageutils from nova.openstack.common import uuidutils from nova import test -from nova.tests import fake_processutils -from nova.tests.virt.libvirt import fake_libvirt_utils +from nova.tests.unit import fake_processutils +from nova.tests.unit.virt.libvirt import fake_libvirt_utils from nova.virt import images from nova.virt.libvirt import imagebackend from nova.virt.libvirt import rbd_utils diff --git a/nova/tests/virt/libvirt/test_imagecache.py b/nova/tests/unit/virt/libvirt/test_imagecache.py similarity index 99% rename from nova/tests/virt/libvirt/test_imagecache.py rename to nova/tests/unit/virt/libvirt/test_imagecache.py index a2eb4a1c6780..d7bed2fcd0b6 100644 --- a/nova/tests/virt/libvirt/test_imagecache.py +++ b/nova/tests/unit/virt/libvirt/test_imagecache.py @@ -29,7 +29,7 @@ from nova import conductor from nova import db from nova.openstack.common import log as logging from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance from nova import utils from nova.virt.libvirt import imagecache from nova.virt.libvirt import utils as libvirt_utils diff --git a/nova/tests/virt/libvirt/test_lvm.py b/nova/tests/unit/virt/libvirt/test_lvm.py similarity index 100% rename from nova/tests/virt/libvirt/test_lvm.py rename to nova/tests/unit/virt/libvirt/test_lvm.py diff --git a/nova/tests/virt/libvirt/test_rbd.py b/nova/tests/unit/virt/libvirt/test_rbd.py similarity index 100% rename from nova/tests/virt/libvirt/test_rbd.py rename to nova/tests/unit/virt/libvirt/test_rbd.py diff --git a/nova/tests/virt/libvirt/test_utils.py b/nova/tests/unit/virt/libvirt/test_utils.py similarity index 100% rename from nova/tests/virt/libvirt/test_utils.py rename to nova/tests/unit/virt/libvirt/test_utils.py diff --git a/nova/tests/virt/libvirt/test_vif.py b/nova/tests/unit/virt/libvirt/test_vif.py similarity index 99% rename from nova/tests/virt/libvirt/test_vif.py rename to nova/tests/unit/virt/libvirt/test_vif.py index 256ca5804626..3d64dd5ad04f 100644 --- a/nova/tests/virt/libvirt/test_vif.py +++ b/nova/tests/unit/virt/libvirt/test_vif.py @@ -23,7 +23,7 @@ from nova import exception from nova.network import linux_net from nova.network import model as network_model from nova import test -from nova.tests.virt.libvirt import fakelibvirt +from nova.tests.unit.virt.libvirt import fakelibvirt from nova import utils from nova.virt.libvirt import config as vconfig from nova.virt.libvirt import vif diff --git a/nova/tests/virt/libvirt/test_volume.py b/nova/tests/unit/virt/libvirt/test_volume.py similarity index 99% rename from nova/tests/virt/libvirt/test_volume.py rename to nova/tests/unit/virt/libvirt/test_volume.py index f2e4518d1052..0594161638cc 100644 --- a/nova/tests/virt/libvirt/test_volume.py +++ b/nova/tests/unit/virt/libvirt/test_volume.py @@ -25,7 +25,7 @@ from oslo.config import cfg from nova import exception from nova.storage import linuxscsi from nova import test -from nova.tests.virt.libvirt import fake_libvirt_utils +from nova.tests.unit.virt.libvirt import fake_libvirt_utils from nova import utils from nova.virt import fake from nova.virt.libvirt import utils as libvirt_utils diff --git a/nova/tests/virt/test_block_device.py b/nova/tests/unit/virt/test_block_device.py similarity index 99% rename from nova/tests/virt/test_block_device.py rename to nova/tests/unit/virt/test_block_device.py index a87bee081873..f71438eae236 100644 --- a/nova/tests/virt/test_block_device.py +++ b/nova/tests/unit/virt/test_block_device.py @@ -20,8 +20,8 @@ from oslo.serialization import jsonutils from nova import block_device from nova import context from nova import test -from nova.tests import fake_instance -from nova.tests import matchers +from nova.tests.unit import fake_instance +from nova.tests.unit import matchers from nova.virt import block_device as driver_block_device from nova.virt import driver from nova.volume import cinder diff --git a/nova/tests/virt/test_configdrive.py b/nova/tests/unit/virt/test_configdrive.py similarity index 100% rename from nova/tests/virt/test_configdrive.py rename to nova/tests/unit/virt/test_configdrive.py diff --git a/nova/tests/virt/test_diagnostics.py b/nova/tests/unit/virt/test_diagnostics.py similarity index 100% rename from nova/tests/virt/test_diagnostics.py rename to nova/tests/unit/virt/test_diagnostics.py diff --git a/nova/tests/virt/test_driver.py b/nova/tests/unit/virt/test_driver.py similarity index 92% rename from nova/tests/virt/test_driver.py rename to nova/tests/unit/virt/test_driver.py index 4101a6a9cecb..572afdedeca7 100644 --- a/nova/tests/virt/test_driver.py +++ b/nova/tests/unit/virt/test_driver.py @@ -37,8 +37,8 @@ class ToDriverRegistryTestCase(test.NoDBTestCase): def test_driver_dict_from_config(self): drvs = driver.driver_dict_from_config( [ - 'key1=nova.tests.virt.test_driver.FakeDriver', - 'key2=nova.tests.virt.test_driver.FakeDriver2', + 'key1=nova.tests.unit.virt.test_driver.FakeDriver', + 'key2=nova.tests.unit.virt.test_driver.FakeDriver2', ], 'arg1', 'arg2', param1='value1', param2='value2' ) diff --git a/nova/tests/virt/test_events.py b/nova/tests/unit/virt/test_events.py similarity index 100% rename from nova/tests/virt/test_events.py rename to nova/tests/unit/virt/test_events.py diff --git a/nova/tests/virt/test_hardware.py b/nova/tests/unit/virt/test_hardware.py similarity index 99% rename from nova/tests/virt/test_hardware.py rename to nova/tests/unit/virt/test_hardware.py index 5c94f8fd06b7..d0781a6ca760 100644 --- a/nova/tests/virt/test_hardware.py +++ b/nova/tests/unit/virt/test_hardware.py @@ -23,7 +23,7 @@ from nova import exception from nova import objects from nova.objects import base as base_obj from nova import test -from nova.tests import matchers +from nova.tests.unit import matchers from nova.virt import hardware as hw diff --git a/nova/tests/virt/test_imagecache.py b/nova/tests/unit/virt/test_imagecache.py similarity index 99% rename from nova/tests/virt/test_imagecache.py rename to nova/tests/unit/virt/test_imagecache.py index 693b0625d68e..dc587fb4bcd5 100644 --- a/nova/tests/virt/test_imagecache.py +++ b/nova/tests/unit/virt/test_imagecache.py @@ -16,7 +16,7 @@ from oslo.config import cfg from nova.compute import vm_states from nova import test -from nova.tests import fake_instance +from nova.tests.unit import fake_instance from nova.virt import imagecache CONF = cfg.CONF diff --git a/nova/tests/virt/test_images.py b/nova/tests/unit/virt/test_images.py similarity index 100% rename from nova/tests/virt/test_images.py rename to nova/tests/unit/virt/test_images.py diff --git a/nova/tests/virt/test_virt.py b/nova/tests/unit/virt/test_virt.py similarity index 100% rename from nova/tests/virt/test_virt.py rename to nova/tests/unit/virt/test_virt.py diff --git a/nova/tests/virt/test_virt_drivers.py b/nova/tests/unit/virt/test_virt_drivers.py similarity index 98% rename from nova/tests/virt/test_virt_drivers.py rename to nova/tests/unit/virt/test_virt_drivers.py index e4136d6eed64..48c009fd4224 100644 --- a/nova/tests/virt/test_virt_drivers.py +++ b/nova/tests/unit/virt/test_virt_drivers.py @@ -30,10 +30,10 @@ from nova import exception from nova import objects from nova.openstack.common import log as logging from nova import test -from nova.tests import fake_block_device -from nova.tests.image import fake as fake_image -from nova.tests import utils as test_utils -from nova.tests.virt.libvirt import fake_libvirt_utils +from nova.tests.unit import fake_block_device +from nova.tests.unit.image import fake as fake_image +from nova.tests.unit import utils as test_utils +from nova.tests.unit.virt.libvirt import fake_libvirt_utils from nova.virt import block_device as driver_block_device from nova.virt import event as virtevent from nova.virt import fake @@ -77,9 +77,11 @@ class _FakeDriverBackendTestCase(object): else: self.saved_libvirt = None - import nova.tests.virt.libvirt.fake_imagebackend as fake_imagebackend - import nova.tests.virt.libvirt.fake_libvirt_utils as fake_libvirt_utils - import nova.tests.virt.libvirt.fakelibvirt as fakelibvirt + import nova.tests.unit.virt.libvirt.fake_imagebackend as \ + fake_imagebackend + import nova.tests.unit.virt.libvirt.fake_libvirt_utils as \ + fake_libvirt_utils + import nova.tests.unit.virt.libvirt.fakelibvirt as fakelibvirt sys.modules['libvirt'] = fakelibvirt import nova.virt.libvirt.driver diff --git a/nova/tests/virt/test_volumeutils.py b/nova/tests/unit/virt/test_volumeutils.py similarity index 100% rename from nova/tests/virt/test_volumeutils.py rename to nova/tests/unit/virt/test_volumeutils.py diff --git a/nova/tests/virt/vmwareapi/__init__.py b/nova/tests/unit/virt/vmwareapi/__init__.py similarity index 100% rename from nova/tests/virt/vmwareapi/__init__.py rename to nova/tests/unit/virt/vmwareapi/__init__.py diff --git a/nova/tests/virt/vmwareapi/fake.py b/nova/tests/unit/virt/vmwareapi/fake.py similarity index 100% rename from nova/tests/virt/vmwareapi/fake.py rename to nova/tests/unit/virt/vmwareapi/fake.py diff --git a/nova/tests/virt/vmwareapi/stubs.py b/nova/tests/unit/virt/vmwareapi/stubs.py similarity index 97% rename from nova/tests/virt/vmwareapi/stubs.py rename to nova/tests/unit/virt/vmwareapi/stubs.py index fb207176cc6f..d126b36e0f77 100644 --- a/nova/tests/virt/vmwareapi/stubs.py +++ b/nova/tests/unit/virt/vmwareapi/stubs.py @@ -23,8 +23,8 @@ import mock from oslo.vmware import exceptions as vexc from nova import db -from nova.tests import test_flavors -from nova.tests.virt.vmwareapi import fake +from nova.tests.unit import test_flavors +from nova.tests.unit.virt.vmwareapi import fake from nova.virt.vmwareapi import driver from nova.virt.vmwareapi import images from nova.virt.vmwareapi import network_util diff --git a/nova/tests/virt/vmwareapi/test_configdrive.py b/nova/tests/unit/virt/vmwareapi/test_configdrive.py similarity index 93% rename from nova/tests/virt/vmwareapi/test_configdrive.py rename to nova/tests/unit/virt/vmwareapi/test_configdrive.py index 3cb06dee18fe..7b4b1bba1f74 100644 --- a/nova/tests/virt/vmwareapi/test_configdrive.py +++ b/nova/tests/unit/virt/vmwareapi/test_configdrive.py @@ -20,11 +20,11 @@ import mox from nova import context from nova.image import glance from nova import test -from nova.tests import fake_instance -import nova.tests.image.fake -from nova.tests import utils -from nova.tests.virt.vmwareapi import fake as vmwareapi_fake -from nova.tests.virt.vmwareapi import stubs +from nova.tests.unit import fake_instance +import nova.tests.unit.image.fake +from nova.tests.unit import utils +from nova.tests.unit.virt.vmwareapi import fake as vmwareapi_fake +from nova.tests.unit.virt.vmwareapi import stubs from nova.virt import fake from nova.virt.vmwareapi import driver from nova.virt.vmwareapi import images @@ -50,12 +50,12 @@ class ConfigDriveTestCase(test.NoDBTestCase): self.flags(vnc_enabled=False) vmwareapi_fake.reset() stubs.set_stubs(self.stubs) - nova.tests.image.fake.stub_out_image_service(self.stubs) + nova.tests.unit.image.fake.stub_out_image_service(self.stubs) self.conn = driver.VMwareVCDriver(fake.FakeVirtAPI) self.network_info = utils.get_test_network_info() self.node_name = '%s(%s)' % (self.conn.dict_mors.keys()[0], cluster_name) - image_ref = nova.tests.image.fake.get_valid_image_id() + image_ref = nova.tests.unit.image.fake.get_valid_image_id() instance_values = { 'vm_state': 'building', 'project_id': 'fake', @@ -118,7 +118,7 @@ class ConfigDriveTestCase(test.NoDBTestCase): def tearDown(self): super(ConfigDriveTestCase, self).tearDown() vmwareapi_fake.cleanup() - nova.tests.image.fake.FakeImageService_reset() + nova.tests.unit.image.fake.FakeImageService_reset() def _spawn_vm(self, injected_files=None, admin_password=None, block_device_info=None): diff --git a/nova/tests/virt/vmwareapi/test_driver_api.py b/nova/tests/unit/virt/vmwareapi/test_driver_api.py similarity index 99% rename from nova/tests/virt/vmwareapi/test_driver_api.py rename to nova/tests/unit/virt/vmwareapi/test_driver_api.py index 384f579ffaf5..5f7eb76a628a 100644 --- a/nova/tests/virt/vmwareapi/test_driver_api.py +++ b/nova/tests/unit/virt/vmwareapi/test_driver_api.py @@ -48,13 +48,13 @@ from nova.image import glance from nova.network import model as network_model from nova.openstack.common import uuidutils from nova import test -from nova.tests import fake_instance -import nova.tests.image.fake -from nova.tests import matchers -from nova.tests import test_flavors -from nova.tests import utils -from nova.tests.virt.vmwareapi import fake as vmwareapi_fake -from nova.tests.virt.vmwareapi import stubs +from nova.tests.unit import fake_instance +import nova.tests.unit.image.fake +from nova.tests.unit import matchers +from nova.tests.unit import test_flavors +from nova.tests.unit import utils +from nova.tests.unit.virt.vmwareapi import fake as vmwareapi_fake +from nova.tests.unit.virt.vmwareapi import stubs from nova import utils as nova_utils from nova.virt import driver as v_driver from nova.virt.vmwareapi import constants @@ -216,7 +216,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase): self.context = context.RequestContext(self.user_id, self.project_id) stubs.set_stubs(self.stubs) vmwareapi_fake.reset() - nova.tests.image.fake.stub_out_image_service(self.stubs) + nova.tests.unit.image.fake.stub_out_image_service(self.stubs) if create_connection: self.conn = driver.VMwareVCDriver(None, False) self._set_exception_vars() @@ -232,7 +232,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase): # NOTE(vish): none of the network plugging code is actually # being tested self.network_info = utils.get_test_network_info() - image_ref = nova.tests.image.fake.get_valid_image_id() + image_ref = nova.tests.unit.image.fake.get_valid_image_id() (image_service, image_id) = glance.get_remote_image_service( self.context, image_ref) metadata = image_service.show(self.context, image_id) @@ -242,7 +242,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase): 'size': int(metadata['size']), } self.fake_image_uuid = self.image['id'] - nova.tests.image.fake.stub_out_image_service(self.stubs) + nova.tests.unit.image.fake.stub_out_image_service(self.stubs) self.vnc_host = 'ha-host' self.instance_without_compute = {'node': None, 'vm_state': 'building', @@ -271,7 +271,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase): def tearDown(self): super(VMwareAPIVMTestCase, self).tearDown() vmwareapi_fake.cleanup() - nova.tests.image.fake.FakeImageService_reset() + nova.tests.unit.image.fake.FakeImageService_reset() def test_get_host_ip_addr(self): self.assertEqual('test_url', self.conn.get_host_ip_addr()) diff --git a/nova/tests/virt/vmwareapi/test_ds_util.py b/nova/tests/unit/virt/vmwareapi/test_ds_util.py similarity index 99% rename from nova/tests/virt/vmwareapi/test_ds_util.py rename to nova/tests/unit/virt/vmwareapi/test_ds_util.py index 0ad8ef213d1e..6f5cf74b2649 100644 --- a/nova/tests/virt/vmwareapi/test_ds_util.py +++ b/nova/tests/unit/virt/vmwareapi/test_ds_util.py @@ -23,7 +23,7 @@ from testtools import matchers from nova import exception from nova.i18n import _ from nova import test -from nova.tests.virt.vmwareapi import fake +from nova.tests.unit.virt.vmwareapi import fake from nova.virt.vmwareapi import ds_util diff --git a/nova/tests/virt/vmwareapi/test_ds_util_datastore_selection.py b/nova/tests/unit/virt/vmwareapi/test_ds_util_datastore_selection.py similarity index 100% rename from nova/tests/virt/vmwareapi/test_ds_util_datastore_selection.py rename to nova/tests/unit/virt/vmwareapi/test_ds_util_datastore_selection.py diff --git a/nova/tests/virt/vmwareapi/test_imagecache.py b/nova/tests/unit/virt/vmwareapi/test_imagecache.py similarity index 99% rename from nova/tests/virt/vmwareapi/test_imagecache.py rename to nova/tests/unit/virt/vmwareapi/test_imagecache.py index 9f4fa9137661..d2779631069a 100644 --- a/nova/tests/virt/vmwareapi/test_imagecache.py +++ b/nova/tests/unit/virt/vmwareapi/test_imagecache.py @@ -20,8 +20,8 @@ from oslo.config import cfg from oslo.utils import timeutils from nova import test -from nova.tests import fake_instance -from nova.tests.virt.vmwareapi import fake +from nova.tests.unit import fake_instance +from nova.tests.unit.virt.vmwareapi import fake from nova.virt.vmwareapi import ds_util from nova.virt.vmwareapi import imagecache from nova.virt.vmwareapi import vim_util diff --git a/nova/tests/virt/vmwareapi/test_images.py b/nova/tests/unit/virt/vmwareapi/test_images.py similarity index 97% rename from nova/tests/virt/vmwareapi/test_images.py rename to nova/tests/unit/virt/vmwareapi/test_images.py index 613705cf78cf..07fc3be2140d 100644 --- a/nova/tests/virt/vmwareapi/test_images.py +++ b/nova/tests/unit/virt/vmwareapi/test_images.py @@ -22,7 +22,7 @@ from oslo.utils import units from nova import exception from nova import test -import nova.tests.image.fake +import nova.tests.unit.image.fake from nova.virt.vmwareapi import constants from nova.virt.vmwareapi import images from nova.virt.vmwareapi import read_write_util @@ -41,7 +41,7 @@ class VMwareImagesTestCase(test.NoDBTestCase): context = mock.MagicMock() image_data = { - 'id': nova.tests.image.fake.get_valid_image_id(), + 'id': nova.tests.unit.image.fake.get_valid_image_id(), 'disk_format': 'vmdk', 'size': 512, } @@ -95,7 +95,7 @@ class VMwareImagesTestCase(test.NoDBTestCase): def test_from_image_with_image_ref(self): raw_disk_size_in_gb = 83 raw_disk_size_in_bytes = raw_disk_size_in_gb * units.Gi - image_id = nova.tests.image.fake.get_valid_image_id() + image_id = nova.tests.unit.image.fake.get_valid_image_id() mdata = {'size': raw_disk_size_in_bytes, 'disk_format': 'vmdk', 'properties': { @@ -128,7 +128,7 @@ class VMwareImagesTestCase(test.NoDBTestCase): raw_disk_size_in_gb = 93 raw_disk_size_in_btyes = raw_disk_size_in_gb * units.Gi - image_id = nova.tests.image.fake.get_valid_image_id() + image_id = nova.tests.unit.image.fake.get_valid_image_id() mdata = {'size': raw_disk_size_in_btyes, 'disk_format': disk_format, 'properties': { diff --git a/nova/tests/virt/vmwareapi/test_io_util.py b/nova/tests/unit/virt/vmwareapi/test_io_util.py similarity index 100% rename from nova/tests/virt/vmwareapi/test_io_util.py rename to nova/tests/unit/virt/vmwareapi/test_io_util.py diff --git a/nova/tests/virt/vmwareapi/test_read_write_util.py b/nova/tests/unit/virt/vmwareapi/test_read_write_util.py similarity index 100% rename from nova/tests/virt/vmwareapi/test_read_write_util.py rename to nova/tests/unit/virt/vmwareapi/test_read_write_util.py diff --git a/nova/tests/virt/vmwareapi/test_vif.py b/nova/tests/unit/virt/vmwareapi/test_vif.py similarity index 99% rename from nova/tests/virt/vmwareapi/test_vif.py rename to nova/tests/unit/virt/vmwareapi/test_vif.py index 3e446e5e7d9d..2a4d086c360d 100644 --- a/nova/tests/virt/vmwareapi/test_vif.py +++ b/nova/tests/unit/virt/vmwareapi/test_vif.py @@ -22,9 +22,9 @@ from oslo.vmware import exceptions as vexc from nova import exception from nova.network import model as network_model from nova import test -from nova.tests import matchers -from nova.tests import utils -from nova.tests.virt.vmwareapi import fake +from nova.tests.unit import matchers +from nova.tests.unit import utils +from nova.tests.unit.virt.vmwareapi import fake from nova.virt.vmwareapi import network_util from nova.virt.vmwareapi import vif from nova.virt.vmwareapi import vim_util diff --git a/nova/tests/virt/vmwareapi/test_vim_util.py b/nova/tests/unit/virt/vmwareapi/test_vim_util.py similarity index 97% rename from nova/tests/virt/vmwareapi/test_vim_util.py rename to nova/tests/unit/virt/vmwareapi/test_vim_util.py index 0eb9a096f31d..d00e127b669f 100644 --- a/nova/tests/virt/vmwareapi/test_vim_util.py +++ b/nova/tests/unit/virt/vmwareapi/test_vim_util.py @@ -18,8 +18,8 @@ import fixtures import mock from nova import test -from nova.tests.virt.vmwareapi import fake -from nova.tests.virt.vmwareapi import stubs +from nova.tests.unit.virt.vmwareapi import fake +from nova.tests.unit.virt.vmwareapi import stubs from nova.virt.vmwareapi import driver from nova.virt.vmwareapi import vim_util diff --git a/nova/tests/virt/vmwareapi/test_vm_util.py b/nova/tests/unit/virt/vmwareapi/test_vm_util.py similarity index 99% rename from nova/tests/virt/vmwareapi/test_vm_util.py rename to nova/tests/unit/virt/vmwareapi/test_vm_util.py index 4e4e141ca622..906d03cf66f7 100644 --- a/nova/tests/virt/vmwareapi/test_vm_util.py +++ b/nova/tests/unit/virt/vmwareapi/test_vm_util.py @@ -26,9 +26,9 @@ from nova import exception from nova.network import model as network_model from nova.openstack.common import uuidutils from nova import test -from nova.tests import fake_instance -from nova.tests.virt.vmwareapi import fake -from nova.tests.virt.vmwareapi import stubs +from nova.tests.unit import fake_instance +from nova.tests.unit.virt.vmwareapi import fake +from nova.tests.unit.virt.vmwareapi import stubs from nova.virt.vmwareapi import driver from nova.virt.vmwareapi import vm_util diff --git a/nova/tests/virt/vmwareapi/test_vmops.py b/nova/tests/unit/virt/vmwareapi/test_vmops.py similarity index 99% rename from nova/tests/virt/vmwareapi/test_vmops.py rename to nova/tests/unit/virt/vmwareapi/test_vmops.py index dde695455c26..e70f4661b01d 100644 --- a/nova/tests/virt/vmwareapi/test_vmops.py +++ b/nova/tests/unit/virt/vmwareapi/test_vmops.py @@ -26,10 +26,10 @@ from nova.network import model as network_model from nova import objects from nova.openstack.common import uuidutils from nova import test -from nova.tests import fake_instance -import nova.tests.image.fake -from nova.tests.virt.vmwareapi import fake as vmwareapi_fake -from nova.tests.virt.vmwareapi import stubs +from nova.tests.unit import fake_instance +import nova.tests.unit.image.fake +from nova.tests.unit.virt.vmwareapi import fake as vmwareapi_fake +from nova.tests.unit.virt.vmwareapi import stubs from nova.virt.vmwareapi import constants from nova.virt.vmwareapi import driver from nova.virt.vmwareapi import ds_util @@ -62,7 +62,7 @@ class VMwareVMOpsTestCase(test.NoDBTestCase): self._virtapi = mock.Mock() self._vmops = vmops.VMwareVMOps(self._session, self._virtapi, None) - self._image_id = nova.tests.image.fake.get_valid_image_id() + self._image_id = nova.tests.unit.image.fake.get_valid_image_id() self._instance_values = { 'name': 'fake_name', 'uuid': 'fake_uuid', @@ -995,7 +995,7 @@ class VMwareVMOpsTestCase(test.NoDBTestCase): config_drive=True) def test_build_virtual_machine(self): - image_id = nova.tests.image.fake.get_valid_image_id() + image_id = nova.tests.unit.image.fake.get_valid_image_id() image = images.VMwareImage(image_id=image_id) vm_ref = self._vmops.build_virtual_machine(self._instance, diff --git a/nova/tests/virt/vmwareapi/test_volumeops.py b/nova/tests/unit/virt/vmwareapi/test_volumeops.py similarity index 97% rename from nova/tests/virt/vmwareapi/test_volumeops.py rename to nova/tests/unit/virt/vmwareapi/test_volumeops.py index 1d05843a549b..8dc6b500cbad 100644 --- a/nova/tests/virt/vmwareapi/test_volumeops.py +++ b/nova/tests/unit/virt/vmwareapi/test_volumeops.py @@ -17,8 +17,8 @@ import contextlib import mock from nova import test -from nova.tests.virt.vmwareapi import fake as vmwareapi_fake -from nova.tests.virt.vmwareapi import stubs +from nova.tests.unit.virt.vmwareapi import fake as vmwareapi_fake +from nova.tests.unit.virt.vmwareapi import stubs from nova.virt.vmwareapi import driver from nova.virt.vmwareapi import volumeops diff --git a/nova/tests/virt/xenapi/__init__.py b/nova/tests/unit/virt/xenapi/__init__.py similarity index 100% rename from nova/tests/virt/xenapi/__init__.py rename to nova/tests/unit/virt/xenapi/__init__.py diff --git a/nova/tests/virt/xenapi/client/__init__.py b/nova/tests/unit/virt/xenapi/client/__init__.py similarity index 100% rename from nova/tests/virt/xenapi/client/__init__.py rename to nova/tests/unit/virt/xenapi/client/__init__.py diff --git a/nova/tests/virt/xenapi/client/test_objects.py b/nova/tests/unit/virt/xenapi/client/test_objects.py similarity index 98% rename from nova/tests/virt/xenapi/client/test_objects.py rename to nova/tests/unit/virt/xenapi/client/test_objects.py index 31d3df5c63b5..efaf17a9c7db 100644 --- a/nova/tests/virt/xenapi/client/test_objects.py +++ b/nova/tests/unit/virt/xenapi/client/test_objects.py @@ -15,7 +15,7 @@ import mock -from nova.tests.virt.xenapi import stubs +from nova.tests.unit.virt.xenapi import stubs from nova import utils from nova.virt.xenapi.client import objects diff --git a/nova/tests/virt/xenapi/client/test_session.py b/nova/tests/unit/virt/xenapi/client/test_session.py similarity index 99% rename from nova/tests/virt/xenapi/client/test_session.py rename to nova/tests/unit/virt/xenapi/client/test_session.py index 02361db42f41..1fbbbf752de3 100644 --- a/nova/tests/virt/xenapi/client/test_session.py +++ b/nova/tests/unit/virt/xenapi/client/test_session.py @@ -19,7 +19,7 @@ import socket import mock from nova import exception -from nova.tests.virt.xenapi import stubs +from nova.tests.unit.virt.xenapi import stubs from nova import version from nova.virt.xenapi.client import session diff --git a/nova/tests/virt/xenapi/image/__init__.py b/nova/tests/unit/virt/xenapi/image/__init__.py similarity index 100% rename from nova/tests/virt/xenapi/image/__init__.py rename to nova/tests/unit/virt/xenapi/image/__init__.py diff --git a/nova/tests/virt/xenapi/image/test_bittorrent.py b/nova/tests/unit/virt/xenapi/image/test_bittorrent.py similarity index 99% rename from nova/tests/virt/xenapi/image/test_bittorrent.py rename to nova/tests/unit/virt/xenapi/image/test_bittorrent.py index 267b8c939328..5422036b98d0 100644 --- a/nova/tests/virt/xenapi/image/test_bittorrent.py +++ b/nova/tests/unit/virt/xenapi/image/test_bittorrent.py @@ -20,7 +20,7 @@ import six from nova import context from nova.i18n import _ from nova import test -from nova.tests.virt.xenapi import stubs +from nova.tests.unit.virt.xenapi import stubs from nova.virt.xenapi import driver as xenapi_conn from nova.virt.xenapi import fake from nova.virt.xenapi.image import bittorrent diff --git a/nova/tests/virt/xenapi/image/test_glance.py b/nova/tests/unit/virt/xenapi/image/test_glance.py similarity index 99% rename from nova/tests/virt/xenapi/image/test_glance.py rename to nova/tests/unit/virt/xenapi/image/test_glance.py index b2150980f75e..8fbb853efa68 100644 --- a/nova/tests/virt/xenapi/image/test_glance.py +++ b/nova/tests/unit/virt/xenapi/image/test_glance.py @@ -23,7 +23,7 @@ from nova.compute import utils as compute_utils from nova import context from nova import exception from nova.openstack.common import log as logging -from nova.tests.virt.xenapi import stubs +from nova.tests.unit.virt.xenapi import stubs from nova.virt.xenapi import driver as xenapi_conn from nova.virt.xenapi import fake from nova.virt.xenapi.image import glance diff --git a/nova/tests/virt/xenapi/image/test_utils.py b/nova/tests/unit/virt/xenapi/image/test_utils.py similarity index 100% rename from nova/tests/virt/xenapi/image/test_utils.py rename to nova/tests/unit/virt/xenapi/image/test_utils.py diff --git a/nova/tests/virt/xenapi/image/test_vdi_through_dev.py b/nova/tests/unit/virt/xenapi/image/test_vdi_through_dev.py similarity index 100% rename from nova/tests/virt/xenapi/image/test_vdi_through_dev.py rename to nova/tests/unit/virt/xenapi/image/test_vdi_through_dev.py diff --git a/nova/tests/virt/xenapi/stubs.py b/nova/tests/unit/virt/xenapi/stubs.py similarity index 99% rename from nova/tests/virt/xenapi/stubs.py rename to nova/tests/unit/virt/xenapi/stubs.py index 4ea0301b914e..ad13ca41df85 100644 --- a/nova/tests/virt/xenapi/stubs.py +++ b/nova/tests/unit/virt/xenapi/stubs.py @@ -19,7 +19,7 @@ import random from oslo.serialization import jsonutils from nova import test -import nova.tests.image.fake +import nova.tests.unit.image.fake from nova.virt.xenapi.client import session from nova.virt.xenapi import fake from nova.virt.xenapi import vm_utils @@ -72,7 +72,7 @@ def stubout_get_this_vm_uuid(stubs): def stubout_image_service_download(stubs): def fake_download(*args, **kwargs): pass - stubs.Set(nova.tests.image.fake._FakeImageService, + stubs.Set(nova.tests.unit.image.fake._FakeImageService, 'download', fake_download) diff --git a/nova/tests/virt/xenapi/test_agent.py b/nova/tests/unit/virt/xenapi/test_agent.py similarity index 100% rename from nova/tests/virt/xenapi/test_agent.py rename to nova/tests/unit/virt/xenapi/test_agent.py diff --git a/nova/tests/virt/xenapi/test_driver.py b/nova/tests/unit/virt/xenapi/test_driver.py similarity index 98% rename from nova/tests/virt/xenapi/test_driver.py rename to nova/tests/unit/virt/xenapi/test_driver.py index 6fc3db510086..eb3e02f29e9f 100644 --- a/nova/tests/virt/xenapi/test_driver.py +++ b/nova/tests/unit/virt/xenapi/test_driver.py @@ -19,7 +19,7 @@ import mock from oslo.utils import units from nova.compute import arch -from nova.tests.virt.xenapi import stubs +from nova.tests.unit.virt.xenapi import stubs from nova.virt import driver from nova.virt import fake from nova.virt import xenapi diff --git a/nova/tests/virt/xenapi/test_network_utils.py b/nova/tests/unit/virt/xenapi/test_network_utils.py similarity index 98% rename from nova/tests/virt/xenapi/test_network_utils.py rename to nova/tests/unit/virt/xenapi/test_network_utils.py index 9c42c5871ffb..5aa660f2a7fd 100644 --- a/nova/tests/virt/xenapi/test_network_utils.py +++ b/nova/tests/unit/virt/xenapi/test_network_utils.py @@ -16,7 +16,7 @@ import mock from nova import exception -from nova.tests.virt.xenapi import stubs +from nova.tests.unit.virt.xenapi import stubs from nova.virt.xenapi import network_utils diff --git a/nova/tests/virt/xenapi/test_vm_utils.py b/nova/tests/unit/virt/xenapi/test_vm_utils.py similarity index 99% rename from nova/tests/virt/xenapi/test_vm_utils.py rename to nova/tests/unit/virt/xenapi/test_vm_utils.py index f88e9ede5108..ac54bd148060 100644 --- a/nova/tests/virt/xenapi/test_vm_utils.py +++ b/nova/tests/unit/virt/xenapi/test_vm_utils.py @@ -35,8 +35,8 @@ from nova import exception from nova.i18n import _ from nova.openstack.common.fixture import config as config_fixture from nova import test -from nova.tests.virt.xenapi import stubs -from nova.tests.virt.xenapi import test_xenapi +from nova.tests.unit.virt.xenapi import stubs +from nova.tests.unit.virt.xenapi import test_xenapi from nova import utils from nova.virt.xenapi.client import session as xenapi_session from nova.virt.xenapi import driver as xenapi_conn diff --git a/nova/tests/virt/xenapi/test_vmops.py b/nova/tests/unit/virt/xenapi/test_vmops.py similarity index 99% rename from nova/tests/virt/xenapi/test_vmops.py rename to nova/tests/unit/virt/xenapi/test_vmops.py index e6bd462e9b75..8140f997d2a1 100644 --- a/nova/tests/virt/xenapi/test_vmops.py +++ b/nova/tests/unit/virt/xenapi/test_vmops.py @@ -23,8 +23,8 @@ from nova import exception from nova import objects from nova.pci import manager as pci_manager from nova import test -from nova.tests import fake_instance -from nova.tests.virt.xenapi import stubs +from nova.tests.unit import fake_instance +from nova.tests.unit.virt.xenapi import stubs from nova.virt import fake from nova.virt.xenapi import agent as xenapi_agent from nova.virt.xenapi.client import session as xenapi_session diff --git a/nova/tests/virt/xenapi/test_volume_utils.py b/nova/tests/unit/virt/xenapi/test_volume_utils.py similarity index 99% rename from nova/tests/virt/xenapi/test_volume_utils.py rename to nova/tests/unit/virt/xenapi/test_volume_utils.py index 02b33e05d0ff..59fd4626b93f 100644 --- a/nova/tests/virt/xenapi/test_volume_utils.py +++ b/nova/tests/unit/virt/xenapi/test_volume_utils.py @@ -18,7 +18,7 @@ import mock from nova import exception from nova import test -from nova.tests.virt.xenapi import stubs +from nova.tests.unit.virt.xenapi import stubs from nova.virt.xenapi import volume_utils diff --git a/nova/tests/virt/xenapi/test_volumeops.py b/nova/tests/unit/virt/xenapi/test_volumeops.py similarity index 99% rename from nova/tests/virt/xenapi/test_volumeops.py rename to nova/tests/unit/virt/xenapi/test_volumeops.py index fbb4ad09aff0..0e840bb20971 100644 --- a/nova/tests/virt/xenapi/test_volumeops.py +++ b/nova/tests/unit/virt/xenapi/test_volumeops.py @@ -16,7 +16,7 @@ import mock from nova import exception from nova import test -from nova.tests.virt.xenapi import stubs +from nova.tests.unit.virt.xenapi import stubs from nova.virt.xenapi import vm_utils from nova.virt.xenapi import volume_utils from nova.virt.xenapi import volumeops diff --git a/nova/tests/virt/xenapi/test_xenapi.py b/nova/tests/unit/virt/xenapi/test_xenapi.py similarity index 99% rename from nova/tests/virt/xenapi/test_xenapi.py rename to nova/tests/unit/virt/xenapi/test_xenapi.py index 98e0658f5519..c90f8c2f6359 100644 --- a/nova/tests/virt/xenapi/test_xenapi.py +++ b/nova/tests/unit/virt/xenapi/test_xenapi.py @@ -47,14 +47,14 @@ from nova.objects import instance as instance_obj from nova.openstack.common.fixture import config as config_fixture from nova.openstack.common import log as logging from nova import test -from nova.tests.db import fakes as db_fakes -from nova.tests import fake_instance -from nova.tests import fake_network -from nova.tests import fake_processutils -import nova.tests.image.fake as fake_image -from nova.tests import matchers -from nova.tests.objects import test_aggregate -from nova.tests.virt.xenapi import stubs +from nova.tests.unit.db import fakes as db_fakes +from nova.tests.unit import fake_instance +from nova.tests.unit import fake_network +from nova.tests.unit import fake_processutils +import nova.tests.unit.image.fake as fake_image +from nova.tests.unit import matchers +from nova.tests.unit.objects import test_aggregate +from nova.tests.unit.virt.xenapi import stubs from nova.virt import fake from nova.virt.xenapi import agent from nova.virt.xenapi.client import session as xenapi_session @@ -2509,9 +2509,10 @@ class XenAPIBWCountersTestCase(stubs.XenAPITestBaseNoDB): # TODO(salvatore-orlando): this class and -# nova.tests.virt.test_libvirt.IPTablesFirewallDriverTestCase share a lot of -# code. Consider abstracting common code in a base class for firewall driver -# testing. +# nova.tests.unit.virt.test_libvirt.IPTablesFirewallDriverTestCase +# share a lot of code. Consider abstracting common code in a base +# class for firewall driver testing. +# # FIXME(sirp): convert this to use XenAPITestBaseNoDB class XenAPIDom0IptablesFirewallTestCase(stubs.XenAPITestBase): @@ -4055,7 +4056,7 @@ class XenAPISessionTestCase(test.NoDBTestCase): # Import the plugin to extract its version path = os.path.dirname(__file__) - rel_path_elem = "../../../../plugins/xenserver/xenapi/etc/xapi.d/" \ + rel_path_elem = "../../../../../plugins/xenserver/xenapi/etc/xapi.d/" \ "plugins/nova_plugin_version" for elem in rel_path_elem.split('/'): path = os.path.join(path, elem) diff --git a/nova/tests/virt/xenapi/vm_rrd.xml b/nova/tests/unit/virt/xenapi/vm_rrd.xml similarity index 100% rename from nova/tests/virt/xenapi/vm_rrd.xml rename to nova/tests/unit/virt/xenapi/vm_rrd.xml diff --git a/nova/tests/volume/__init__.py b/nova/tests/unit/volume/__init__.py similarity index 100% rename from nova/tests/volume/__init__.py rename to nova/tests/unit/volume/__init__.py diff --git a/nova/tests/volume/encryptors/__init__.py b/nova/tests/unit/volume/encryptors/__init__.py similarity index 100% rename from nova/tests/volume/encryptors/__init__.py rename to nova/tests/unit/volume/encryptors/__init__.py diff --git a/nova/tests/volume/encryptors/test_base.py b/nova/tests/unit/volume/encryptors/test_base.py similarity index 97% rename from nova/tests/volume/encryptors/test_base.py rename to nova/tests/unit/volume/encryptors/test_base.py index c8f81743ec86..d60c20ecd3c1 100644 --- a/nova/tests/volume/encryptors/test_base.py +++ b/nova/tests/unit/volume/encryptors/test_base.py @@ -18,7 +18,7 @@ import mock from nova.i18n import _LE from nova import keymgr from nova import test -from nova.tests.keymgr import fake +from nova.tests.unit.keymgr import fake from nova.volume import encryptors diff --git a/nova/tests/volume/encryptors/test_cryptsetup.py b/nova/tests/unit/volume/encryptors/test_cryptsetup.py similarity index 98% rename from nova/tests/volume/encryptors/test_cryptsetup.py rename to nova/tests/unit/volume/encryptors/test_cryptsetup.py index 5ed64217fcda..ab84d17d9bcc 100644 --- a/nova/tests/volume/encryptors/test_cryptsetup.py +++ b/nova/tests/unit/volume/encryptors/test_cryptsetup.py @@ -18,7 +18,7 @@ import array import os from nova.keymgr import key -from nova.tests.volume.encryptors import test_base +from nova.tests.unit.volume.encryptors import test_base from nova import utils from nova.volume.encryptors import cryptsetup diff --git a/nova/tests/volume/encryptors/test_luks.py b/nova/tests/unit/volume/encryptors/test_luks.py similarity index 97% rename from nova/tests/volume/encryptors/test_luks.py rename to nova/tests/unit/volume/encryptors/test_luks.py index 6db390044e4c..00e03053ea13 100644 --- a/nova/tests/volume/encryptors/test_luks.py +++ b/nova/tests/unit/volume/encryptors/test_luks.py @@ -14,7 +14,7 @@ # under the License. -from nova.tests.volume.encryptors import test_cryptsetup +from nova.tests.unit.volume.encryptors import test_cryptsetup from nova.volume.encryptors import luks diff --git a/nova/tests/volume/encryptors/test_nop.py b/nova/tests/unit/volume/encryptors/test_nop.py similarity index 94% rename from nova/tests/volume/encryptors/test_nop.py rename to nova/tests/unit/volume/encryptors/test_nop.py index 90e43d924dc2..aa32a9c0e6ad 100644 --- a/nova/tests/volume/encryptors/test_nop.py +++ b/nova/tests/unit/volume/encryptors/test_nop.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.volume.encryptors import test_base +from nova.tests.unit.volume.encryptors import test_base from nova.volume.encryptors import nop diff --git a/nova/tests/volume/test_cinder.py b/nova/tests/unit/volume/test_cinder.py similarity index 100% rename from nova/tests/volume/test_cinder.py rename to nova/tests/unit/volume/test_cinder.py diff --git a/run_tests.sh b/run_tests.sh index de7a469bf43c..df7e1be856e3 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -115,7 +115,7 @@ function run_tests { if [ "$testropts" = "" ] && [ "$testrargs" = "" ]; then # Default to running all tests if specific test is not # provided. - testrargs="discover ./nova/tests" + testrargs="discover ./nova/tests/unit" fi ${wrapper} python -m testtools.run $testropts $testrargs diff --git a/tox.ini b/tox.ini index 0624819d9742..484e479777a9 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ install_command = pip install -U --force-reinstall {opts} {packages} # random hash seed successfully. setenv = VIRTUAL_ENV={envdir} PYTHONHASHSEED=0 + OS_TEST_PATH=./nova/tests/unit deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands =