From 9f9802eebd56b7fa56de9c7e64f3424fc6334ea0 Mon Sep 17 00:00:00 2001 From: He Jie Xu Date: Fri, 14 Aug 2015 16:11:13 +0800 Subject: [PATCH] Move the v2 api_sample functional tests This patch move the all v2.1 api sample tests under 'functional/api_sample_tests'. Also move sample files under 'doc/api-samples'. Co-Authored-By: Ed Leafe Co-Authored-By: Alex Xu Partial-Bug: #1462901 Change-Id: I2b924f2ad7687a23a018a9b658e8acd9e04d7963 --- .../api_samples/all_extensions/extensions-list-resp-v2.json | 0 .../api_samples/all_extensions/extensions-list-resp.json | 0 .../all_extensions/server-action-confirm-resize.json | 0 .../all_extensions/server-action-create-image.json | 0 .../api_samples/all_extensions/server-action-reboot.json | 0 .../all_extensions/server-action-rebuild-resp.json | 0 .../api_samples/all_extensions/server-action-rebuild.json | 0 .../api_samples/all_extensions/server-action-resize.json | 0 .../all_extensions/server-action-revert-resize.json | 0 doc/{v3 => }/api_samples/all_extensions/server-get-resp.json | 0 doc/{v3 => }/api_samples/all_extensions/server-post-req.json | 0 doc/{v3 => }/api_samples/all_extensions/server-post-resp.json | 0 .../api_samples/all_extensions/servers-details-resp.json | 0 .../api_samples/all_extensions/servers-list-resp.json | 0 doc/{v3 => }/api_samples/consoles/consoles-get-resp.json | 0 doc/{v3 => }/api_samples/consoles/consoles-list-get-resp.json | 0 .../api_samples/extension-info/extensions-get-resp.json | 0 .../flavor-access/flavor-access-add-tenant-req.json | 0 .../flavor-access/flavor-access-add-tenant-resp.json | 0 .../api_samples/flavor-access/flavor-access-create-req.json | 0 .../api_samples/flavor-access/flavor-access-create-resp.json | 0 .../api_samples/flavor-access/flavor-access-detail-resp.json | 0 .../api_samples/flavor-access/flavor-access-list-resp.json | 0 .../flavor-access/flavor-access-remove-tenant-req.json | 0 .../flavor-access/flavor-access-remove-tenant-resp.json | 0 .../api_samples/flavor-access/flavor-access-show-resp.json | 0 .../flavor-extra-specs/flavor-extra-specs-create-req.json | 0 .../flavor-extra-specs/flavor-extra-specs-create-resp.json | 0 .../flavor-extra-specs/flavor-extra-specs-get-resp.json | 0 .../flavor-extra-specs/flavor-extra-specs-list-resp.json | 0 .../flavor-extra-specs/flavor-extra-specs-update-req.json | 0 .../flavor-extra-specs/flavor-extra-specs-update-resp.json | 0 .../api_samples/flavor-manage/flavor-create-post-req.json | 0 .../api_samples/flavor-manage/flavor-create-post-resp.json | 0 doc/{v3 => }/api_samples/flavors/flavor-get-resp.json | 0 doc/{v3 => }/api_samples/flavors/flavors-detail-resp.json | 0 doc/{v3 => }/api_samples/flavors/flavors-list-resp.json | 0 doc/{v3 => }/api_samples/image-size/image-get-resp.json | 0 .../api_samples/image-size/images-details-get-resp.json | 0 doc/{v3 => }/api_samples/images/image-get-resp.json | 0 doc/{v3 => }/api_samples/images/image-meta-key-get.json | 0 doc/{v3 => }/api_samples/images/image-meta-key-put-req.json | 0 doc/{v3 => }/api_samples/images/image-meta-key-put-resp.json | 0 doc/{v3 => }/api_samples/images/image-metadata-get-resp.json | 0 doc/{v3 => }/api_samples/images/image-metadata-post-req.json | 0 doc/{v3 => }/api_samples/images/image-metadata-post-resp.json | 0 doc/{v3 => }/api_samples/images/image-metadata-put-req.json | 0 doc/{v3 => }/api_samples/images/image-metadata-put-resp.json | 0 doc/{v3 => }/api_samples/images/images-details-get-resp.json | 0 doc/{v3 => }/api_samples/images/images-list-get-resp.json | 0 doc/{v3 => }/api_samples/keypairs/keypairs-get-resp.json | 0 .../api_samples/keypairs/keypairs-import-post-req.json | 0 .../api_samples/keypairs/keypairs-import-post-resp.json | 0 doc/{v3 => }/api_samples/keypairs/keypairs-list-resp.json | 0 doc/{v3 => }/api_samples/keypairs/keypairs-post-req.json | 0 doc/{v3 => }/api_samples/keypairs/keypairs-post-resp.json | 0 .../api_samples/keypairs/v2.10/keypairs-get-resp.json | 0 .../api_samples/keypairs/v2.10/keypairs-import-post-req.json | 0 .../api_samples/keypairs/v2.10/keypairs-import-post-resp.json | 0 .../api_samples/keypairs/v2.10/keypairs-list-resp.json | 0 .../api_samples/keypairs/v2.10/keypairs-post-req.json | 0 .../api_samples/keypairs/v2.10/keypairs-post-resp.json | 0 doc/{v3 => }/api_samples/keypairs/v2.2/keypairs-get-resp.json | 0 .../api_samples/keypairs/v2.2/keypairs-import-post-req.json | 0 .../api_samples/keypairs/v2.2/keypairs-import-post-resp.json | 0 .../api_samples/keypairs/v2.2/keypairs-list-resp.json | 0 doc/{v3 => }/api_samples/keypairs/v2.2/keypairs-post-req.json | 0 .../api_samples/keypairs/v2.2/keypairs-post-resp.json | 0 .../api_samples/os-access-ips/server-action-rebuild-resp.json | 0 .../api_samples/os-access-ips/server-action-rebuild.json | 0 doc/{v3 => }/api_samples/os-access-ips/server-get-resp.json | 0 doc/{v3 => }/api_samples/os-access-ips/server-post-req.json | 0 doc/{v3 => }/api_samples/os-access-ips/server-post-resp.json | 0 doc/{v3 => }/api_samples/os-access-ips/server-put-req.json | 0 doc/{v3 => }/api_samples/os-access-ips/server-put-resp.json | 0 .../api_samples/os-access-ips/servers-details-resp.json | 0 .../os-admin-actions/admin-actions-inject-network-info.json | 0 .../os-admin-actions/admin-actions-reset-network.json | 0 .../os-admin-actions/admin-actions-reset-server-state.json | 0 .../os-admin-password/admin-password-change-password.json | 0 doc/{v3 => }/api_samples/os-agents/agent-post-req.json | 0 doc/{v3 => }/api_samples/os-agents/agent-post-resp.json | 0 doc/{v3 => }/api_samples/os-agents/agent-update-put-req.json | 0 doc/{v3 => }/api_samples/os-agents/agent-update-put-resp.json | 0 doc/{v3 => }/api_samples/os-agents/agents-get-resp.json | 0 .../os-aggregates/aggregate-add-host-post-req.json | 0 .../os-aggregates/aggregate-metadata-post-req.json | 0 .../api_samples/os-aggregates/aggregate-post-req.json | 0 .../api_samples/os-aggregates/aggregate-post-resp.json | 0 .../os-aggregates/aggregate-remove-host-post-req.json | 0 .../api_samples/os-aggregates/aggregate-update-post-req.json | 0 .../api_samples/os-aggregates/aggregate-update-post-resp.json | 0 .../os-aggregates/aggregates-add-host-post-resp.json | 0 .../api_samples/os-aggregates/aggregates-get-resp.json | 0 .../api_samples/os-aggregates/aggregates-list-get-resp.json | 0 .../os-aggregates/aggregates-metadata-post-resp.json | 0 .../os-aggregates/aggregates-remove-host-post-resp.json | 0 .../snapshot-create-assisted-req.json | 0 .../snapshot-create-assisted-resp.json | 0 .../os-attach-interfaces/attach-interfaces-create-req.json | 0 .../os-attach-interfaces/attach-interfaces-create-resp.json | 0 .../os-attach-interfaces/attach-interfaces-list-resp.json | 0 .../os-attach-interfaces/attach-interfaces-show-resp.json | 0 .../os-availability-zone/availability-zone-detail-resp.json | 0 .../os-availability-zone/availability-zone-list-resp.json | 0 .../os-availability-zone/availability-zone-post-req.json | 0 .../os-availability-zone/availability-zone-post-resp.json | 0 .../os-baremetal-nodes/baremetal-node-get-resp.json | 0 .../os-baremetal-nodes/baremetal-node-list-resp.json | 0 doc/{v3 => }/api_samples/os-cells/cells-capacities-resp.json | 0 doc/{v3 => }/api_samples/os-cells/cells-get-resp.json | 0 doc/{v3 => }/api_samples/os-cells/cells-list-empty-resp.json | 0 doc/{v3 => }/api_samples/os-cells/cells-list-resp.json | 0 .../api_samples/os-certificates/certificate-create-resp.json | 0 .../os-certificates/certificate-get-root-resp.json | 0 .../api_samples/os-cloudpipe/cloud-pipe-create-req.json | 0 .../api_samples/os-cloudpipe/cloud-pipe-create-resp.json | 0 .../api_samples/os-cloudpipe/cloud-pipe-get-resp.json | 0 .../api_samples/os-cloudpipe/cloud-pipe-update-req.json | 0 .../os-config-drive/server-config-drive-get-resp.json | 0 doc/{v3 => }/api_samples/os-config-drive/server-post-req.json | 0 .../api_samples/os-config-drive/server-post-resp.json | 0 .../os-config-drive/servers-config-drive-details-resp.json | 0 .../get-console-connect-info-get-resp.json | 0 .../os-console-auth-tokens/get-rdp-console-post-req.json | 0 .../os-console-output/console-output-post-req.json | 0 .../os-console-output/console-output-post-resp.json | 0 .../api_samples/os-create-backup/create-backup-req.json | 0 .../api_samples/os-deferred-delete/force-delete-post-req.json | 0 .../api_samples/os-deferred-delete/restore-post-req.json | 0 doc/{v3 => }/api_samples/os-disk-config/image-get-resp.json | 0 doc/{v3 => }/api_samples/os-disk-config/image-list-resp.json | 0 .../api_samples/os-disk-config/list-servers-detail-get.json | 0 .../api_samples/os-disk-config/server-action-rebuild-req.json | 0 .../os-disk-config/server-action-rebuild-resp.json | 0 doc/{v3 => }/api_samples/os-disk-config/server-get-resp.json | 0 doc/{v3 => }/api_samples/os-disk-config/server-post-req.json | 0 doc/{v3 => }/api_samples/os-disk-config/server-post-resp.json | 0 .../api_samples/os-disk-config/server-resize-post-req.json | 0 .../api_samples/os-disk-config/server-update-put-req.json | 0 .../api_samples/os-disk-config/server-update-put-resp.json | 0 .../os-evacuate/server-evacuate-find-host-req.json | 0 .../os-evacuate/server-evacuate-find-host-resp.json | 0 doc/{v3 => }/api_samples/os-evacuate/server-evacuate-req.json | 0 .../api_samples/os-evacuate/server-evacuate-resp.json | 0 .../os-extended-availability-zone/server-get-resp.json | 0 .../os-extended-availability-zone/servers-detail-resp.json | 0 .../os-extended-server-attributes/server-get-resp.json | 0 .../os-extended-server-attributes/server-post-resp.json | 0 .../os-extended-server-attributes/servers-detail-resp.json | 0 .../os-extended-server-attributes/v2.3/server-get-resp.json | 0 .../v2.3/servers-detail-resp.json | 0 .../api_samples/os-extended-status/server-get-resp.json | 0 .../api_samples/os-extended-status/servers-detail-resp.json | 0 .../api_samples/os-extended-volumes/server-get-resp.json | 0 .../api_samples/os-extended-volumes/servers-detail-resp.json | 0 .../api_samples/os-extended-volumes/v2.3/server-get-resp.json | 0 .../os-extended-volumes/v2.3/servers-detail-resp.json | 0 doc/{v3 => }/api_samples/os-fixed-ips/fixedip-post-req.json | 0 doc/{v3 => }/api_samples/os-fixed-ips/fixedips-get-resp.json | 0 .../api_samples/os-fixed-ips/v2.4/fixedip-post-req.json | 0 .../api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json | 0 .../api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json | 0 .../api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json | 0 .../api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json | 0 .../api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json | 0 .../floating-ip-dns-create-or-update-entry-req.json | 0 .../floating-ip-dns-create-or-update-entry-resp.json | 0 .../floating-ip-dns-create-or-update-req.json | 0 .../floating-ip-dns-create-or-update-resp.json | 0 .../os-floating-ip-dns/floating-ip-dns-entry-get-resp.json | 0 .../os-floating-ip-dns/floating-ip-dns-entry-list-resp.json | 0 .../os-floating-ip-dns/floating-ip-dns-list-resp.json | 0 .../os-floating-ip-pools/floatingippools-list-resp.json | 0 .../os-floating-ips-bulk/floating-ips-bulk-create-req.json | 0 .../os-floating-ips-bulk/floating-ips-bulk-create-resp.json | 0 .../os-floating-ips-bulk/floating-ips-bulk-delete-req.json | 0 .../os-floating-ips-bulk/floating-ips-bulk-delete-resp.json | 0 .../floating-ips-bulk-list-by-host-resp.json | 0 .../os-floating-ips-bulk/floating-ips-bulk-list-resp.json | 0 .../api_samples/os-floating-ips/floating-ips-create-req.json | 0 .../api_samples/os-floating-ips/floating-ips-create-resp.json | 0 .../api_samples/os-floating-ips/floating-ips-get-resp.json | 0 .../os-floating-ips/floating-ips-list-empty-resp.json | 0 .../api_samples/os-floating-ips/floating-ips-list-resp.json | 0 doc/{v3 => }/api_samples/os-fping/fping-get-details-resp.json | 0 doc/{v3 => }/api_samples/os-fping/fping-get-resp.json | 0 .../api_samples/os-hide-server-addresses/server-get-resp.json | 0 .../os-hide-server-addresses/servers-details-resp.json | 0 .../os-hide-server-addresses/servers-list-resp.json | 0 doc/{v3 => }/api_samples/os-hosts/host-get-reboot.json | 0 doc/{v3 => }/api_samples/os-hosts/host-get-resp.json | 0 doc/{v3 => }/api_samples/os-hosts/host-get-shutdown.json | 0 doc/{v3 => }/api_samples/os-hosts/host-get-startup.json | 0 .../api_samples/os-hosts/host-put-maintenance-req.json | 0 .../api_samples/os-hosts/host-put-maintenance-resp.json | 0 doc/{v3 => }/api_samples/os-hosts/hosts-list-resp.json | 0 .../api_samples/os-hypervisors/hypervisors-detail-resp.json | 0 .../api_samples/os-hypervisors/hypervisors-list-resp.json | 0 .../api_samples/os-hypervisors/hypervisors-search-resp.json | 0 .../api_samples/os-hypervisors/hypervisors-show-resp.json | 0 .../os-hypervisors/hypervisors-statistics-resp.json | 0 .../api_samples/os-hypervisors/hypervisors-uptime-resp.json | 0 .../os-hypervisors/hypervisors-with-servers-resp.json | 0 .../os-hypervisors/hypervisors-without-servers-resp.json | 0 .../os-instance-actions/instance-action-get-resp.json | 0 .../os-instance-actions/instance-actions-list-resp.json | 0 .../inst-usage-audit-log-index-get-resp.json | 0 .../inst-usage-audit-log-show-get-resp.json | 0 doc/{v3 => }/api_samples/os-lock-server/lock-server.json | 0 doc/{v3 => }/api_samples/os-lock-server/unlock-server.json | 0 .../api_samples/os-migrate-server/live-migrate-server.json | 0 .../api_samples/os-migrate-server/migrate-server.json | 0 doc/{v3 => }/api_samples/os-migrations/migrations-get.json | 0 .../api_samples/os-multinic/multinic-add-fixed-ip-req.json | 0 .../api_samples/os-multinic/multinic-remove-fixed-ip-req.json | 0 .../os-multiple-create/multiple-create-no-resv-post-req.json | 0 .../os-multiple-create/multiple-create-no-resv-post-resp.json | 0 .../os-multiple-create/multiple-create-post-req.json | 0 .../os-multiple-create/multiple-create-post-resp.json | 0 .../os-networks-associate/network-associate-host-req.json | 0 .../os-networks-associate/network-disassociate-host-req.json | 0 .../network-disassociate-project-req.json | 0 .../os-networks-associate/network-disassociate-req.json | 0 doc/{v3 => }/api_samples/os-networks/network-add-req.json | 0 doc/{v3 => }/api_samples/os-networks/network-create-req.json | 0 doc/{v3 => }/api_samples/os-networks/network-create-resp.json | 0 doc/{v3 => }/api_samples/os-networks/network-show-resp.json | 0 .../api_samples/os-networks/networks-disassociate-req.json | 0 doc/{v3 => }/api_samples/os-networks/networks-list-resp.json | 0 doc/{v3 => }/api_samples/os-pause-server/pause-server.json | 0 doc/{v3 => }/api_samples/os-pause-server/unpause-server.json | 0 .../api_samples/os-pci/hypervisors-pci-detail-resp.json | 0 .../api_samples/os-pci/hypervisors-pci-show-resp.json | 0 doc/{v3 => }/api_samples/os-pci/pci-detail-resp.json | 0 doc/{v3 => }/api_samples/os-pci/pci-index-resp.json | 0 doc/{v3 => }/api_samples/os-pci/pci-show-resp.json | 0 doc/{v3 => }/api_samples/os-pci/server-get-resp.json | 0 doc/{v3 => }/api_samples/os-pci/servers-detail-resp.json | 0 .../api_samples/os-personality/server-action-rebuild-req.json | 0 .../os-personality/server-action-rebuild-resp.json | 0 doc/{v3 => }/api_samples/os-personality/server-post-req.json | 0 doc/{v3 => }/api_samples/os-personality/server-post-resp.json | 0 .../server-action-rebuild-preserve-ephemeral-resp.json | 0 .../server-action-rebuild-preserve-ephemeral.json | 0 .../os-quota-class-sets/quota-classes-show-get-resp.json | 0 .../os-quota-class-sets/quota-classes-update-post-req.json | 0 .../os-quota-class-sets/quota-classes-update-post-resp.json | 0 .../os-quota-sets/quotas-show-defaults-get-resp.json | 0 .../api_samples/os-quota-sets/quotas-show-get-resp.json | 0 .../os-quota-sets/quotas-update-force-post-req.json | 0 .../os-quota-sets/quotas-update-force-post-resp.json | 0 .../api_samples/os-quota-sets/quotas-update-post-req.json | 0 .../api_samples/os-quota-sets/quotas-update-post-resp.json | 0 .../api_samples/os-quota-sets/user-quotas-show-get-resp.json | 0 .../os-quota-sets/user-quotas-update-post-req.json | 0 .../os-quota-sets/user-quotas-update-post-resp.json | 0 .../os-remote-consoles/get-rdp-console-post-req.json | 0 .../os-remote-consoles/get-rdp-console-post-resp.json | 0 .../os-remote-consoles/get-serial-console-post-req.json | 0 .../os-remote-consoles/get-serial-console-post-resp.json | 0 .../os-remote-consoles/get-spice-console-post-req.json | 0 .../os-remote-consoles/get-spice-console-post-resp.json | 0 .../os-remote-consoles/get-vnc-console-post-req.json | 0 .../os-remote-consoles/get-vnc-console-post-resp.json | 0 .../os-remote-consoles/v2.6/create-vnc-console-req.json | 0 .../os-remote-consoles/v2.6/create-vnc-console-resp.json | 0 .../os-remote-consoles/v2.8/create-mks-console-req.json | 0 .../os-remote-consoles/v2.8/create-mks-console-resp.json | 0 .../api_samples/os-rescue/server-get-resp-rescue.json | 0 .../api_samples/os-rescue/server-get-resp-unrescue.json | 0 .../os-rescue/server-rescue-req-with-image-ref.json | 0 doc/{v3 => }/api_samples/os-rescue/server-rescue-req.json | 0 doc/{v3 => }/api_samples/os-rescue/server-rescue.json | 0 doc/{v3 => }/api_samples/os-rescue/server-unrescue-req.json | 0 .../os-scheduler-hints/scheduler-hints-post-req.json | 0 .../os-scheduler-hints/scheduler-hints-post-resp.json | 0 .../security-group-default-rules-create-req.json | 0 .../security-group-default-rules-create-resp.json | 0 .../security-group-default-rules-list-resp.json | 0 .../security-group-default-rules-show-resp.json | 0 .../os-security-groups/security-group-add-post-req.json | 0 .../os-security-groups/security-group-post-req.json | 0 .../os-security-groups/security-group-remove-post-req.json | 0 .../os-security-groups/security-groups-create-resp.json | 0 .../os-security-groups/security-groups-get-resp.json | 0 .../os-security-groups/security-groups-list-get-resp.json | 0 .../api_samples/os-security-groups/server-get-resp.json | 0 .../api_samples/os-security-groups/server-post-req.json | 0 .../api_samples/os-security-groups/server-post-resp.json | 0 .../os-security-groups/server-security-groups-list-resp.json | 0 .../api_samples/os-security-groups/servers-detail-resp.json | 0 .../os-server-diagnostics/server-diagnostics-get-resp.json | 0 .../os-server-external-events/event-create-req.json | 0 .../os-server-external-events/event-create-resp.json | 0 .../api_samples/os-server-groups/server-groups-get-resp.json | 0 .../api_samples/os-server-groups/server-groups-list-resp.json | 0 .../api_samples/os-server-groups/server-groups-post-req.json | 0 .../api_samples/os-server-groups/server-groups-post-resp.json | 0 .../api_samples/os-server-password/get-password-resp.json | 0 doc/{v3 => }/api_samples/os-server-usage/server-get-resp.json | 0 .../api_samples/os-server-usage/servers-detail-resp.json | 0 .../api_samples/os-services/service-disable-log-put-req.json | 0 .../api_samples/os-services/service-disable-log-put-resp.json | 0 .../api_samples/os-services/service-disable-put-req.json | 0 .../api_samples/os-services/service-disable-put-resp.json | 0 .../api_samples/os-services/service-enable-put-req.json | 0 .../api_samples/os-services/service-enable-put-resp.json | 0 .../api_samples/os-services/services-list-get-resp.json | 0 .../os-services/v2.11/service-disable-log-put-req.json | 0 .../os-services/v2.11/service-disable-log-put-resp.json | 0 .../os-services/v2.11/service-disable-put-req.json | 0 .../os-services/v2.11/service-disable-put-resp.json | 0 .../api_samples/os-services/v2.11/service-enable-put-req.json | 0 .../os-services/v2.11/service-enable-put-resp.json | 0 .../os-services/v2.11/service-force-down-put-req.json | 0 .../os-services/v2.11/service-force-down-put-resp.json | 0 .../api_samples/os-services/v2.11/services-list-get-resp.json | 0 doc/{v3 => }/api_samples/os-shelve/os-shelve-offload.json | 0 doc/{v3 => }/api_samples/os-shelve/os-shelve.json | 0 doc/{v3 => }/api_samples/os-shelve/os-unshelve.json | 0 .../simple-tenant-usage-get-specific.json | 0 .../os-simple-tenant-usage/simple-tenant-usage-get.json | 0 doc/{v3 => }/api_samples/os-suspend-server/server-resume.json | 0 .../api_samples/os-suspend-server/server-suspend.json | 0 .../api_samples/os-tenant-networks/networks-list-res.json | 0 .../api_samples/os-tenant-networks/networks-post-req.json | 0 .../api_samples/os-tenant-networks/networks-post-res.json | 0 .../api_samples/os-used-limits/usedlimits-get-resp.json | 0 doc/{v3 => }/api_samples/os-user-data/userdata-post-req.json | 0 doc/{v3 => }/api_samples/os-user-data/userdata-post-resp.json | 0 .../api_samples/os-virtual-interfaces/vifs-list-resp.json | 0 .../api_samples/os-volumes/attach-volume-to-server-req.json | 0 .../api_samples/os-volumes/attach-volume-to-server-resp.json | 0 .../api_samples/os-volumes/list-volume-attachments-resp.json | 0 .../api_samples/os-volumes/os-volumes-detail-resp.json | 0 doc/{v3 => }/api_samples/os-volumes/os-volumes-get-resp.json | 0 .../api_samples/os-volumes/os-volumes-index-resp.json | 0 doc/{v3 => }/api_samples/os-volumes/os-volumes-post-req.json | 0 doc/{v3 => }/api_samples/os-volumes/os-volumes-post-resp.json | 0 doc/{v3 => }/api_samples/os-volumes/snapshot-create-req.json | 0 doc/{v3 => }/api_samples/os-volumes/snapshot-create-resp.json | 0 .../api_samples/os-volumes/snapshots-detail-resp.json | 0 doc/{v3 => }/api_samples/os-volumes/snapshots-list-resp.json | 0 doc/{v3 => }/api_samples/os-volumes/snapshots-show-resp.json | 0 doc/{v3 => }/api_samples/os-volumes/update-volume-req.json | 0 .../api_samples/os-volumes/volume-attachment-detail-resp.json | 0 .../api_samples/server-ips/server-ips-network-resp.json | 0 doc/{v3 => }/api_samples/server-ips/server-ips-resp.json | 0 .../api_samples/server-metadata/server-metadata-all-req.json | 0 .../api_samples/server-metadata/server-metadata-all-resp.json | 0 .../api_samples/server-metadata/server-metadata-req.json | 0 .../api_samples/server-metadata/server-metadata-resp.json | 0 .../api_samples/servers-sort/server-sort-keys-list-resp.json | 0 .../api_samples/servers/server-action-confirm-resize.json | 0 .../api_samples/servers/server-action-create-image.json | 0 doc/{v3 => }/api_samples/servers/server-action-reboot.json | 0 .../servers/server-action-rebuild-preserve-ephemeral.json | 0 .../api_samples/servers/server-action-rebuild-resp.json | 0 doc/{v3 => }/api_samples/servers/server-action-rebuild.json | 0 doc/{v3 => }/api_samples/servers/server-action-resize.json | 0 .../api_samples/servers/server-action-revert-resize.json | 0 doc/{v3 => }/api_samples/servers/server-action-start.json | 0 doc/{v3 => }/api_samples/servers/server-action-stop.json | 0 doc/{v3 => }/api_samples/servers/server-get-resp.json | 0 doc/{v3 => }/api_samples/servers/server-post-req.json | 0 doc/{v3 => }/api_samples/servers/server-post-resp.json | 0 doc/{v3 => }/api_samples/servers/servers-details-resp.json | 0 doc/{v3 => }/api_samples/servers/servers-list-resp.json | 0 doc/{v3 => }/api_samples/servers/v2.9/server-get-resp.json | 0 doc/{v3 => }/api_samples/servers/v2.9/server-post-req.json | 0 doc/{v3 => }/api_samples/servers/v2.9/server-post-resp.json | 0 .../api_samples/servers/v2.9/servers-details-resp.json | 0 doc/{v3 => }/api_samples/servers/v2.9/servers-list-resp.json | 0 doc/{v3 => }/api_samples/servers_v21/server-post-req.json | 0 doc/{v3 => }/api_samples/servers_v21/server-post-resp.json | 0 nova/tests/functional/{v3 => }/api_paste_fixture.py | 0 .../functional/{v3 => api_sample_tests}/api_sample_base.py | 4 ++-- .../all_extensions/extensions-list-resp-v2.json.tpl | 0 .../api_samples/all_extensions/extensions-list-resp.json.tpl | 0 .../all_extensions/server-action-confirm-resize.json.tpl | 0 .../all_extensions/server-action-create-image.json.tpl | 0 .../api_samples/all_extensions/server-action-reboot.json.tpl | 0 .../all_extensions/server-action-rebuild-resp.json.tpl | 0 .../api_samples/all_extensions/server-action-rebuild.json.tpl | 0 .../api_samples/all_extensions/server-action-resize.json.tpl | 0 .../all_extensions/server-action-revert-resize.json.tpl | 0 .../api_samples/all_extensions/server-get-resp.json.tpl | 0 .../api_samples/all_extensions/server-post-req.json.tpl | 0 .../api_samples/all_extensions/server-post-resp.json.tpl | 0 .../api_samples/all_extensions/servers-details-resp.json.tpl | 0 .../api_samples/all_extensions/servers-list-resp.json.tpl | 0 .../api_samples/consoles/consoles-create-req.json.tpl | 0 .../api_samples/consoles/consoles-get-resp.json.tpl | 0 .../api_samples/consoles/consoles-list-get-resp.json.tpl | 0 .../api_samples/extension-info/extensions-get-resp.json.tpl | 0 .../flavor-access/flavor-access-add-tenant-req.json.tpl | 0 .../flavor-access/flavor-access-add-tenant-resp.json.tpl | 0 .../flavor-access/flavor-access-create-req.json.tpl | 0 .../flavor-access/flavor-access-create-resp.json.tpl | 0 .../flavor-access/flavor-access-detail-resp.json.tpl | 0 .../flavor-access/flavor-access-list-resp.json.tpl | 0 .../flavor-access/flavor-access-remove-tenant-req.json.tpl | 0 .../flavor-access/flavor-access-remove-tenant-resp.json.tpl | 0 .../flavor-access/flavor-access-show-resp.json.tpl | 0 .../flavor-extra-specs/flavor-extra-specs-create-req.json.tpl | 0 .../flavor-extra-specs-create-resp.json.tpl | 0 .../flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl | 0 .../flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl | 0 .../flavor-extra-specs/flavor-extra-specs-update-req.json.tpl | 0 .../flavor-extra-specs-update-resp.json.tpl | 0 .../api_samples/flavor-manage/flavor-create-post-req.json.tpl | 0 .../flavor-manage/flavor-create-post-resp.json.tpl | 0 .../api_samples/flavors/flavor-get-resp.json.tpl | 0 .../api_samples/flavors/flavors-detail-resp.json.tpl | 0 .../api_samples/flavors/flavors-list-resp.json.tpl | 0 .../api_samples/image-size/image-get-resp.json.tpl | 0 .../api_samples/image-size/images-details-get-resp.json.tpl | 0 .../api_samples/images/image-get-resp.json.tpl | 0 .../api_samples/images/image-meta-key-get.json.tpl | 0 .../api_samples/images/image-meta-key-put-req.json.tpl | 0 .../api_samples/images/image-meta-key-put-resp.json.tpl | 0 .../api_samples/images/image-metadata-get-resp.json.tpl | 0 .../api_samples/images/image-metadata-post-req.json.tpl | 0 .../api_samples/images/image-metadata-post-resp.json.tpl | 0 .../api_samples/images/image-metadata-put-req.json.tpl | 0 .../api_samples/images/image-metadata-put-resp.json.tpl | 0 .../api_samples/images/images-details-get-resp.json.tpl | 0 .../api_samples/images/images-list-get-resp.json.tpl | 0 .../api_samples/keypairs/keypairs-get-resp.json.tpl | 0 .../api_samples/keypairs/keypairs-import-post-req.json.tpl | 0 .../api_samples/keypairs/keypairs-import-post-resp.json.tpl | 0 .../api_samples/keypairs/keypairs-list-resp.json.tpl | 0 .../api_samples/keypairs/keypairs-post-req.json.tpl | 0 .../api_samples/keypairs/keypairs-post-resp.json.tpl | 0 .../api_samples/keypairs/v2.10/keypairs-get-resp.json.tpl | 0 .../keypairs/v2.10/keypairs-import-post-req.json.tpl | 0 .../keypairs/v2.10/keypairs-import-post-resp.json.tpl | 0 .../api_samples/keypairs/v2.10/keypairs-list-resp.json.tpl | 0 .../api_samples/keypairs/v2.10/keypairs-post-req.json.tpl | 0 .../api_samples/keypairs/v2.10/keypairs-post-resp.json.tpl | 0 .../api_samples/keypairs/v2.2/keypairs-get-resp.json.tpl | 0 .../keypairs/v2.2/keypairs-import-post-req.json.tpl | 0 .../keypairs/v2.2/keypairs-import-post-resp.json.tpl | 0 .../api_samples/keypairs/v2.2/keypairs-list-resp.json.tpl | 0 .../api_samples/keypairs/v2.2/keypairs-post-req.json.tpl | 0 .../api_samples/keypairs/v2.2/keypairs-post-resp.json.tpl | 0 .../os-access-ips/server-action-rebuild-resp.json.tpl | 0 .../api_samples/os-access-ips/server-action-rebuild.json.tpl | 0 .../api_samples/os-access-ips/server-get-resp.json.tpl | 0 .../api_samples/os-access-ips/server-post-req.json.tpl | 0 .../api_samples/os-access-ips/server-post-resp.json.tpl | 0 .../api_samples/os-access-ips/server-put-req.json.tpl | 0 .../api_samples/os-access-ips/server-put-resp.json.tpl | 0 .../api_samples/os-access-ips/servers-details-resp.json.tpl | 0 .../api_samples/os-access-ips/servers-list-resp.json.tpl | 0 .../admin-actions-inject-network-info.json.tpl | 0 .../os-admin-actions/admin-actions-reset-network.json.tpl | 0 .../admin-actions-reset-server-state.json.tpl | 0 .../os-admin-actions/admin-actions-reset-state.json.tpl | 0 .../os-admin-password/admin-password-change-password.json.tpl | 0 .../api_samples/os-agents/agent-post-req.json.tpl | 0 .../api_samples/os-agents/agent-post-resp.json.tpl | 0 .../api_samples/os-agents/agent-update-put-req.json.tpl | 0 .../api_samples/os-agents/agent-update-put-resp.json.tpl | 0 .../api_samples/os-agents/agents-get-resp.json.tpl | 0 .../os-aggregates/aggregate-add-host-post-req.json.tpl | 0 .../os-aggregates/aggregate-metadata-post-req.json.tpl | 0 .../api_samples/os-aggregates/aggregate-post-req.json.tpl | 0 .../api_samples/os-aggregates/aggregate-post-resp.json.tpl | 0 .../os-aggregates/aggregate-remove-host-post-req.json.tpl | 0 .../os-aggregates/aggregate-update-post-req.json.tpl | 0 .../os-aggregates/aggregate-update-post-resp.json.tpl | 0 .../os-aggregates/aggregates-add-host-post-resp.json.tpl | 0 .../api_samples/os-aggregates/aggregates-get-resp.json.tpl | 0 .../os-aggregates/aggregates-list-get-resp.json.tpl | 0 .../os-aggregates/aggregates-metadata-post-resp.json.tpl | 0 .../os-aggregates/aggregates-remove-host-post-resp.json.tpl | 0 .../snapshot-create-assisted-req.json.tpl | 0 .../snapshot-create-assisted-resp.json.tpl | 0 .../attach-interfaces-create-req.json.tpl | 0 .../attach-interfaces-create-resp.json.tpl | 0 .../os-attach-interfaces/attach-interfaces-list-resp.json.tpl | 0 .../os-attach-interfaces/attach-interfaces-show-resp.json.tpl | 0 .../availability-zone-detail-resp.json.tpl | 0 .../os-availability-zone/availability-zone-list-resp.json.tpl | 0 .../os-availability-zone/availability-zone-post-req.json.tpl | 0 .../os-availability-zone/availability-zone-post-resp.json.tpl | 0 .../os-baremetal-nodes/baremetal-node-get-resp.json.tpl | 0 .../os-baremetal-nodes/baremetal-node-list-resp.json.tpl | 0 .../api_samples/os-cells/cells-capacities-resp.json.tpl | 0 .../api_samples/os-cells/cells-get-resp.json.tpl | 0 .../api_samples/os-cells/cells-list-empty-resp.json.tpl | 0 .../api_samples/os-cells/cells-list-resp.json.tpl | 0 .../os-certificates/certificate-create-req.json.tpl | 0 .../os-certificates/certificate-create-resp.json.tpl | 0 .../os-certificates/certificate-get-root-resp.json.tpl | 0 .../api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl | 0 .../api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl | 0 .../api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl | 0 .../api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl | 0 .../os-config-drive/server-config-drive-get-resp.json.tpl | 0 .../api_samples/os-config-drive/server-post-req.json.tpl | 0 .../api_samples/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 .../os-console-auth-tokens/get-rdp-console-post-req.json.tpl | 0 .../os-console-output/console-output-post-req.json.tpl | 0 .../os-console-output/console-output-post-resp.json.tpl | 0 .../api_samples/os-create-backup/create-backup-req.json.tpl | 0 .../os-deferred-delete/force-delete-post-req.json.tpl | 0 .../api_samples/os-deferred-delete/restore-post-req.json.tpl | 0 .../api_samples/os-disk-config/image-get-resp.json.tpl | 0 .../api_samples/os-disk-config/image-list-resp.json.tpl | 0 .../os-disk-config/list-servers-detail-get.json.tpl | 0 .../os-disk-config/server-action-rebuild-req.json.tpl | 0 .../os-disk-config/server-action-rebuild-resp.json.tpl | 0 .../api_samples/os-disk-config/server-get-resp.json.tpl | 0 .../api_samples/os-disk-config/server-post-req.json.tpl | 0 .../api_samples/os-disk-config/server-post-resp.json.tpl | 0 .../os-disk-config/server-resize-post-req.json.tpl | 0 .../api_samples/os-disk-config/server-update-put-req.json.tpl | 0 .../os-disk-config/server-update-put-resp.json.tpl | 0 .../os-evacuate/server-evacuate-find-host-req.json.tpl | 0 .../os-evacuate/server-evacuate-find-host-resp.json.tpl | 0 .../api_samples/os-evacuate/server-evacuate-req.json.tpl | 0 .../api_samples/os-evacuate/server-evacuate-resp.json.tpl | 0 .../os-extended-availability-zone/server-get-resp.json.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../os-extended-server-attributes/server-get-resp.json.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../api_samples/os-extended-status/server-get-resp.json.tpl | 0 .../os-extended-status/servers-detail-resp.json.tpl | 0 .../api_samples/os-extended-volumes/server-get-resp.json.tpl | 0 .../os-extended-volumes/servers-detail-resp.json.tpl | 0 .../api_samples/os-fixed-ips/fixedip-post-req.json.tpl | 0 .../api_samples/os-fixed-ips/fixedips-get-resp.json.tpl | 0 .../api_samples/os-fixed-ips/v2.4/fixedip-post-req.json.tpl | 0 .../api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json.tpl | 0 .../api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl | 0 .../api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl | 0 .../api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl | 0 .../api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl | 0 .../floating-ip-dns-create-or-update-entry-req.json.tpl | 0 .../floating-ip-dns-create-or-update-entry-resp.json.tpl | 0 .../floating-ip-dns-create-or-update-req.json.tpl | 0 .../floating-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 .../os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl | 0 .../os-floating-ip-pools/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 .../floating-ips-bulk-list-by-host-resp.json.tpl | 0 .../os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl | 0 .../os-floating-ips/floating-ips-create-nopool-req.json.tpl | 0 .../os-floating-ips/floating-ips-create-req.json.tpl | 0 .../os-floating-ips/floating-ips-create-resp.json.tpl | 0 .../os-floating-ips/floating-ips-get-resp.json.tpl | 0 .../os-floating-ips/floating-ips-list-empty-resp.json.tpl | 0 .../os-floating-ips/floating-ips-list-resp.json.tpl | 0 .../api_samples/os-fping/fping-get-details-resp.json.tpl | 0 .../api_samples/os-fping/fping-get-resp.json.tpl | 0 .../os-hide-server-addresses/server-get-resp.json.tpl | 0 .../os-hide-server-addresses/servers-details-resp.json.tpl | 0 .../os-hide-server-addresses/servers-list-resp.json.tpl | 0 .../api_samples/os-hosts/host-get-reboot.json.tpl | 0 .../api_samples/os-hosts/host-get-resp.json.tpl | 0 .../api_samples/os-hosts/host-get-shutdown.json.tpl | 0 .../api_samples/os-hosts/host-get-startup.json.tpl | 0 .../api_samples/os-hosts/host-put-maintenance-req.json.tpl | 0 .../api_samples/os-hosts/host-put-maintenance-resp.json.tpl | 0 .../api_samples/os-hosts/hosts-list-resp.json.tpl | 0 .../os-hypervisors/hypervisors-detail-resp.json.tpl | 0 .../api_samples/os-hypervisors/hypervisors-list-resp.json.tpl | 0 .../os-hypervisors/hypervisors-search-resp.json.tpl | 0 .../api_samples/os-hypervisors/hypervisors-show-resp.json.tpl | 0 .../os-hypervisors/hypervisors-statistics-resp.json.tpl | 0 .../os-hypervisors/hypervisors-uptime-resp.json.tpl | 0 .../os-hypervisors/hypervisors-with-servers-resp.json.tpl | 0 .../os-hypervisors/hypervisors-without-servers-resp.json.tpl | 0 .../os-instance-actions/instance-action-get-resp.json.tpl | 0 .../os-instance-actions/instance-actions-list-resp.json.tpl | 0 .../os-instance-actions/instance-instance-get-resp.json.tpl | 0 .../inst-usage-audit-log-index-get-resp.json.tpl | 0 .../inst-usage-audit-log-show-get-resp.json.tpl | 0 .../api_samples/os-lock-server/lock-server.json.tpl | 0 .../api_samples/os-lock-server/unlock-server.json.tpl | 0 .../os-migrate-server/live-migrate-server.json.tpl | 0 .../api_samples/os-migrate-server/migrate-server.json.tpl | 0 .../api_samples/os-migrations/migrations-get.json.tpl | 0 .../os-multinic/multinic-add-fixed-ip-req.json.tpl | 0 .../os-multinic/multinic-remove-fixed-ip-req.json.tpl | 0 .../multiple-create-no-resv-post-req.json.tpl | 0 .../multiple-create-no-resv-post-resp.json.tpl | 0 .../os-multiple-create/multiple-create-post-req.json.tpl | 0 .../os-multiple-create/multiple-create-post-resp.json.tpl | 0 .../os-networks-associate/network-associate-host-req.json.tpl | 0 .../network-disassociate-host-req.json.tpl | 0 .../network-disassociate-project-req.json.tpl | 0 .../os-networks-associate/network-disassociate-req.json.tpl | 0 .../api_samples/os-networks/network-add-req.json.tpl | 0 .../api_samples/os-networks/network-create-req.json.tpl | 0 .../api_samples/os-networks/network-create-resp.json.tpl | 0 .../api_samples/os-networks/network-show-resp.json.tpl | 0 .../os-networks/networks-disassociate-req.json.tpl | 0 .../api_samples/os-networks/networks-list-resp.json.tpl | 0 .../api_samples/os-pause-server/pause-server.json.tpl | 0 .../api_samples/os-pause-server/unpause-server.json.tpl | 0 .../api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl | 0 .../api_samples/os-pci/hypervisors-pci-show-resp.json.tpl | 0 .../api_samples/os-pci/pci-detail-resp.json.tpl | 0 .../api_samples/os-pci/pci-index-resp.json.tpl | 0 .../api_samples/os-pci/pci-show-resp.json.tpl | 0 .../api_samples/os-pci/server-get-resp.json.tpl | 0 .../api_samples/os-pci/servers-detail-resp.json.tpl | 0 .../os-personality/server-action-rebuild-req.json.tpl | 0 .../os-personality/server-action-rebuild-resp.json.tpl | 0 .../api_samples/os-personality/server-post-req.json.tpl | 0 .../api_samples/os-personality/server-post-resp.json.tpl | 0 .../server-action-rebuild-preserve-ephemeral-resp.json.tpl | 0 .../server-action-rebuild-preserve-ephemeral.json.tpl | 0 .../os-quota-class-sets/quota-classes-show-get-resp.json.tpl | 0 .../quota-classes-update-post-req.json.tpl | 0 .../quota-classes-update-post-resp.json.tpl | 0 .../os-quota-sets/quotas-show-defaults-get-resp.json.tpl | 0 .../api_samples/os-quota-sets/quotas-show-get-resp.json.tpl | 0 .../os-quota-sets/quotas-update-force-post-req.json.tpl | 0 .../os-quota-sets/quotas-update-force-post-resp.json.tpl | 0 .../os-quota-sets/quotas-update-force-resp.json.tpl | 0 .../api_samples/os-quota-sets/quotas-update-post-req.json.tpl | 0 .../os-quota-sets/quotas-update-post-resp.json.tpl | 0 .../os-quota-sets/user-quotas-show-get-resp.json.tpl | 0 .../os-quota-sets/user-quotas-update-post-req.json.tpl | 0 .../os-quota-sets/user-quotas-update-post-resp.json.tpl | 0 .../os-remote-consoles/get-rdp-console-post-req.json.tpl | 0 .../os-remote-consoles/get-rdp-console-post-resp.json.tpl | 0 .../os-remote-consoles/get-serial-console-post-req.json.tpl | 0 .../os-remote-consoles/get-serial-console-post-resp.json.tpl | 0 .../os-remote-consoles/get-spice-console-post-req.json.tpl | 0 .../os-remote-consoles/get-spice-console-post-resp.json.tpl | 0 .../os-remote-consoles/get-vnc-console-post-req.json.tpl | 0 .../os-remote-consoles/get-vnc-console-post-resp.json.tpl | 0 .../os-remote-consoles/v2.6/create-vnc-console-req.json.tpl | 0 .../os-remote-consoles/v2.6/create-vnc-console-resp.json.tpl | 0 .../os-remote-consoles/v2.8/create-mks-console-req.json.tpl | 0 .../os-remote-consoles/v2.8/create-mks-console-resp.json.tpl | 0 .../api_samples/os-rescue/server-get-resp-rescue.json.tpl | 0 .../api_samples/os-rescue/server-get-resp-unrescue.json.tpl | 0 .../os-rescue/server-rescue-req-with-image-ref.json.tpl | 0 .../api_samples/os-rescue/server-rescue-req.json.tpl | 0 .../api_samples/os-rescue/server-rescue.json.tpl | 0 .../api_samples/os-rescue/server-unrescue-req.json.tpl | 0 .../os-scheduler-hints/scheduler-hints-post-req.json.tpl | 0 .../os-scheduler-hints/scheduler-hints-post-resp.json.tpl | 0 .../security-group-default-rules-create-req.json.tpl | 0 .../security-group-default-rules-create-resp.json.tpl | 0 .../security-group-default-rules-list-resp.json.tpl | 0 .../security-group-default-rules-show-resp.json.tpl | 0 .../os-security-groups/security-group-add-post-req.json.tpl | 0 .../os-security-groups/security-group-post-req.json.tpl | 0 .../security-group-remove-post-req.json.tpl | 0 .../os-security-groups/security-groups-create-resp.json.tpl | 0 .../os-security-groups/security-groups-get-resp.json.tpl | 0 .../os-security-groups/security-groups-list-get-resp.json.tpl | 0 .../api_samples/os-security-groups/server-get-resp.json.tpl | 0 .../api_samples/os-security-groups/server-post-req.json.tpl | 0 .../api_samples/os-security-groups/server-post-resp.json.tpl | 0 .../server-security-groups-list-resp.json.tpl | 0 .../os-security-groups/servers-detail-resp.json.tpl | 0 .../server-diagnostics-get-resp.json.tpl | 0 .../os-server-external-events/event-create-req.json.tpl | 0 .../os-server-external-events/event-create-resp.json.tpl | 0 .../os-server-groups/server-groups-get-resp.json.tpl | 0 .../os-server-groups/server-groups-list-resp.json.tpl | 0 .../os-server-groups/server-groups-post-req.json.tpl | 0 .../os-server-groups/server-groups-post-resp.json.tpl | 0 .../api_samples/os-server-password/get-password-resp.json.tpl | 0 .../api_samples/os-server-usage/server-get-resp.json.tpl | 0 .../api_samples/os-server-usage/servers-detail-resp.json.tpl | 0 .../os-services/service-disable-log-put-req.json.tpl | 0 .../os-services/service-disable-log-put-resp.json.tpl | 0 .../api_samples/os-services/service-disable-put-req.json.tpl | 0 .../api_samples/os-services/service-disable-put-resp.json.tpl | 0 .../api_samples/os-services/service-enable-put-req.json.tpl | 0 .../api_samples/os-services/service-enable-put-resp.json.tpl | 0 .../api_samples/os-services/services-list-get-resp.json.tpl | 0 .../os-services/v2.11/service-disable-log-put-req.json.tpl | 0 .../os-services/v2.11/service-disable-log-put-resp.json.tpl | 0 .../os-services/v2.11/service-disable-put-req.json.tpl | 0 .../os-services/v2.11/service-disable-put-resp.json.tpl | 0 .../os-services/v2.11/service-enable-put-req.json.tpl | 0 .../os-services/v2.11/service-enable-put-resp.json.tpl | 0 .../os-services/v2.11/service-force-down-put-req.json.tpl | 0 .../os-services/v2.11/service-force-down-put-resp.json.tpl | 0 .../os-services/v2.11/services-list-get-resp.json.tpl | 0 .../api_samples/os-shelve/os-shelve-offload.json.tpl | 0 .../api_samples/os-shelve/os-shelve.json.tpl | 0 .../api_samples/os-shelve/os-unshelve.json.tpl | 0 .../simple-tenant-usage-get-specific.json.tpl | 0 .../os-simple-tenant-usage/simple-tenant-usage-get.json.tpl | 0 .../api_samples/os-suspend-server/server-resume.json.tpl | 0 .../api_samples/os-suspend-server/server-suspend.json.tpl | 0 .../api_samples/os-tenant-networks/networks-list-res.json.tpl | 0 .../api_samples/os-tenant-networks/networks-post-req.json.tpl | 0 .../api_samples/os-tenant-networks/networks-post-res.json.tpl | 0 .../api_samples/os-used-limits/usedlimits-get-resp.json.tpl | 0 .../api_samples/os-user-data/userdata-post-req.json.tpl | 0 .../api_samples/os-user-data/userdata-post-resp.json.tpl | 0 .../api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl | 0 .../os-volumes/attach-volume-to-server-req.json.tpl | 0 .../os-volumes/attach-volume-to-server-resp.json.tpl | 0 .../os-volumes/list-volume-attachments-resp.json.tpl | 0 .../api_samples/os-volumes/os-volumes-detail-resp.json.tpl | 0 .../api_samples/os-volumes/os-volumes-get-resp.json.tpl | 0 .../api_samples/os-volumes/os-volumes-index-resp.json.tpl | 0 .../api_samples/os-volumes/os-volumes-post-req.json.tpl | 0 .../api_samples/os-volumes/os-volumes-post-resp.json.tpl | 0 .../api_samples/os-volumes/snapshot-create-req.json.tpl | 0 .../api_samples/os-volumes/snapshot-create-resp.json.tpl | 0 .../api_samples/os-volumes/snapshots-detail-resp.json.tpl | 0 .../api_samples/os-volumes/snapshots-list-resp.json.tpl | 0 .../api_samples/os-volumes/snapshots-show-resp.json.tpl | 0 .../api_samples/os-volumes/update-volume-req.json.tpl | 0 .../os-volumes/volume-attachment-detail-resp.json.tpl | 0 .../api_samples/server-ips/server-ips-network-resp.json.tpl | 0 .../api_samples/server-ips/server-ips-resp.json.tpl | 0 .../server-metadata/server-metadata-all-req.json.tpl | 0 .../server-metadata/server-metadata-all-resp.json.tpl | 0 .../api_samples/server-metadata/server-metadata-req.json.tpl | 0 .../api_samples/server-metadata/server-metadata-resp.json.tpl | 0 .../servers-sort/server-sort-keys-list-resp.json.tpl | 0 .../api_samples/servers/server-action-confirm-resize.json.tpl | 0 .../api_samples/servers/server-action-create-image.json.tpl | 0 .../api_samples/servers/server-action-reboot.json.tpl | 0 .../api_samples/servers/server-action-rebuild-resp.json.tpl | 0 .../api_samples/servers/server-action-rebuild.json.tpl | 0 .../api_samples/servers/server-action-resize.json.tpl | 0 .../api_samples/servers/server-action-revert-resize.json.tpl | 0 .../api_samples/servers/server-action-start.json.tpl | 0 .../api_samples/servers/server-action-stop.json.tpl | 0 .../api_samples/servers/server-get-resp.json.tpl | 0 .../api_samples/servers/server-post-req.json.tpl | 0 .../api_samples/servers/server-post-resp.json.tpl | 0 .../api_samples/servers/servers-details-resp.json.tpl | 0 .../api_samples/servers/servers-list-resp.json.tpl | 0 .../api_samples/servers/v2.9/server-get-resp.json.tpl | 0 .../api_samples/servers/v2.9/server-post-req.json.tpl | 0 .../api_samples/servers/v2.9/server-post-resp.json.tpl | 0 .../api_samples/servers/v2.9/servers-details-resp.json.tpl | 0 .../api_samples/servers/v2.9/servers-list-resp.json.tpl | 0 .../api_samples/servers_v21/server-post-req.json.tpl | 0 .../api_samples/servers_v21/server-post-resp.json.tpl | 0 .../functional/{v3 => api_sample_tests}/test_access_ips.py | 2 +- .../functional/{v3 => api_sample_tests}/test_admin_actions.py | 2 +- .../{v3 => api_sample_tests}/test_admin_password.py | 2 +- nova/tests/functional/{v3 => api_sample_tests}/test_agents.py | 2 +- .../functional/{v3 => api_sample_tests}/test_aggregates.py | 2 +- .../test_assisted_volume_snapshots.py | 2 +- .../{v3 => api_sample_tests}/test_attach_interfaces.py | 2 +- .../{v3 => api_sample_tests}/test_availability_zone.py | 2 +- .../{v3 => api_sample_tests}/test_baremetal_nodes.py | 2 +- nova/tests/functional/{v3 => api_sample_tests}/test_cells.py | 2 +- .../functional/{v3 => api_sample_tests}/test_certificates.py | 2 +- .../functional/{v3 => api_sample_tests}/test_cloudpipe.py | 2 +- .../functional/{v3 => api_sample_tests}/test_config_drive.py | 2 +- .../{v3 => api_sample_tests}/test_console_auth_tokens.py | 2 +- .../{v3 => api_sample_tests}/test_console_output.py | 2 +- .../functional/{v3 => api_sample_tests}/test_consoles.py | 2 +- .../functional/{v3 => api_sample_tests}/test_create_backup.py | 2 +- .../{v3 => api_sample_tests}/test_deferred_delete.py | 2 +- .../functional/{v3 => api_sample_tests}/test_disk_config.py | 2 +- .../functional/{v3 => api_sample_tests}/test_evacuate.py | 2 +- .../test_extended_availability_zone.py | 2 +- .../test_extended_server_attributes.py | 2 +- .../{v3 => api_sample_tests}/test_extended_status.py | 2 +- .../{v3 => api_sample_tests}/test_extended_volumes.py | 2 +- .../{v3 => api_sample_tests}/test_extension_info.py | 2 +- .../functional/{v3 => api_sample_tests}/test_fixed_ips.py | 2 +- .../functional/{v3 => api_sample_tests}/test_flavor_access.py | 2 +- .../{v3 => api_sample_tests}/test_flavor_extraspecs.py | 2 +- .../functional/{v3 => api_sample_tests}/test_flavor_manage.py | 2 +- .../functional/{v3 => api_sample_tests}/test_flavor_rxtx.py | 2 +- .../tests/functional/{v3 => api_sample_tests}/test_flavors.py | 2 +- .../{v3 => api_sample_tests}/test_floating_ip_dns.py | 2 +- .../{v3 => api_sample_tests}/test_floating_ip_pools.py | 2 +- .../functional/{v3 => api_sample_tests}/test_floating_ips.py | 2 +- .../{v3 => api_sample_tests}/test_floating_ips_bulk.py | 2 +- nova/tests/functional/{v3 => api_sample_tests}/test_fping.py | 2 +- .../{v3 => api_sample_tests}/test_hide_server_addresses.py | 2 +- nova/tests/functional/{v3 => api_sample_tests}/test_hosts.py | 2 +- .../functional/{v3 => api_sample_tests}/test_hypervisors.py | 2 +- .../functional/{v3 => api_sample_tests}/test_image_size.py | 2 +- nova/tests/functional/{v3 => api_sample_tests}/test_images.py | 2 +- .../{v3 => api_sample_tests}/test_instance_actions.py | 2 +- .../{v3 => api_sample_tests}/test_instance_usage_audit_log.py | 2 +- .../functional/{v3 => api_sample_tests}/test_keypairs.py | 2 +- .../functional/{v3 => api_sample_tests}/test_lock_server.py | 2 +- .../{v3 => api_sample_tests}/test_migrate_server.py | 2 +- .../functional/{v3 => api_sample_tests}/test_migrations.py | 2 +- .../functional/{v3 => api_sample_tests}/test_multinic.py | 2 +- .../{v3 => api_sample_tests}/test_multiple_create.py | 2 +- .../functional/{v3 => api_sample_tests}/test_networks.py | 2 +- .../{v3 => api_sample_tests}/test_networks_associate.py | 2 +- .../functional/{v3 => api_sample_tests}/test_pause_server.py | 2 +- nova/tests/functional/{v3 => api_sample_tests}/test_pci.py | 4 ++-- .../functional/{v3 => api_sample_tests}/test_personality.py | 2 +- .../test_preserve_ephemeral_rebuild.py | 2 +- .../functional/{v3 => api_sample_tests}/test_quota_classes.py | 2 +- .../functional/{v3 => api_sample_tests}/test_quota_sets.py | 2 +- .../{v3 => api_sample_tests}/test_remote_consoles.py | 2 +- nova/tests/functional/{v3 => api_sample_tests}/test_rescue.py | 2 +- .../{v3 => api_sample_tests}/test_scheduler_hints.py | 2 +- .../test_security_group_default_rules.py | 2 +- .../{v3 => api_sample_tests}/test_security_groups.py | 2 +- .../{v3 => api_sample_tests}/test_server_diagnostics.py | 2 +- .../{v3 => api_sample_tests}/test_server_external_events.py | 2 +- .../functional/{v3 => api_sample_tests}/test_server_groups.py | 2 +- .../{v3 => api_sample_tests}/test_server_metadata.py | 2 +- .../{v3 => api_sample_tests}/test_server_password.py | 2 +- .../functional/{v3 => api_sample_tests}/test_server_usage.py | 2 +- .../tests/functional/{v3 => api_sample_tests}/test_servers.py | 2 +- .../functional/{v3 => api_sample_tests}/test_servers_ips.py | 2 +- .../functional/{v3 => api_sample_tests}/test_services.py | 2 +- nova/tests/functional/{v3 => api_sample_tests}/test_shelve.py | 2 +- .../{v3 => api_sample_tests}/test_simple_tenant_usage.py | 2 +- .../{v3 => api_sample_tests}/test_suspend_server.py | 2 +- .../{v3 => api_sample_tests}/test_tenant_networks.py | 2 +- .../functional/{v3 => api_sample_tests}/test_used_limits.py | 2 +- .../functional/{v3 => api_sample_tests}/test_user_data.py | 2 +- .../tests/functional/{v3 => api_sample_tests}/test_volumes.py | 4 ++-- nova/tests/functional/test_legacy_v2_compatible_wrapper.py | 2 +- nova/tests/functional/v3/__init__.py | 0 nova/tests/functional/wsgi/test_secgroup.py | 2 +- 836 files changed, 84 insertions(+), 84 deletions(-) rename doc/{v3 => }/api_samples/all_extensions/extensions-list-resp-v2.json (100%) rename doc/{v3 => }/api_samples/all_extensions/extensions-list-resp.json (100%) rename doc/{v3 => }/api_samples/all_extensions/server-action-confirm-resize.json (100%) rename doc/{v3 => }/api_samples/all_extensions/server-action-create-image.json (100%) rename doc/{v3 => }/api_samples/all_extensions/server-action-reboot.json (100%) rename doc/{v3 => }/api_samples/all_extensions/server-action-rebuild-resp.json (100%) rename doc/{v3 => }/api_samples/all_extensions/server-action-rebuild.json (100%) rename doc/{v3 => }/api_samples/all_extensions/server-action-resize.json (100%) rename doc/{v3 => }/api_samples/all_extensions/server-action-revert-resize.json (100%) rename doc/{v3 => }/api_samples/all_extensions/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/all_extensions/server-post-req.json (100%) rename doc/{v3 => }/api_samples/all_extensions/server-post-resp.json (100%) rename doc/{v3 => }/api_samples/all_extensions/servers-details-resp.json (100%) rename doc/{v3 => }/api_samples/all_extensions/servers-list-resp.json (100%) rename doc/{v3 => }/api_samples/consoles/consoles-get-resp.json (100%) rename doc/{v3 => }/api_samples/consoles/consoles-list-get-resp.json (100%) rename doc/{v3 => }/api_samples/extension-info/extensions-get-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-access/flavor-access-add-tenant-req.json (100%) rename doc/{v3 => }/api_samples/flavor-access/flavor-access-add-tenant-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-access/flavor-access-create-req.json (100%) rename doc/{v3 => }/api_samples/flavor-access/flavor-access-create-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-access/flavor-access-detail-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-access/flavor-access-list-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-access/flavor-access-remove-tenant-req.json (100%) rename doc/{v3 => }/api_samples/flavor-access/flavor-access-remove-tenant-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-access/flavor-access-show-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json (100%) rename doc/{v3 => }/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json (100%) rename doc/{v3 => }/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json (100%) rename doc/{v3 => }/api_samples/flavor-manage/flavor-create-post-req.json (100%) rename doc/{v3 => }/api_samples/flavor-manage/flavor-create-post-resp.json (100%) rename doc/{v3 => }/api_samples/flavors/flavor-get-resp.json (100%) rename doc/{v3 => }/api_samples/flavors/flavors-detail-resp.json (100%) rename doc/{v3 => }/api_samples/flavors/flavors-list-resp.json (100%) rename doc/{v3 => }/api_samples/image-size/image-get-resp.json (100%) rename doc/{v3 => }/api_samples/image-size/images-details-get-resp.json (100%) rename doc/{v3 => }/api_samples/images/image-get-resp.json (100%) rename doc/{v3 => }/api_samples/images/image-meta-key-get.json (100%) rename doc/{v3 => }/api_samples/images/image-meta-key-put-req.json (100%) rename doc/{v3 => }/api_samples/images/image-meta-key-put-resp.json (100%) rename doc/{v3 => }/api_samples/images/image-metadata-get-resp.json (100%) rename doc/{v3 => }/api_samples/images/image-metadata-post-req.json (100%) rename doc/{v3 => }/api_samples/images/image-metadata-post-resp.json (100%) rename doc/{v3 => }/api_samples/images/image-metadata-put-req.json (100%) rename doc/{v3 => }/api_samples/images/image-metadata-put-resp.json (100%) rename doc/{v3 => }/api_samples/images/images-details-get-resp.json (100%) rename doc/{v3 => }/api_samples/images/images-list-get-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/keypairs-get-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/keypairs-import-post-req.json (100%) rename doc/{v3 => }/api_samples/keypairs/keypairs-import-post-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/keypairs-list-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/keypairs-post-req.json (100%) rename doc/{v3 => }/api_samples/keypairs/keypairs-post-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.10/keypairs-get-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.10/keypairs-import-post-req.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.10/keypairs-import-post-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.10/keypairs-list-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.10/keypairs-post-req.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.10/keypairs-post-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.2/keypairs-get-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.2/keypairs-import-post-req.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.2/keypairs-import-post-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.2/keypairs-list-resp.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.2/keypairs-post-req.json (100%) rename doc/{v3 => }/api_samples/keypairs/v2.2/keypairs-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-access-ips/server-action-rebuild-resp.json (100%) rename doc/{v3 => }/api_samples/os-access-ips/server-action-rebuild.json (100%) rename doc/{v3 => }/api_samples/os-access-ips/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-access-ips/server-post-req.json (100%) rename doc/{v3 => }/api_samples/os-access-ips/server-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-access-ips/server-put-req.json (100%) rename doc/{v3 => }/api_samples/os-access-ips/server-put-resp.json (100%) rename doc/{v3 => }/api_samples/os-access-ips/servers-details-resp.json (100%) rename doc/{v3 => }/api_samples/os-admin-actions/admin-actions-inject-network-info.json (100%) rename doc/{v3 => }/api_samples/os-admin-actions/admin-actions-reset-network.json (100%) rename doc/{v3 => }/api_samples/os-admin-actions/admin-actions-reset-server-state.json (100%) rename doc/{v3 => }/api_samples/os-admin-password/admin-password-change-password.json (100%) rename doc/{v3 => }/api_samples/os-agents/agent-post-req.json (100%) rename doc/{v3 => }/api_samples/os-agents/agent-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-agents/agent-update-put-req.json (100%) rename doc/{v3 => }/api_samples/os-agents/agent-update-put-resp.json (100%) rename doc/{v3 => }/api_samples/os-agents/agents-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-add-host-post-req.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-metadata-post-req.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-post-req.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-remove-host-post-req.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-update-post-req.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-update-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregates-add-host-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregates-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregates-list-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregates-metadata-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregates-remove-host-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json (100%) rename doc/{v3 => }/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json (100%) rename doc/{v3 => }/api_samples/os-attach-interfaces/attach-interfaces-create-req.json (100%) rename doc/{v3 => }/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json (100%) rename doc/{v3 => }/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json (100%) rename doc/{v3 => }/api_samples/os-availability-zone/availability-zone-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-availability-zone/availability-zone-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-availability-zone/availability-zone-post-req.json (100%) rename doc/{v3 => }/api_samples/os-availability-zone/availability-zone-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-cells/cells-capacities-resp.json (100%) rename doc/{v3 => }/api_samples/os-cells/cells-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-cells/cells-list-empty-resp.json (100%) rename doc/{v3 => }/api_samples/os-cells/cells-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-certificates/certificate-create-resp.json (100%) rename doc/{v3 => }/api_samples/os-certificates/certificate-get-root-resp.json (100%) rename doc/{v3 => }/api_samples/os-cloudpipe/cloud-pipe-create-req.json (100%) rename doc/{v3 => }/api_samples/os-cloudpipe/cloud-pipe-create-resp.json (100%) rename doc/{v3 => }/api_samples/os-cloudpipe/cloud-pipe-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-cloudpipe/cloud-pipe-update-req.json (100%) rename doc/{v3 => }/api_samples/os-config-drive/server-config-drive-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-config-drive/server-post-req.json (100%) rename doc/{v3 => }/api_samples/os-config-drive/server-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-config-drive/servers-config-drive-details-resp.json (100%) rename doc/{v3 => }/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json (100%) rename doc/{v3 => }/api_samples/os-console-output/console-output-post-req.json (100%) rename doc/{v3 => }/api_samples/os-console-output/console-output-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-create-backup/create-backup-req.json (100%) rename doc/{v3 => }/api_samples/os-deferred-delete/force-delete-post-req.json (100%) rename doc/{v3 => }/api_samples/os-deferred-delete/restore-post-req.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/image-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/image-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/list-servers-detail-get.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/server-action-rebuild-req.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/server-action-rebuild-resp.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/server-post-req.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/server-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/server-resize-post-req.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/server-update-put-req.json (100%) rename doc/{v3 => }/api_samples/os-disk-config/server-update-put-resp.json (100%) rename doc/{v3 => }/api_samples/os-evacuate/server-evacuate-find-host-req.json (100%) rename doc/{v3 => }/api_samples/os-evacuate/server-evacuate-find-host-resp.json (100%) rename doc/{v3 => }/api_samples/os-evacuate/server-evacuate-req.json (100%) rename doc/{v3 => }/api_samples/os-evacuate/server-evacuate-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-availability-zone/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-availability-zone/servers-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-server-attributes/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-server-attributes/server-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-server-attributes/servers-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-status/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-status/servers-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-volumes/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-volumes/servers-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-volumes/v2.3/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-fixed-ips/fixedip-post-req.json (100%) rename doc/{v3 => }/api_samples/os-fixed-ips/fixedips-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-fixed-ips/v2.4/fixedip-post-req.json (100%) rename doc/{v3 => }/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json (100%) rename doc/{v3 => }/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json (100%) rename doc/{v3 => }/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json (100%) rename doc/{v3 => }/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ip-pools/floatingippools-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips/floating-ips-create-req.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips/floating-ips-create-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips/floating-ips-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips/floating-ips-list-empty-resp.json (100%) rename doc/{v3 => }/api_samples/os-floating-ips/floating-ips-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-fping/fping-get-details-resp.json (100%) rename doc/{v3 => }/api_samples/os-fping/fping-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-hide-server-addresses/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-hide-server-addresses/servers-details-resp.json (100%) rename doc/{v3 => }/api_samples/os-hide-server-addresses/servers-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-hosts/host-get-reboot.json (100%) rename doc/{v3 => }/api_samples/os-hosts/host-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-hosts/host-get-shutdown.json (100%) rename doc/{v3 => }/api_samples/os-hosts/host-get-startup.json (100%) rename doc/{v3 => }/api_samples/os-hosts/host-put-maintenance-req.json (100%) rename doc/{v3 => }/api_samples/os-hosts/host-put-maintenance-resp.json (100%) rename doc/{v3 => }/api_samples/os-hosts/hosts-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-hypervisors/hypervisors-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-hypervisors/hypervisors-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-hypervisors/hypervisors-search-resp.json (100%) rename doc/{v3 => }/api_samples/os-hypervisors/hypervisors-show-resp.json (100%) rename doc/{v3 => }/api_samples/os-hypervisors/hypervisors-statistics-resp.json (100%) rename doc/{v3 => }/api_samples/os-hypervisors/hypervisors-uptime-resp.json (100%) rename doc/{v3 => }/api_samples/os-hypervisors/hypervisors-with-servers-resp.json (100%) rename doc/{v3 => }/api_samples/os-hypervisors/hypervisors-without-servers-resp.json (100%) rename doc/{v3 => }/api_samples/os-instance-actions/instance-action-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-instance-actions/instance-actions-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-index-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-show-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-lock-server/lock-server.json (100%) rename doc/{v3 => }/api_samples/os-lock-server/unlock-server.json (100%) rename doc/{v3 => }/api_samples/os-migrate-server/live-migrate-server.json (100%) rename doc/{v3 => }/api_samples/os-migrate-server/migrate-server.json (100%) rename doc/{v3 => }/api_samples/os-migrations/migrations-get.json (100%) rename doc/{v3 => }/api_samples/os-multinic/multinic-add-fixed-ip-req.json (100%) rename doc/{v3 => }/api_samples/os-multinic/multinic-remove-fixed-ip-req.json (100%) rename doc/{v3 => }/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json (100%) rename doc/{v3 => }/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-multiple-create/multiple-create-post-req.json (100%) rename doc/{v3 => }/api_samples/os-multiple-create/multiple-create-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-networks-associate/network-associate-host-req.json (100%) rename doc/{v3 => }/api_samples/os-networks-associate/network-disassociate-host-req.json (100%) rename doc/{v3 => }/api_samples/os-networks-associate/network-disassociate-project-req.json (100%) rename doc/{v3 => }/api_samples/os-networks-associate/network-disassociate-req.json (100%) rename doc/{v3 => }/api_samples/os-networks/network-add-req.json (100%) rename doc/{v3 => }/api_samples/os-networks/network-create-req.json (100%) rename doc/{v3 => }/api_samples/os-networks/network-create-resp.json (100%) rename doc/{v3 => }/api_samples/os-networks/network-show-resp.json (100%) rename doc/{v3 => }/api_samples/os-networks/networks-disassociate-req.json (100%) rename doc/{v3 => }/api_samples/os-networks/networks-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-pause-server/pause-server.json (100%) rename doc/{v3 => }/api_samples/os-pause-server/unpause-server.json (100%) rename doc/{v3 => }/api_samples/os-pci/hypervisors-pci-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-pci/hypervisors-pci-show-resp.json (100%) rename doc/{v3 => }/api_samples/os-pci/pci-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-pci/pci-index-resp.json (100%) rename doc/{v3 => }/api_samples/os-pci/pci-show-resp.json (100%) rename doc/{v3 => }/api_samples/os-pci/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-pci/servers-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-personality/server-action-rebuild-req.json (100%) rename doc/{v3 => }/api_samples/os-personality/server-action-rebuild-resp.json (100%) rename doc/{v3 => }/api_samples/os-personality/server-post-req.json (100%) rename doc/{v3 => }/api_samples/os-personality/server-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json (100%) rename doc/{v3 => }/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json (100%) rename doc/{v3 => }/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-quota-class-sets/quota-classes-update-post-req.json (100%) rename doc/{v3 => }/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-quota-sets/quotas-show-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-quota-sets/quotas-update-force-post-req.json (100%) rename doc/{v3 => }/api_samples/os-quota-sets/quotas-update-force-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-quota-sets/quotas-update-post-req.json (100%) rename doc/{v3 => }/api_samples/os-quota-sets/quotas-update-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-quota-sets/user-quotas-show-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-quota-sets/user-quotas-update-post-req.json (100%) rename doc/{v3 => }/api_samples/os-quota-sets/user-quotas-update-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/get-rdp-console-post-req.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/get-rdp-console-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/get-serial-console-post-req.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/get-serial-console-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/get-spice-console-post-req.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/get-spice-console-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/get-vnc-console-post-req.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/get-vnc-console-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/v2.6/create-vnc-console-req.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/v2.8/create-mks-console-req.json (100%) rename doc/{v3 => }/api_samples/os-remote-consoles/v2.8/create-mks-console-resp.json (100%) rename doc/{v3 => }/api_samples/os-rescue/server-get-resp-rescue.json (100%) rename doc/{v3 => }/api_samples/os-rescue/server-get-resp-unrescue.json (100%) rename doc/{v3 => }/api_samples/os-rescue/server-rescue-req-with-image-ref.json (100%) rename doc/{v3 => }/api_samples/os-rescue/server-rescue-req.json (100%) rename doc/{v3 => }/api_samples/os-rescue/server-rescue.json (100%) rename doc/{v3 => }/api_samples/os-rescue/server-unrescue-req.json (100%) rename doc/{v3 => }/api_samples/os-scheduler-hints/scheduler-hints-post-req.json (100%) rename doc/{v3 => }/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json (100%) rename doc/{v3 => }/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json (100%) rename doc/{v3 => }/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/security-group-add-post-req.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/security-group-post-req.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/security-group-remove-post-req.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/security-groups-create-resp.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/security-groups-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/security-groups-list-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/server-post-req.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/server-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/server-security-groups-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-security-groups/servers-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-server-external-events/event-create-req.json (100%) rename doc/{v3 => }/api_samples/os-server-external-events/event-create-resp.json (100%) rename doc/{v3 => }/api_samples/os-server-groups/server-groups-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-server-groups/server-groups-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-server-groups/server-groups-post-req.json (100%) rename doc/{v3 => }/api_samples/os-server-groups/server-groups-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-server-password/get-password-resp.json (100%) rename doc/{v3 => }/api_samples/os-server-usage/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-server-usage/servers-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-services/service-disable-log-put-req.json (100%) rename doc/{v3 => }/api_samples/os-services/service-disable-log-put-resp.json (100%) rename doc/{v3 => }/api_samples/os-services/service-disable-put-req.json (100%) rename doc/{v3 => }/api_samples/os-services/service-disable-put-resp.json (100%) rename doc/{v3 => }/api_samples/os-services/service-enable-put-req.json (100%) rename doc/{v3 => }/api_samples/os-services/service-enable-put-resp.json (100%) rename doc/{v3 => }/api_samples/os-services/services-list-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-services/v2.11/service-disable-log-put-req.json (100%) rename doc/{v3 => }/api_samples/os-services/v2.11/service-disable-log-put-resp.json (100%) rename doc/{v3 => }/api_samples/os-services/v2.11/service-disable-put-req.json (100%) rename doc/{v3 => }/api_samples/os-services/v2.11/service-disable-put-resp.json (100%) rename doc/{v3 => }/api_samples/os-services/v2.11/service-enable-put-req.json (100%) rename doc/{v3 => }/api_samples/os-services/v2.11/service-enable-put-resp.json (100%) rename doc/{v3 => }/api_samples/os-services/v2.11/service-force-down-put-req.json (100%) rename doc/{v3 => }/api_samples/os-services/v2.11/service-force-down-put-resp.json (100%) rename doc/{v3 => }/api_samples/os-services/v2.11/services-list-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-shelve/os-shelve-offload.json (100%) rename doc/{v3 => }/api_samples/os-shelve/os-shelve.json (100%) rename doc/{v3 => }/api_samples/os-shelve/os-unshelve.json (100%) rename doc/{v3 => }/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json (100%) rename doc/{v3 => }/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json (100%) rename doc/{v3 => }/api_samples/os-suspend-server/server-resume.json (100%) rename doc/{v3 => }/api_samples/os-suspend-server/server-suspend.json (100%) rename doc/{v3 => }/api_samples/os-tenant-networks/networks-list-res.json (100%) rename doc/{v3 => }/api_samples/os-tenant-networks/networks-post-req.json (100%) rename doc/{v3 => }/api_samples/os-tenant-networks/networks-post-res.json (100%) rename doc/{v3 => }/api_samples/os-used-limits/usedlimits-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-user-data/userdata-post-req.json (100%) rename doc/{v3 => }/api_samples/os-user-data/userdata-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-virtual-interfaces/vifs-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/attach-volume-to-server-req.json (100%) rename doc/{v3 => }/api_samples/os-volumes/attach-volume-to-server-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/list-volume-attachments-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/os-volumes-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/os-volumes-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/os-volumes-index-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/os-volumes-post-req.json (100%) rename doc/{v3 => }/api_samples/os-volumes/os-volumes-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/snapshot-create-req.json (100%) rename doc/{v3 => }/api_samples/os-volumes/snapshot-create-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/snapshots-detail-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/snapshots-list-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/snapshots-show-resp.json (100%) rename doc/{v3 => }/api_samples/os-volumes/update-volume-req.json (100%) rename doc/{v3 => }/api_samples/os-volumes/volume-attachment-detail-resp.json (100%) rename doc/{v3 => }/api_samples/server-ips/server-ips-network-resp.json (100%) rename doc/{v3 => }/api_samples/server-ips/server-ips-resp.json (100%) rename doc/{v3 => }/api_samples/server-metadata/server-metadata-all-req.json (100%) rename doc/{v3 => }/api_samples/server-metadata/server-metadata-all-resp.json (100%) rename doc/{v3 => }/api_samples/server-metadata/server-metadata-req.json (100%) rename doc/{v3 => }/api_samples/server-metadata/server-metadata-resp.json (100%) rename doc/{v3 => }/api_samples/servers-sort/server-sort-keys-list-resp.json (100%) rename doc/{v3 => }/api_samples/servers/server-action-confirm-resize.json (100%) rename doc/{v3 => }/api_samples/servers/server-action-create-image.json (100%) rename doc/{v3 => }/api_samples/servers/server-action-reboot.json (100%) rename doc/{v3 => }/api_samples/servers/server-action-rebuild-preserve-ephemeral.json (100%) rename doc/{v3 => }/api_samples/servers/server-action-rebuild-resp.json (100%) rename doc/{v3 => }/api_samples/servers/server-action-rebuild.json (100%) rename doc/{v3 => }/api_samples/servers/server-action-resize.json (100%) rename doc/{v3 => }/api_samples/servers/server-action-revert-resize.json (100%) rename doc/{v3 => }/api_samples/servers/server-action-start.json (100%) rename doc/{v3 => }/api_samples/servers/server-action-stop.json (100%) rename doc/{v3 => }/api_samples/servers/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/servers/server-post-req.json (100%) rename doc/{v3 => }/api_samples/servers/server-post-resp.json (100%) rename doc/{v3 => }/api_samples/servers/servers-details-resp.json (100%) rename doc/{v3 => }/api_samples/servers/servers-list-resp.json (100%) rename doc/{v3 => }/api_samples/servers/v2.9/server-get-resp.json (100%) rename doc/{v3 => }/api_samples/servers/v2.9/server-post-req.json (100%) rename doc/{v3 => }/api_samples/servers/v2.9/server-post-resp.json (100%) rename doc/{v3 => }/api_samples/servers/v2.9/servers-details-resp.json (100%) rename doc/{v3 => }/api_samples/servers/v2.9/servers-list-resp.json (100%) rename doc/{v3 => }/api_samples/servers_v21/server-post-req.json (100%) rename doc/{v3 => }/api_samples/servers_v21/server-post-resp.json (100%) rename nova/tests/functional/{v3 => }/api_paste_fixture.py (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_sample_base.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/extensions-list-resp-v2.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/extensions-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/server-action-confirm-resize.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/server-action-create-image.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/server-action-reboot.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/server-action-rebuild.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/server-action-resize.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/server-action-revert-resize.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/server-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/server-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/servers-details-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/all_extensions/servers-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/consoles/consoles-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/consoles/consoles-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/consoles/consoles-list-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/extension-info/extensions-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-access/flavor-access-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-access/flavor-access-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-access/flavor-access-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-access/flavor-access-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-access/flavor-access-show-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-manage/flavor-create-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavor-manage/flavor-create-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavors/flavor-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavors/flavors-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/flavors/flavors-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/image-size/image-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/image-size/images-details-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/image-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/image-meta-key-get.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/image-meta-key-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/image-meta-key-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/image-metadata-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/image-metadata-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/image-metadata-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/image-metadata-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/image-metadata-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/images-details-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/images/images-list-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/keypairs-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/keypairs-import-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/keypairs-import-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/keypairs-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/keypairs-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/keypairs-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.10/keypairs-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.10/keypairs-import-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.10/keypairs-import-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.10/keypairs-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.10/keypairs-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.10/keypairs-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.2/keypairs-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.2/keypairs-import-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.2/keypairs-import-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.2/keypairs-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.2/keypairs-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/keypairs/v2.2/keypairs-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-access-ips/server-action-rebuild.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-access-ips/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-access-ips/server-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-access-ips/server-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-access-ips/server-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-access-ips/server-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-access-ips/servers-details-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-access-ips/servers-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-admin-password/admin-password-change-password.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-agents/agent-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-agents/agent-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-agents/agent-update-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-agents/agent-update-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-agents/agents-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-update-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregates-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-availability-zone/availability-zone-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-availability-zone/availability-zone-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-cells/cells-capacities-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-cells/cells-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-cells/cells-list-empty-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-cells/cells-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-certificates/certificate-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-certificates/certificate-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-certificates/certificate-get-root-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-config-drive/server-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-config-drive/server-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-console-output/console-output-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-console-output/console-output-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-create-backup/create-backup-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-deferred-delete/force-delete-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-deferred-delete/restore-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/image-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/image-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/list-servers-detail-get.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/server-action-rebuild-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/server-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/server-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/server-resize-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/server-update-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-disk-config/server-update-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-evacuate/server-evacuate-find-host-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-evacuate/server-evacuate-find-host-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-evacuate/server-evacuate-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-evacuate/server-evacuate-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-extended-availability-zone/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-extended-server-attributes/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-extended-status/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-extended-status/servers-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-extended-volumes/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-extended-volumes/servers-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-fixed-ips/fixedip-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-fixed-ips/v2.4/fixedip-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips/floating-ips-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-fping/fping-get-details-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-fping/fping-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hide-server-addresses/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hosts/host-get-reboot.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hosts/host-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hosts/host-get-shutdown.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hosts/host-get-startup.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hosts/host-put-maintenance-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hosts/host-put-maintenance-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hosts/hosts-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hypervisors/hypervisors-with-servers-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-hypervisors/hypervisors-without-servers-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-instance-actions/instance-action-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-instance-actions/instance-instance-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-index-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-show-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-lock-server/lock-server.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-lock-server/unlock-server.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-migrate-server/live-migrate-server.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-migrate-server/migrate-server.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-migrations/migrations-get.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-multinic/multinic-add-fixed-ip-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-multinic/multinic-remove-fixed-ip-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-multiple-create/multiple-create-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-networks-associate/network-associate-host-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-networks-associate/network-disassociate-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-networks/network-add-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-networks/network-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-networks/network-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-networks/network-show-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-networks/networks-disassociate-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-networks/networks-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-pause-server/pause-server.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-pause-server/unpause-server.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-pci/hypervisors-pci-show-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-pci/pci-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-pci/pci-index-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-pci/pci-show-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-pci/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-pci/servers-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-personality/server-action-rebuild-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-personality/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-personality/server-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-personality/server-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-sets/quotas-update-force-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-sets/quotas-update-force-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-sets/quotas-update-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-sets/user-quotas-update-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/get-rdp-console-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/get-rdp-console-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/get-serial-console-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/get-serial-console-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/get-spice-console-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/get-spice-console-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/get-vnc-console-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/get-vnc-console-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/v2.6/create-vnc-console-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/v2.8/create-mks-console-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-remote-consoles/v2.8/create-mks-console-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-rescue/server-get-resp-rescue.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-rescue/server-get-resp-unrescue.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-rescue/server-rescue-req-with-image-ref.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-rescue/server-rescue-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-rescue/server-rescue.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-rescue/server-unrescue-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/security-group-add-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/security-group-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/security-group-remove-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/security-groups-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/security-groups-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/server-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/server-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-security-groups/servers-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-server-external-events/event-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-server-external-events/event-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-server-groups/server-groups-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-server-groups/server-groups-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-server-groups/server-groups-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-server-groups/server-groups-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-server-password/get-password-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-server-usage/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-server-usage/servers-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/service-disable-log-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/service-disable-log-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/service-disable-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/service-disable-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/service-enable-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/service-enable-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/services-list-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/v2.11/service-disable-log-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/v2.11/service-disable-log-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/v2.11/service-disable-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/v2.11/service-disable-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/v2.11/service-enable-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/v2.11/service-enable-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/v2.11/service-force-down-put-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/v2.11/service-force-down-put-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-services/v2.11/services-list-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-shelve/os-shelve-offload.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-shelve/os-shelve.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-shelve/os-unshelve.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-suspend-server/server-resume.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-suspend-server/server-suspend.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-tenant-networks/networks-list-res.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-tenant-networks/networks-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-tenant-networks/networks-post-res.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-used-limits/usedlimits-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-user-data/userdata-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-user-data/userdata-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/attach-volume-to-server-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/attach-volume-to-server-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/list-volume-attachments-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/os-volumes-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/os-volumes-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/os-volumes-index-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/os-volumes-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/os-volumes-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/snapshot-create-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/snapshot-create-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/snapshots-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/snapshots-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/snapshots-show-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/update-volume-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-volumes/volume-attachment-detail-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/server-ips/server-ips-network-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/server-ips/server-ips-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/server-metadata/server-metadata-all-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/server-metadata/server-metadata-all-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/server-metadata/server-metadata-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/server-metadata/server-metadata-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers-sort/server-sort-keys-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-action-confirm-resize.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-action-create-image.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-action-reboot.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-action-rebuild.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-action-resize.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-action-revert-resize.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-action-start.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-action-stop.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/server-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/servers-details-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/servers-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/v2.9/server-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/v2.9/server-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/v2.9/server-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/v2.9/servers-details-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers/v2.9/servers-list-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers_v21/server-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/servers_v21/server-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/test_access_ips.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_admin_actions.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_admin_password.py (95%) rename nova/tests/functional/{v3 => api_sample_tests}/test_agents.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_aggregates.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_assisted_volume_snapshots.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_attach_interfaces.py (99%) rename nova/tests/functional/{v3 => api_sample_tests}/test_availability_zone.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_baremetal_nodes.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_cells.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_certificates.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_cloudpipe.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_config_drive.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_console_auth_tokens.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_console_output.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_consoles.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_create_backup.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_deferred_delete.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_disk_config.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_evacuate.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_extended_availability_zone.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_extended_server_attributes.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_extended_status.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_extended_volumes.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_extension_info.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_fixed_ips.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_flavor_access.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_flavor_extraspecs.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_flavor_manage.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_flavor_rxtx.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_flavors.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_floating_ip_dns.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_floating_ip_pools.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_floating_ips.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_floating_ips_bulk.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_fping.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_hide_server_addresses.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_hosts.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_hypervisors.py (99%) rename nova/tests/functional/{v3 => api_sample_tests}/test_image_size.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_images.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_instance_actions.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_instance_usage_audit_log.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_keypairs.py (99%) rename nova/tests/functional/{v3 => api_sample_tests}/test_lock_server.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_migrate_server.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_migrations.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_multinic.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_multiple_create.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_networks.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_networks_associate.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_pause_server.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_pci.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_personality.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_preserve_ephemeral_rebuild.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_quota_classes.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_quota_sets.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_remote_consoles.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_rescue.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_scheduler_hints.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_security_group_default_rules.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_security_groups.py (99%) rename nova/tests/functional/{v3 => api_sample_tests}/test_server_diagnostics.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_server_external_events.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_server_groups.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_server_metadata.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_server_password.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_server_usage.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_servers.py (99%) rename nova/tests/functional/{v3 => api_sample_tests}/test_servers_ips.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_services.py (98%) rename nova/tests/functional/{v3 => api_sample_tests}/test_shelve.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_simple_tenant_usage.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_suspend_server.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_tenant_networks.py (97%) rename nova/tests/functional/{v3 => api_sample_tests}/test_used_limits.py (95%) rename nova/tests/functional/{v3 => api_sample_tests}/test_user_data.py (96%) rename nova/tests/functional/{v3 => api_sample_tests}/test_volumes.py (99%) delete mode 100644 nova/tests/functional/v3/__init__.py diff --git a/doc/v3/api_samples/all_extensions/extensions-list-resp-v2.json b/doc/api_samples/all_extensions/extensions-list-resp-v2.json similarity index 100% rename from doc/v3/api_samples/all_extensions/extensions-list-resp-v2.json rename to doc/api_samples/all_extensions/extensions-list-resp-v2.json diff --git a/doc/v3/api_samples/all_extensions/extensions-list-resp.json b/doc/api_samples/all_extensions/extensions-list-resp.json similarity index 100% rename from doc/v3/api_samples/all_extensions/extensions-list-resp.json rename to doc/api_samples/all_extensions/extensions-list-resp.json diff --git a/doc/v3/api_samples/all_extensions/server-action-confirm-resize.json b/doc/api_samples/all_extensions/server-action-confirm-resize.json similarity index 100% rename from doc/v3/api_samples/all_extensions/server-action-confirm-resize.json rename to doc/api_samples/all_extensions/server-action-confirm-resize.json diff --git a/doc/v3/api_samples/all_extensions/server-action-create-image.json b/doc/api_samples/all_extensions/server-action-create-image.json similarity index 100% rename from doc/v3/api_samples/all_extensions/server-action-create-image.json rename to doc/api_samples/all_extensions/server-action-create-image.json diff --git a/doc/v3/api_samples/all_extensions/server-action-reboot.json b/doc/api_samples/all_extensions/server-action-reboot.json similarity index 100% rename from doc/v3/api_samples/all_extensions/server-action-reboot.json rename to doc/api_samples/all_extensions/server-action-reboot.json diff --git a/doc/v3/api_samples/all_extensions/server-action-rebuild-resp.json b/doc/api_samples/all_extensions/server-action-rebuild-resp.json similarity index 100% rename from doc/v3/api_samples/all_extensions/server-action-rebuild-resp.json rename to doc/api_samples/all_extensions/server-action-rebuild-resp.json diff --git a/doc/v3/api_samples/all_extensions/server-action-rebuild.json b/doc/api_samples/all_extensions/server-action-rebuild.json similarity index 100% rename from doc/v3/api_samples/all_extensions/server-action-rebuild.json rename to doc/api_samples/all_extensions/server-action-rebuild.json diff --git a/doc/v3/api_samples/all_extensions/server-action-resize.json b/doc/api_samples/all_extensions/server-action-resize.json similarity index 100% rename from doc/v3/api_samples/all_extensions/server-action-resize.json rename to doc/api_samples/all_extensions/server-action-resize.json diff --git a/doc/v3/api_samples/all_extensions/server-action-revert-resize.json b/doc/api_samples/all_extensions/server-action-revert-resize.json similarity index 100% rename from doc/v3/api_samples/all_extensions/server-action-revert-resize.json rename to doc/api_samples/all_extensions/server-action-revert-resize.json diff --git a/doc/v3/api_samples/all_extensions/server-get-resp.json b/doc/api_samples/all_extensions/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/all_extensions/server-get-resp.json rename to doc/api_samples/all_extensions/server-get-resp.json diff --git a/doc/v3/api_samples/all_extensions/server-post-req.json b/doc/api_samples/all_extensions/server-post-req.json similarity index 100% rename from doc/v3/api_samples/all_extensions/server-post-req.json rename to doc/api_samples/all_extensions/server-post-req.json diff --git a/doc/v3/api_samples/all_extensions/server-post-resp.json b/doc/api_samples/all_extensions/server-post-resp.json similarity index 100% rename from doc/v3/api_samples/all_extensions/server-post-resp.json rename to doc/api_samples/all_extensions/server-post-resp.json diff --git a/doc/v3/api_samples/all_extensions/servers-details-resp.json b/doc/api_samples/all_extensions/servers-details-resp.json similarity index 100% rename from doc/v3/api_samples/all_extensions/servers-details-resp.json rename to doc/api_samples/all_extensions/servers-details-resp.json diff --git a/doc/v3/api_samples/all_extensions/servers-list-resp.json b/doc/api_samples/all_extensions/servers-list-resp.json similarity index 100% rename from doc/v3/api_samples/all_extensions/servers-list-resp.json rename to doc/api_samples/all_extensions/servers-list-resp.json diff --git a/doc/v3/api_samples/consoles/consoles-get-resp.json b/doc/api_samples/consoles/consoles-get-resp.json similarity index 100% rename from doc/v3/api_samples/consoles/consoles-get-resp.json rename to doc/api_samples/consoles/consoles-get-resp.json diff --git a/doc/v3/api_samples/consoles/consoles-list-get-resp.json b/doc/api_samples/consoles/consoles-list-get-resp.json similarity index 100% rename from doc/v3/api_samples/consoles/consoles-list-get-resp.json rename to doc/api_samples/consoles/consoles-list-get-resp.json diff --git a/doc/v3/api_samples/extension-info/extensions-get-resp.json b/doc/api_samples/extension-info/extensions-get-resp.json similarity index 100% rename from doc/v3/api_samples/extension-info/extensions-get-resp.json rename to doc/api_samples/extension-info/extensions-get-resp.json diff --git a/doc/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json b/doc/api_samples/flavor-access/flavor-access-add-tenant-req.json similarity index 100% rename from doc/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json rename to doc/api_samples/flavor-access/flavor-access-add-tenant-req.json diff --git a/doc/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json b/doc/api_samples/flavor-access/flavor-access-add-tenant-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json rename to doc/api_samples/flavor-access/flavor-access-add-tenant-resp.json diff --git a/doc/v3/api_samples/flavor-access/flavor-access-create-req.json b/doc/api_samples/flavor-access/flavor-access-create-req.json similarity index 100% rename from doc/v3/api_samples/flavor-access/flavor-access-create-req.json rename to doc/api_samples/flavor-access/flavor-access-create-req.json diff --git a/doc/v3/api_samples/flavor-access/flavor-access-create-resp.json b/doc/api_samples/flavor-access/flavor-access-create-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-access/flavor-access-create-resp.json rename to doc/api_samples/flavor-access/flavor-access-create-resp.json diff --git a/doc/v3/api_samples/flavor-access/flavor-access-detail-resp.json b/doc/api_samples/flavor-access/flavor-access-detail-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-access/flavor-access-detail-resp.json rename to doc/api_samples/flavor-access/flavor-access-detail-resp.json diff --git a/doc/v3/api_samples/flavor-access/flavor-access-list-resp.json b/doc/api_samples/flavor-access/flavor-access-list-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-access/flavor-access-list-resp.json rename to doc/api_samples/flavor-access/flavor-access-list-resp.json diff --git a/doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json b/doc/api_samples/flavor-access/flavor-access-remove-tenant-req.json similarity index 100% rename from doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json rename to doc/api_samples/flavor-access/flavor-access-remove-tenant-req.json diff --git a/doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json b/doc/api_samples/flavor-access/flavor-access-remove-tenant-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json rename to doc/api_samples/flavor-access/flavor-access-remove-tenant-resp.json diff --git a/doc/v3/api_samples/flavor-access/flavor-access-show-resp.json b/doc/api_samples/flavor-access/flavor-access-show-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-access/flavor-access-show-resp.json rename to doc/api_samples/flavor-access/flavor-access-show-resp.json diff --git a/doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json b/doc/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json similarity index 100% rename from doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json rename to doc/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json diff --git a/doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json b/doc/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json rename to doc/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json diff --git a/doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json b/doc/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json rename to doc/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json diff --git a/doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json b/doc/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json rename to doc/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json diff --git a/doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json b/doc/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json similarity index 100% rename from doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json rename to doc/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json diff --git a/doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json b/doc/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json rename to doc/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json diff --git a/doc/v3/api_samples/flavor-manage/flavor-create-post-req.json b/doc/api_samples/flavor-manage/flavor-create-post-req.json similarity index 100% rename from doc/v3/api_samples/flavor-manage/flavor-create-post-req.json rename to doc/api_samples/flavor-manage/flavor-create-post-req.json diff --git a/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json b/doc/api_samples/flavor-manage/flavor-create-post-resp.json similarity index 100% rename from doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json rename to doc/api_samples/flavor-manage/flavor-create-post-resp.json diff --git a/doc/v3/api_samples/flavors/flavor-get-resp.json b/doc/api_samples/flavors/flavor-get-resp.json similarity index 100% rename from doc/v3/api_samples/flavors/flavor-get-resp.json rename to doc/api_samples/flavors/flavor-get-resp.json diff --git a/doc/v3/api_samples/flavors/flavors-detail-resp.json b/doc/api_samples/flavors/flavors-detail-resp.json similarity index 100% rename from doc/v3/api_samples/flavors/flavors-detail-resp.json rename to doc/api_samples/flavors/flavors-detail-resp.json diff --git a/doc/v3/api_samples/flavors/flavors-list-resp.json b/doc/api_samples/flavors/flavors-list-resp.json similarity index 100% rename from doc/v3/api_samples/flavors/flavors-list-resp.json rename to doc/api_samples/flavors/flavors-list-resp.json diff --git a/doc/v3/api_samples/image-size/image-get-resp.json b/doc/api_samples/image-size/image-get-resp.json similarity index 100% rename from doc/v3/api_samples/image-size/image-get-resp.json rename to doc/api_samples/image-size/image-get-resp.json diff --git a/doc/v3/api_samples/image-size/images-details-get-resp.json b/doc/api_samples/image-size/images-details-get-resp.json similarity index 100% rename from doc/v3/api_samples/image-size/images-details-get-resp.json rename to doc/api_samples/image-size/images-details-get-resp.json diff --git a/doc/v3/api_samples/images/image-get-resp.json b/doc/api_samples/images/image-get-resp.json similarity index 100% rename from doc/v3/api_samples/images/image-get-resp.json rename to doc/api_samples/images/image-get-resp.json diff --git a/doc/v3/api_samples/images/image-meta-key-get.json b/doc/api_samples/images/image-meta-key-get.json similarity index 100% rename from doc/v3/api_samples/images/image-meta-key-get.json rename to doc/api_samples/images/image-meta-key-get.json diff --git a/doc/v3/api_samples/images/image-meta-key-put-req.json b/doc/api_samples/images/image-meta-key-put-req.json similarity index 100% rename from doc/v3/api_samples/images/image-meta-key-put-req.json rename to doc/api_samples/images/image-meta-key-put-req.json diff --git a/doc/v3/api_samples/images/image-meta-key-put-resp.json b/doc/api_samples/images/image-meta-key-put-resp.json similarity index 100% rename from doc/v3/api_samples/images/image-meta-key-put-resp.json rename to doc/api_samples/images/image-meta-key-put-resp.json diff --git a/doc/v3/api_samples/images/image-metadata-get-resp.json b/doc/api_samples/images/image-metadata-get-resp.json similarity index 100% rename from doc/v3/api_samples/images/image-metadata-get-resp.json rename to doc/api_samples/images/image-metadata-get-resp.json diff --git a/doc/v3/api_samples/images/image-metadata-post-req.json b/doc/api_samples/images/image-metadata-post-req.json similarity index 100% rename from doc/v3/api_samples/images/image-metadata-post-req.json rename to doc/api_samples/images/image-metadata-post-req.json diff --git a/doc/v3/api_samples/images/image-metadata-post-resp.json b/doc/api_samples/images/image-metadata-post-resp.json similarity index 100% rename from doc/v3/api_samples/images/image-metadata-post-resp.json rename to doc/api_samples/images/image-metadata-post-resp.json diff --git a/doc/v3/api_samples/images/image-metadata-put-req.json b/doc/api_samples/images/image-metadata-put-req.json similarity index 100% rename from doc/v3/api_samples/images/image-metadata-put-req.json rename to doc/api_samples/images/image-metadata-put-req.json diff --git a/doc/v3/api_samples/images/image-metadata-put-resp.json b/doc/api_samples/images/image-metadata-put-resp.json similarity index 100% rename from doc/v3/api_samples/images/image-metadata-put-resp.json rename to doc/api_samples/images/image-metadata-put-resp.json diff --git a/doc/v3/api_samples/images/images-details-get-resp.json b/doc/api_samples/images/images-details-get-resp.json similarity index 100% rename from doc/v3/api_samples/images/images-details-get-resp.json rename to doc/api_samples/images/images-details-get-resp.json diff --git a/doc/v3/api_samples/images/images-list-get-resp.json b/doc/api_samples/images/images-list-get-resp.json similarity index 100% rename from doc/v3/api_samples/images/images-list-get-resp.json rename to doc/api_samples/images/images-list-get-resp.json diff --git a/doc/v3/api_samples/keypairs/keypairs-get-resp.json b/doc/api_samples/keypairs/keypairs-get-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/keypairs-get-resp.json rename to doc/api_samples/keypairs/keypairs-get-resp.json diff --git a/doc/v3/api_samples/keypairs/keypairs-import-post-req.json b/doc/api_samples/keypairs/keypairs-import-post-req.json similarity index 100% rename from doc/v3/api_samples/keypairs/keypairs-import-post-req.json rename to doc/api_samples/keypairs/keypairs-import-post-req.json diff --git a/doc/v3/api_samples/keypairs/keypairs-import-post-resp.json b/doc/api_samples/keypairs/keypairs-import-post-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/keypairs-import-post-resp.json rename to doc/api_samples/keypairs/keypairs-import-post-resp.json diff --git a/doc/v3/api_samples/keypairs/keypairs-list-resp.json b/doc/api_samples/keypairs/keypairs-list-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/keypairs-list-resp.json rename to doc/api_samples/keypairs/keypairs-list-resp.json diff --git a/doc/v3/api_samples/keypairs/keypairs-post-req.json b/doc/api_samples/keypairs/keypairs-post-req.json similarity index 100% rename from doc/v3/api_samples/keypairs/keypairs-post-req.json rename to doc/api_samples/keypairs/keypairs-post-req.json diff --git a/doc/v3/api_samples/keypairs/keypairs-post-resp.json b/doc/api_samples/keypairs/keypairs-post-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/keypairs-post-resp.json rename to doc/api_samples/keypairs/keypairs-post-resp.json diff --git a/doc/v3/api_samples/keypairs/v2.10/keypairs-get-resp.json b/doc/api_samples/keypairs/v2.10/keypairs-get-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.10/keypairs-get-resp.json rename to doc/api_samples/keypairs/v2.10/keypairs-get-resp.json diff --git a/doc/v3/api_samples/keypairs/v2.10/keypairs-import-post-req.json b/doc/api_samples/keypairs/v2.10/keypairs-import-post-req.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.10/keypairs-import-post-req.json rename to doc/api_samples/keypairs/v2.10/keypairs-import-post-req.json diff --git a/doc/v3/api_samples/keypairs/v2.10/keypairs-import-post-resp.json b/doc/api_samples/keypairs/v2.10/keypairs-import-post-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.10/keypairs-import-post-resp.json rename to doc/api_samples/keypairs/v2.10/keypairs-import-post-resp.json diff --git a/doc/v3/api_samples/keypairs/v2.10/keypairs-list-resp.json b/doc/api_samples/keypairs/v2.10/keypairs-list-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.10/keypairs-list-resp.json rename to doc/api_samples/keypairs/v2.10/keypairs-list-resp.json diff --git a/doc/v3/api_samples/keypairs/v2.10/keypairs-post-req.json b/doc/api_samples/keypairs/v2.10/keypairs-post-req.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.10/keypairs-post-req.json rename to doc/api_samples/keypairs/v2.10/keypairs-post-req.json diff --git a/doc/v3/api_samples/keypairs/v2.10/keypairs-post-resp.json b/doc/api_samples/keypairs/v2.10/keypairs-post-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.10/keypairs-post-resp.json rename to doc/api_samples/keypairs/v2.10/keypairs-post-resp.json diff --git a/doc/v3/api_samples/keypairs/v2.2/keypairs-get-resp.json b/doc/api_samples/keypairs/v2.2/keypairs-get-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.2/keypairs-get-resp.json rename to doc/api_samples/keypairs/v2.2/keypairs-get-resp.json diff --git a/doc/v3/api_samples/keypairs/v2.2/keypairs-import-post-req.json b/doc/api_samples/keypairs/v2.2/keypairs-import-post-req.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.2/keypairs-import-post-req.json rename to doc/api_samples/keypairs/v2.2/keypairs-import-post-req.json diff --git a/doc/v3/api_samples/keypairs/v2.2/keypairs-import-post-resp.json b/doc/api_samples/keypairs/v2.2/keypairs-import-post-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.2/keypairs-import-post-resp.json rename to doc/api_samples/keypairs/v2.2/keypairs-import-post-resp.json diff --git a/doc/v3/api_samples/keypairs/v2.2/keypairs-list-resp.json b/doc/api_samples/keypairs/v2.2/keypairs-list-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.2/keypairs-list-resp.json rename to doc/api_samples/keypairs/v2.2/keypairs-list-resp.json diff --git a/doc/v3/api_samples/keypairs/v2.2/keypairs-post-req.json b/doc/api_samples/keypairs/v2.2/keypairs-post-req.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.2/keypairs-post-req.json rename to doc/api_samples/keypairs/v2.2/keypairs-post-req.json diff --git a/doc/v3/api_samples/keypairs/v2.2/keypairs-post-resp.json b/doc/api_samples/keypairs/v2.2/keypairs-post-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/v2.2/keypairs-post-resp.json rename to doc/api_samples/keypairs/v2.2/keypairs-post-resp.json diff --git a/doc/v3/api_samples/os-access-ips/server-action-rebuild-resp.json b/doc/api_samples/os-access-ips/server-action-rebuild-resp.json similarity index 100% rename from doc/v3/api_samples/os-access-ips/server-action-rebuild-resp.json rename to doc/api_samples/os-access-ips/server-action-rebuild-resp.json diff --git a/doc/v3/api_samples/os-access-ips/server-action-rebuild.json b/doc/api_samples/os-access-ips/server-action-rebuild.json similarity index 100% rename from doc/v3/api_samples/os-access-ips/server-action-rebuild.json rename to doc/api_samples/os-access-ips/server-action-rebuild.json diff --git a/doc/v3/api_samples/os-access-ips/server-get-resp.json b/doc/api_samples/os-access-ips/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-access-ips/server-get-resp.json rename to doc/api_samples/os-access-ips/server-get-resp.json diff --git a/doc/v3/api_samples/os-access-ips/server-post-req.json b/doc/api_samples/os-access-ips/server-post-req.json similarity index 100% rename from doc/v3/api_samples/os-access-ips/server-post-req.json rename to doc/api_samples/os-access-ips/server-post-req.json diff --git a/doc/v3/api_samples/os-access-ips/server-post-resp.json b/doc/api_samples/os-access-ips/server-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-access-ips/server-post-resp.json rename to doc/api_samples/os-access-ips/server-post-resp.json diff --git a/doc/v3/api_samples/os-access-ips/server-put-req.json b/doc/api_samples/os-access-ips/server-put-req.json similarity index 100% rename from doc/v3/api_samples/os-access-ips/server-put-req.json rename to doc/api_samples/os-access-ips/server-put-req.json diff --git a/doc/v3/api_samples/os-access-ips/server-put-resp.json b/doc/api_samples/os-access-ips/server-put-resp.json similarity index 100% rename from doc/v3/api_samples/os-access-ips/server-put-resp.json rename to doc/api_samples/os-access-ips/server-put-resp.json diff --git a/doc/v3/api_samples/os-access-ips/servers-details-resp.json b/doc/api_samples/os-access-ips/servers-details-resp.json similarity index 100% rename from doc/v3/api_samples/os-access-ips/servers-details-resp.json rename to doc/api_samples/os-access-ips/servers-details-resp.json diff --git a/doc/v3/api_samples/os-admin-actions/admin-actions-inject-network-info.json b/doc/api_samples/os-admin-actions/admin-actions-inject-network-info.json similarity index 100% rename from doc/v3/api_samples/os-admin-actions/admin-actions-inject-network-info.json rename to doc/api_samples/os-admin-actions/admin-actions-inject-network-info.json diff --git a/doc/v3/api_samples/os-admin-actions/admin-actions-reset-network.json b/doc/api_samples/os-admin-actions/admin-actions-reset-network.json similarity index 100% rename from doc/v3/api_samples/os-admin-actions/admin-actions-reset-network.json rename to doc/api_samples/os-admin-actions/admin-actions-reset-network.json diff --git a/doc/v3/api_samples/os-admin-actions/admin-actions-reset-server-state.json b/doc/api_samples/os-admin-actions/admin-actions-reset-server-state.json similarity index 100% rename from doc/v3/api_samples/os-admin-actions/admin-actions-reset-server-state.json rename to doc/api_samples/os-admin-actions/admin-actions-reset-server-state.json diff --git a/doc/v3/api_samples/os-admin-password/admin-password-change-password.json b/doc/api_samples/os-admin-password/admin-password-change-password.json similarity index 100% rename from doc/v3/api_samples/os-admin-password/admin-password-change-password.json rename to doc/api_samples/os-admin-password/admin-password-change-password.json diff --git a/doc/v3/api_samples/os-agents/agent-post-req.json b/doc/api_samples/os-agents/agent-post-req.json similarity index 100% rename from doc/v3/api_samples/os-agents/agent-post-req.json rename to doc/api_samples/os-agents/agent-post-req.json diff --git a/doc/v3/api_samples/os-agents/agent-post-resp.json b/doc/api_samples/os-agents/agent-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-agents/agent-post-resp.json rename to doc/api_samples/os-agents/agent-post-resp.json diff --git a/doc/v3/api_samples/os-agents/agent-update-put-req.json b/doc/api_samples/os-agents/agent-update-put-req.json similarity index 100% rename from doc/v3/api_samples/os-agents/agent-update-put-req.json rename to doc/api_samples/os-agents/agent-update-put-req.json diff --git a/doc/v3/api_samples/os-agents/agent-update-put-resp.json b/doc/api_samples/os-agents/agent-update-put-resp.json similarity index 100% rename from doc/v3/api_samples/os-agents/agent-update-put-resp.json rename to doc/api_samples/os-agents/agent-update-put-resp.json diff --git a/doc/v3/api_samples/os-agents/agents-get-resp.json b/doc/api_samples/os-agents/agents-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-agents/agents-get-resp.json rename to doc/api_samples/os-agents/agents-get-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json b/doc/api_samples/os-aggregates/aggregate-add-host-post-req.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json rename to doc/api_samples/os-aggregates/aggregate-add-host-post-req.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json b/doc/api_samples/os-aggregates/aggregate-metadata-post-req.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json rename to doc/api_samples/os-aggregates/aggregate-metadata-post-req.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-post-req.json b/doc/api_samples/os-aggregates/aggregate-post-req.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-post-req.json rename to doc/api_samples/os-aggregates/aggregate-post-req.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-post-resp.json b/doc/api_samples/os-aggregates/aggregate-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-post-resp.json rename to doc/api_samples/os-aggregates/aggregate-post-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json b/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json rename to doc/api_samples/os-aggregates/aggregate-remove-host-post-req.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-update-post-req.json b/doc/api_samples/os-aggregates/aggregate-update-post-req.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-update-post-req.json rename to doc/api_samples/os-aggregates/aggregate-update-post-req.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.json b/doc/api_samples/os-aggregates/aggregate-update-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.json rename to doc/api_samples/os-aggregates/aggregate-update-post-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json b/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json rename to doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregates-get-resp.json b/doc/api_samples/os-aggregates/aggregates-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregates-get-resp.json rename to doc/api_samples/os-aggregates/aggregates-get-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.json b/doc/api_samples/os-aggregates/aggregates-list-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.json rename to doc/api_samples/os-aggregates/aggregates-list-get-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json rename to doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json b/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json rename to doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json diff --git a/doc/v3/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json b/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json similarity index 100% rename from doc/v3/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json rename to doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json diff --git a/doc/v3/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json b/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json similarity index 100% rename from doc/v3/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json rename to doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json diff --git a/doc/v3/api_samples/os-attach-interfaces/attach-interfaces-create-req.json b/doc/api_samples/os-attach-interfaces/attach-interfaces-create-req.json similarity index 100% rename from doc/v3/api_samples/os-attach-interfaces/attach-interfaces-create-req.json rename to doc/api_samples/os-attach-interfaces/attach-interfaces-create-req.json diff --git a/doc/v3/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json b/doc/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json similarity index 100% rename from doc/v3/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json rename to doc/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json diff --git a/doc/v3/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json b/doc/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json rename to doc/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json diff --git a/doc/v3/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json b/doc/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json similarity index 100% rename from doc/v3/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json rename to doc/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json diff --git a/doc/v3/api_samples/os-availability-zone/availability-zone-detail-resp.json b/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-availability-zone/availability-zone-detail-resp.json rename to doc/api_samples/os-availability-zone/availability-zone-detail-resp.json diff --git a/doc/v3/api_samples/os-availability-zone/availability-zone-list-resp.json b/doc/api_samples/os-availability-zone/availability-zone-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-availability-zone/availability-zone-list-resp.json rename to doc/api_samples/os-availability-zone/availability-zone-list-resp.json diff --git a/doc/v3/api_samples/os-availability-zone/availability-zone-post-req.json b/doc/api_samples/os-availability-zone/availability-zone-post-req.json similarity index 100% rename from doc/v3/api_samples/os-availability-zone/availability-zone-post-req.json rename to doc/api_samples/os-availability-zone/availability-zone-post-req.json diff --git a/doc/v3/api_samples/os-availability-zone/availability-zone-post-resp.json b/doc/api_samples/os-availability-zone/availability-zone-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-availability-zone/availability-zone-post-resp.json rename to doc/api_samples/os-availability-zone/availability-zone-post-resp.json diff --git a/doc/v3/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json rename to doc/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json diff --git a/doc/v3/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json rename to doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json diff --git a/doc/v3/api_samples/os-cells/cells-capacities-resp.json b/doc/api_samples/os-cells/cells-capacities-resp.json similarity index 100% rename from doc/v3/api_samples/os-cells/cells-capacities-resp.json rename to doc/api_samples/os-cells/cells-capacities-resp.json diff --git a/doc/v3/api_samples/os-cells/cells-get-resp.json b/doc/api_samples/os-cells/cells-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-cells/cells-get-resp.json rename to doc/api_samples/os-cells/cells-get-resp.json diff --git a/doc/v3/api_samples/os-cells/cells-list-empty-resp.json b/doc/api_samples/os-cells/cells-list-empty-resp.json similarity index 100% rename from doc/v3/api_samples/os-cells/cells-list-empty-resp.json rename to doc/api_samples/os-cells/cells-list-empty-resp.json diff --git a/doc/v3/api_samples/os-cells/cells-list-resp.json b/doc/api_samples/os-cells/cells-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-cells/cells-list-resp.json rename to doc/api_samples/os-cells/cells-list-resp.json diff --git a/doc/v3/api_samples/os-certificates/certificate-create-resp.json b/doc/api_samples/os-certificates/certificate-create-resp.json similarity index 100% rename from doc/v3/api_samples/os-certificates/certificate-create-resp.json rename to doc/api_samples/os-certificates/certificate-create-resp.json diff --git a/doc/v3/api_samples/os-certificates/certificate-get-root-resp.json b/doc/api_samples/os-certificates/certificate-get-root-resp.json similarity index 100% rename from doc/v3/api_samples/os-certificates/certificate-get-root-resp.json rename to doc/api_samples/os-certificates/certificate-get-root-resp.json diff --git a/doc/v3/api_samples/os-cloudpipe/cloud-pipe-create-req.json b/doc/api_samples/os-cloudpipe/cloud-pipe-create-req.json similarity index 100% rename from doc/v3/api_samples/os-cloudpipe/cloud-pipe-create-req.json rename to doc/api_samples/os-cloudpipe/cloud-pipe-create-req.json diff --git a/doc/v3/api_samples/os-cloudpipe/cloud-pipe-create-resp.json b/doc/api_samples/os-cloudpipe/cloud-pipe-create-resp.json similarity index 100% rename from doc/v3/api_samples/os-cloudpipe/cloud-pipe-create-resp.json rename to doc/api_samples/os-cloudpipe/cloud-pipe-create-resp.json diff --git a/doc/v3/api_samples/os-cloudpipe/cloud-pipe-get-resp.json b/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-cloudpipe/cloud-pipe-get-resp.json rename to doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.json diff --git a/doc/v3/api_samples/os-cloudpipe/cloud-pipe-update-req.json b/doc/api_samples/os-cloudpipe/cloud-pipe-update-req.json similarity index 100% rename from doc/v3/api_samples/os-cloudpipe/cloud-pipe-update-req.json rename to doc/api_samples/os-cloudpipe/cloud-pipe-update-req.json diff --git a/doc/v3/api_samples/os-config-drive/server-config-drive-get-resp.json b/doc/api_samples/os-config-drive/server-config-drive-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-config-drive/server-config-drive-get-resp.json rename to doc/api_samples/os-config-drive/server-config-drive-get-resp.json diff --git a/doc/v3/api_samples/os-config-drive/server-post-req.json b/doc/api_samples/os-config-drive/server-post-req.json similarity index 100% rename from doc/v3/api_samples/os-config-drive/server-post-req.json rename to doc/api_samples/os-config-drive/server-post-req.json diff --git a/doc/v3/api_samples/os-config-drive/server-post-resp.json b/doc/api_samples/os-config-drive/server-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-config-drive/server-post-resp.json rename to doc/api_samples/os-config-drive/server-post-resp.json diff --git a/doc/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json b/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json similarity index 100% rename from doc/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json rename to doc/api_samples/os-config-drive/servers-config-drive-details-resp.json diff --git a/doc/v3/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json b/doc/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json rename to doc/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json diff --git a/doc/v3/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json b/doc/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json similarity index 100% rename from doc/v3/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json rename to doc/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json diff --git a/doc/v3/api_samples/os-console-output/console-output-post-req.json b/doc/api_samples/os-console-output/console-output-post-req.json similarity index 100% rename from doc/v3/api_samples/os-console-output/console-output-post-req.json rename to doc/api_samples/os-console-output/console-output-post-req.json diff --git a/doc/v3/api_samples/os-console-output/console-output-post-resp.json b/doc/api_samples/os-console-output/console-output-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-console-output/console-output-post-resp.json rename to doc/api_samples/os-console-output/console-output-post-resp.json diff --git a/doc/v3/api_samples/os-create-backup/create-backup-req.json b/doc/api_samples/os-create-backup/create-backup-req.json similarity index 100% rename from doc/v3/api_samples/os-create-backup/create-backup-req.json rename to doc/api_samples/os-create-backup/create-backup-req.json diff --git a/doc/v3/api_samples/os-deferred-delete/force-delete-post-req.json b/doc/api_samples/os-deferred-delete/force-delete-post-req.json similarity index 100% rename from doc/v3/api_samples/os-deferred-delete/force-delete-post-req.json rename to doc/api_samples/os-deferred-delete/force-delete-post-req.json diff --git a/doc/v3/api_samples/os-deferred-delete/restore-post-req.json b/doc/api_samples/os-deferred-delete/restore-post-req.json similarity index 100% rename from doc/v3/api_samples/os-deferred-delete/restore-post-req.json rename to doc/api_samples/os-deferred-delete/restore-post-req.json diff --git a/doc/v3/api_samples/os-disk-config/image-get-resp.json b/doc/api_samples/os-disk-config/image-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/image-get-resp.json rename to doc/api_samples/os-disk-config/image-get-resp.json diff --git a/doc/v3/api_samples/os-disk-config/image-list-resp.json b/doc/api_samples/os-disk-config/image-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/image-list-resp.json rename to doc/api_samples/os-disk-config/image-list-resp.json diff --git a/doc/v3/api_samples/os-disk-config/list-servers-detail-get.json b/doc/api_samples/os-disk-config/list-servers-detail-get.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/list-servers-detail-get.json rename to doc/api_samples/os-disk-config/list-servers-detail-get.json diff --git a/doc/v3/api_samples/os-disk-config/server-action-rebuild-req.json b/doc/api_samples/os-disk-config/server-action-rebuild-req.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/server-action-rebuild-req.json rename to doc/api_samples/os-disk-config/server-action-rebuild-req.json diff --git a/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json b/doc/api_samples/os-disk-config/server-action-rebuild-resp.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json rename to doc/api_samples/os-disk-config/server-action-rebuild-resp.json diff --git a/doc/v3/api_samples/os-disk-config/server-get-resp.json b/doc/api_samples/os-disk-config/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/server-get-resp.json rename to doc/api_samples/os-disk-config/server-get-resp.json diff --git a/doc/v3/api_samples/os-disk-config/server-post-req.json b/doc/api_samples/os-disk-config/server-post-req.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/server-post-req.json rename to doc/api_samples/os-disk-config/server-post-req.json diff --git a/doc/v3/api_samples/os-disk-config/server-post-resp.json b/doc/api_samples/os-disk-config/server-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/server-post-resp.json rename to doc/api_samples/os-disk-config/server-post-resp.json diff --git a/doc/v3/api_samples/os-disk-config/server-resize-post-req.json b/doc/api_samples/os-disk-config/server-resize-post-req.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/server-resize-post-req.json rename to doc/api_samples/os-disk-config/server-resize-post-req.json diff --git a/doc/v3/api_samples/os-disk-config/server-update-put-req.json b/doc/api_samples/os-disk-config/server-update-put-req.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/server-update-put-req.json rename to doc/api_samples/os-disk-config/server-update-put-req.json diff --git a/doc/v3/api_samples/os-disk-config/server-update-put-resp.json b/doc/api_samples/os-disk-config/server-update-put-resp.json similarity index 100% rename from doc/v3/api_samples/os-disk-config/server-update-put-resp.json rename to doc/api_samples/os-disk-config/server-update-put-resp.json diff --git a/doc/v3/api_samples/os-evacuate/server-evacuate-find-host-req.json b/doc/api_samples/os-evacuate/server-evacuate-find-host-req.json similarity index 100% rename from doc/v3/api_samples/os-evacuate/server-evacuate-find-host-req.json rename to doc/api_samples/os-evacuate/server-evacuate-find-host-req.json diff --git a/doc/v3/api_samples/os-evacuate/server-evacuate-find-host-resp.json b/doc/api_samples/os-evacuate/server-evacuate-find-host-resp.json similarity index 100% rename from doc/v3/api_samples/os-evacuate/server-evacuate-find-host-resp.json rename to doc/api_samples/os-evacuate/server-evacuate-find-host-resp.json diff --git a/doc/v3/api_samples/os-evacuate/server-evacuate-req.json b/doc/api_samples/os-evacuate/server-evacuate-req.json similarity index 100% rename from doc/v3/api_samples/os-evacuate/server-evacuate-req.json rename to doc/api_samples/os-evacuate/server-evacuate-req.json diff --git a/doc/v3/api_samples/os-evacuate/server-evacuate-resp.json b/doc/api_samples/os-evacuate/server-evacuate-resp.json similarity index 100% rename from doc/v3/api_samples/os-evacuate/server-evacuate-resp.json rename to doc/api_samples/os-evacuate/server-evacuate-resp.json diff --git a/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json b/doc/api_samples/os-extended-availability-zone/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json rename to doc/api_samples/os-extended-availability-zone/server-get-resp.json diff --git a/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json b/doc/api_samples/os-extended-availability-zone/servers-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json rename to doc/api_samples/os-extended-availability-zone/servers-detail-resp.json diff --git a/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json b/doc/api_samples/os-extended-server-attributes/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json rename to doc/api_samples/os-extended-server-attributes/server-get-resp.json diff --git a/doc/v3/api_samples/os-extended-server-attributes/server-post-resp.json b/doc/api_samples/os-extended-server-attributes/server-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-server-attributes/server-post-resp.json rename to doc/api_samples/os-extended-server-attributes/server-post-resp.json diff --git a/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json b/doc/api_samples/os-extended-server-attributes/servers-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json rename to doc/api_samples/os-extended-server-attributes/servers-detail-resp.json diff --git a/doc/v3/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json b/doc/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json rename to doc/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json diff --git a/doc/v3/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json b/doc/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json rename to doc/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json diff --git a/doc/v3/api_samples/os-extended-status/server-get-resp.json b/doc/api_samples/os-extended-status/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-status/server-get-resp.json rename to doc/api_samples/os-extended-status/server-get-resp.json diff --git a/doc/v3/api_samples/os-extended-status/servers-detail-resp.json b/doc/api_samples/os-extended-status/servers-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-status/servers-detail-resp.json rename to doc/api_samples/os-extended-status/servers-detail-resp.json diff --git a/doc/v3/api_samples/os-extended-volumes/server-get-resp.json b/doc/api_samples/os-extended-volumes/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-volumes/server-get-resp.json rename to doc/api_samples/os-extended-volumes/server-get-resp.json diff --git a/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json b/doc/api_samples/os-extended-volumes/servers-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json rename to doc/api_samples/os-extended-volumes/servers-detail-resp.json diff --git a/doc/v3/api_samples/os-extended-volumes/v2.3/server-get-resp.json b/doc/api_samples/os-extended-volumes/v2.3/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-volumes/v2.3/server-get-resp.json rename to doc/api_samples/os-extended-volumes/v2.3/server-get-resp.json diff --git a/doc/v3/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json b/doc/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json rename to doc/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json diff --git a/doc/v3/api_samples/os-fixed-ips/fixedip-post-req.json b/doc/api_samples/os-fixed-ips/fixedip-post-req.json similarity index 100% rename from doc/v3/api_samples/os-fixed-ips/fixedip-post-req.json rename to doc/api_samples/os-fixed-ips/fixedip-post-req.json diff --git a/doc/v3/api_samples/os-fixed-ips/fixedips-get-resp.json b/doc/api_samples/os-fixed-ips/fixedips-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-fixed-ips/fixedips-get-resp.json rename to doc/api_samples/os-fixed-ips/fixedips-get-resp.json diff --git a/doc/v3/api_samples/os-fixed-ips/v2.4/fixedip-post-req.json b/doc/api_samples/os-fixed-ips/v2.4/fixedip-post-req.json similarity index 100% rename from doc/v3/api_samples/os-fixed-ips/v2.4/fixedip-post-req.json rename to doc/api_samples/os-fixed-ips/v2.4/fixedip-post-req.json diff --git a/doc/v3/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json b/doc/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json rename to doc/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json diff --git a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json rename to doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json diff --git a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json rename to doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json diff --git a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json similarity index 100% rename from doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json rename to doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json diff --git a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json rename to doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json diff --git a/doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json similarity index 100% rename from doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json rename to doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json diff --git a/doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json rename to doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json diff --git a/doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json similarity index 100% rename from doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json rename to doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json diff --git a/doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json rename to doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json diff --git a/doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json rename to doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json diff --git a/doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json rename to doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json diff --git a/doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json rename to doc/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json diff --git a/doc/v3/api_samples/os-floating-ip-pools/floatingippools-list-resp.json b/doc/api_samples/os-floating-ip-pools/floatingippools-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ip-pools/floatingippools-list-resp.json rename to doc/api_samples/os-floating-ip-pools/floatingippools-list-resp.json diff --git a/doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json rename to doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json diff --git a/doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json rename to doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json diff --git a/doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json rename to doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json diff --git a/doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json rename to doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json diff --git a/doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json rename to doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json diff --git a/doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json rename to doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json diff --git a/doc/v3/api_samples/os-floating-ips/floating-ips-create-req.json b/doc/api_samples/os-floating-ips/floating-ips-create-req.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips/floating-ips-create-req.json rename to doc/api_samples/os-floating-ips/floating-ips-create-req.json diff --git a/doc/v3/api_samples/os-floating-ips/floating-ips-create-resp.json b/doc/api_samples/os-floating-ips/floating-ips-create-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips/floating-ips-create-resp.json rename to doc/api_samples/os-floating-ips/floating-ips-create-resp.json diff --git a/doc/v3/api_samples/os-floating-ips/floating-ips-get-resp.json b/doc/api_samples/os-floating-ips/floating-ips-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips/floating-ips-get-resp.json rename to doc/api_samples/os-floating-ips/floating-ips-get-resp.json diff --git a/doc/v3/api_samples/os-floating-ips/floating-ips-list-empty-resp.json b/doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips/floating-ips-list-empty-resp.json rename to doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.json diff --git a/doc/v3/api_samples/os-floating-ips/floating-ips-list-resp.json b/doc/api_samples/os-floating-ips/floating-ips-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-floating-ips/floating-ips-list-resp.json rename to doc/api_samples/os-floating-ips/floating-ips-list-resp.json diff --git a/doc/v3/api_samples/os-fping/fping-get-details-resp.json b/doc/api_samples/os-fping/fping-get-details-resp.json similarity index 100% rename from doc/v3/api_samples/os-fping/fping-get-details-resp.json rename to doc/api_samples/os-fping/fping-get-details-resp.json diff --git a/doc/v3/api_samples/os-fping/fping-get-resp.json b/doc/api_samples/os-fping/fping-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-fping/fping-get-resp.json rename to doc/api_samples/os-fping/fping-get-resp.json diff --git a/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json b/doc/api_samples/os-hide-server-addresses/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json rename to doc/api_samples/os-hide-server-addresses/server-get-resp.json diff --git a/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json similarity index 100% rename from doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json rename to doc/api_samples/os-hide-server-addresses/servers-details-resp.json diff --git a/doc/v3/api_samples/os-hide-server-addresses/servers-list-resp.json b/doc/api_samples/os-hide-server-addresses/servers-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-hide-server-addresses/servers-list-resp.json rename to doc/api_samples/os-hide-server-addresses/servers-list-resp.json diff --git a/doc/v3/api_samples/os-hosts/host-get-reboot.json b/doc/api_samples/os-hosts/host-get-reboot.json similarity index 100% rename from doc/v3/api_samples/os-hosts/host-get-reboot.json rename to doc/api_samples/os-hosts/host-get-reboot.json diff --git a/doc/v3/api_samples/os-hosts/host-get-resp.json b/doc/api_samples/os-hosts/host-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-hosts/host-get-resp.json rename to doc/api_samples/os-hosts/host-get-resp.json diff --git a/doc/v3/api_samples/os-hosts/host-get-shutdown.json b/doc/api_samples/os-hosts/host-get-shutdown.json similarity index 100% rename from doc/v3/api_samples/os-hosts/host-get-shutdown.json rename to doc/api_samples/os-hosts/host-get-shutdown.json diff --git a/doc/v3/api_samples/os-hosts/host-get-startup.json b/doc/api_samples/os-hosts/host-get-startup.json similarity index 100% rename from doc/v3/api_samples/os-hosts/host-get-startup.json rename to doc/api_samples/os-hosts/host-get-startup.json diff --git a/doc/v3/api_samples/os-hosts/host-put-maintenance-req.json b/doc/api_samples/os-hosts/host-put-maintenance-req.json similarity index 100% rename from doc/v3/api_samples/os-hosts/host-put-maintenance-req.json rename to doc/api_samples/os-hosts/host-put-maintenance-req.json diff --git a/doc/v3/api_samples/os-hosts/host-put-maintenance-resp.json b/doc/api_samples/os-hosts/host-put-maintenance-resp.json similarity index 100% rename from doc/v3/api_samples/os-hosts/host-put-maintenance-resp.json rename to doc/api_samples/os-hosts/host-put-maintenance-resp.json diff --git a/doc/v3/api_samples/os-hosts/hosts-list-resp.json b/doc/api_samples/os-hosts/hosts-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-hosts/hosts-list-resp.json rename to doc/api_samples/os-hosts/hosts-list-resp.json diff --git a/doc/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json b/doc/api_samples/os-hypervisors/hypervisors-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json rename to doc/api_samples/os-hypervisors/hypervisors-detail-resp.json diff --git a/doc/v3/api_samples/os-hypervisors/hypervisors-list-resp.json b/doc/api_samples/os-hypervisors/hypervisors-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-hypervisors/hypervisors-list-resp.json rename to doc/api_samples/os-hypervisors/hypervisors-list-resp.json diff --git a/doc/v3/api_samples/os-hypervisors/hypervisors-search-resp.json b/doc/api_samples/os-hypervisors/hypervisors-search-resp.json similarity index 100% rename from doc/v3/api_samples/os-hypervisors/hypervisors-search-resp.json rename to doc/api_samples/os-hypervisors/hypervisors-search-resp.json diff --git a/doc/v3/api_samples/os-hypervisors/hypervisors-show-resp.json b/doc/api_samples/os-hypervisors/hypervisors-show-resp.json similarity index 100% rename from doc/v3/api_samples/os-hypervisors/hypervisors-show-resp.json rename to doc/api_samples/os-hypervisors/hypervisors-show-resp.json diff --git a/doc/v3/api_samples/os-hypervisors/hypervisors-statistics-resp.json b/doc/api_samples/os-hypervisors/hypervisors-statistics-resp.json similarity index 100% rename from doc/v3/api_samples/os-hypervisors/hypervisors-statistics-resp.json rename to doc/api_samples/os-hypervisors/hypervisors-statistics-resp.json diff --git a/doc/v3/api_samples/os-hypervisors/hypervisors-uptime-resp.json b/doc/api_samples/os-hypervisors/hypervisors-uptime-resp.json similarity index 100% rename from doc/v3/api_samples/os-hypervisors/hypervisors-uptime-resp.json rename to doc/api_samples/os-hypervisors/hypervisors-uptime-resp.json diff --git a/doc/v3/api_samples/os-hypervisors/hypervisors-with-servers-resp.json b/doc/api_samples/os-hypervisors/hypervisors-with-servers-resp.json similarity index 100% rename from doc/v3/api_samples/os-hypervisors/hypervisors-with-servers-resp.json rename to doc/api_samples/os-hypervisors/hypervisors-with-servers-resp.json diff --git a/doc/v3/api_samples/os-hypervisors/hypervisors-without-servers-resp.json b/doc/api_samples/os-hypervisors/hypervisors-without-servers-resp.json similarity index 100% rename from doc/v3/api_samples/os-hypervisors/hypervisors-without-servers-resp.json rename to doc/api_samples/os-hypervisors/hypervisors-without-servers-resp.json diff --git a/doc/v3/api_samples/os-instance-actions/instance-action-get-resp.json b/doc/api_samples/os-instance-actions/instance-action-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-instance-actions/instance-action-get-resp.json rename to doc/api_samples/os-instance-actions/instance-action-get-resp.json diff --git a/doc/v3/api_samples/os-instance-actions/instance-actions-list-resp.json b/doc/api_samples/os-instance-actions/instance-actions-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-instance-actions/instance-actions-list-resp.json rename to doc/api_samples/os-instance-actions/instance-actions-list-resp.json diff --git a/doc/v3/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-index-get-resp.json b/doc/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-index-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-index-get-resp.json rename to doc/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-index-get-resp.json diff --git a/doc/v3/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-show-get-resp.json b/doc/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-show-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-show-get-resp.json rename to doc/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-show-get-resp.json diff --git a/doc/v3/api_samples/os-lock-server/lock-server.json b/doc/api_samples/os-lock-server/lock-server.json similarity index 100% rename from doc/v3/api_samples/os-lock-server/lock-server.json rename to doc/api_samples/os-lock-server/lock-server.json diff --git a/doc/v3/api_samples/os-lock-server/unlock-server.json b/doc/api_samples/os-lock-server/unlock-server.json similarity index 100% rename from doc/v3/api_samples/os-lock-server/unlock-server.json rename to doc/api_samples/os-lock-server/unlock-server.json diff --git a/doc/v3/api_samples/os-migrate-server/live-migrate-server.json b/doc/api_samples/os-migrate-server/live-migrate-server.json similarity index 100% rename from doc/v3/api_samples/os-migrate-server/live-migrate-server.json rename to doc/api_samples/os-migrate-server/live-migrate-server.json diff --git a/doc/v3/api_samples/os-migrate-server/migrate-server.json b/doc/api_samples/os-migrate-server/migrate-server.json similarity index 100% rename from doc/v3/api_samples/os-migrate-server/migrate-server.json rename to doc/api_samples/os-migrate-server/migrate-server.json diff --git a/doc/v3/api_samples/os-migrations/migrations-get.json b/doc/api_samples/os-migrations/migrations-get.json similarity index 100% rename from doc/v3/api_samples/os-migrations/migrations-get.json rename to doc/api_samples/os-migrations/migrations-get.json diff --git a/doc/v3/api_samples/os-multinic/multinic-add-fixed-ip-req.json b/doc/api_samples/os-multinic/multinic-add-fixed-ip-req.json similarity index 100% rename from doc/v3/api_samples/os-multinic/multinic-add-fixed-ip-req.json rename to doc/api_samples/os-multinic/multinic-add-fixed-ip-req.json diff --git a/doc/v3/api_samples/os-multinic/multinic-remove-fixed-ip-req.json b/doc/api_samples/os-multinic/multinic-remove-fixed-ip-req.json similarity index 100% rename from doc/v3/api_samples/os-multinic/multinic-remove-fixed-ip-req.json rename to doc/api_samples/os-multinic/multinic-remove-fixed-ip-req.json diff --git a/doc/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json similarity index 100% rename from doc/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json rename to doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json diff --git a/doc/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json rename to doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json diff --git a/doc/v3/api_samples/os-multiple-create/multiple-create-post-req.json b/doc/api_samples/os-multiple-create/multiple-create-post-req.json similarity index 100% rename from doc/v3/api_samples/os-multiple-create/multiple-create-post-req.json rename to doc/api_samples/os-multiple-create/multiple-create-post-req.json diff --git a/doc/v3/api_samples/os-multiple-create/multiple-create-post-resp.json b/doc/api_samples/os-multiple-create/multiple-create-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-multiple-create/multiple-create-post-resp.json rename to doc/api_samples/os-multiple-create/multiple-create-post-resp.json diff --git a/doc/v3/api_samples/os-networks-associate/network-associate-host-req.json b/doc/api_samples/os-networks-associate/network-associate-host-req.json similarity index 100% rename from doc/v3/api_samples/os-networks-associate/network-associate-host-req.json rename to doc/api_samples/os-networks-associate/network-associate-host-req.json diff --git a/doc/v3/api_samples/os-networks-associate/network-disassociate-host-req.json b/doc/api_samples/os-networks-associate/network-disassociate-host-req.json similarity index 100% rename from doc/v3/api_samples/os-networks-associate/network-disassociate-host-req.json rename to doc/api_samples/os-networks-associate/network-disassociate-host-req.json diff --git a/doc/v3/api_samples/os-networks-associate/network-disassociate-project-req.json b/doc/api_samples/os-networks-associate/network-disassociate-project-req.json similarity index 100% rename from doc/v3/api_samples/os-networks-associate/network-disassociate-project-req.json rename to doc/api_samples/os-networks-associate/network-disassociate-project-req.json diff --git a/doc/v3/api_samples/os-networks-associate/network-disassociate-req.json b/doc/api_samples/os-networks-associate/network-disassociate-req.json similarity index 100% rename from doc/v3/api_samples/os-networks-associate/network-disassociate-req.json rename to doc/api_samples/os-networks-associate/network-disassociate-req.json diff --git a/doc/v3/api_samples/os-networks/network-add-req.json b/doc/api_samples/os-networks/network-add-req.json similarity index 100% rename from doc/v3/api_samples/os-networks/network-add-req.json rename to doc/api_samples/os-networks/network-add-req.json diff --git a/doc/v3/api_samples/os-networks/network-create-req.json b/doc/api_samples/os-networks/network-create-req.json similarity index 100% rename from doc/v3/api_samples/os-networks/network-create-req.json rename to doc/api_samples/os-networks/network-create-req.json diff --git a/doc/v3/api_samples/os-networks/network-create-resp.json b/doc/api_samples/os-networks/network-create-resp.json similarity index 100% rename from doc/v3/api_samples/os-networks/network-create-resp.json rename to doc/api_samples/os-networks/network-create-resp.json diff --git a/doc/v3/api_samples/os-networks/network-show-resp.json b/doc/api_samples/os-networks/network-show-resp.json similarity index 100% rename from doc/v3/api_samples/os-networks/network-show-resp.json rename to doc/api_samples/os-networks/network-show-resp.json diff --git a/doc/v3/api_samples/os-networks/networks-disassociate-req.json b/doc/api_samples/os-networks/networks-disassociate-req.json similarity index 100% rename from doc/v3/api_samples/os-networks/networks-disassociate-req.json rename to doc/api_samples/os-networks/networks-disassociate-req.json diff --git a/doc/v3/api_samples/os-networks/networks-list-resp.json b/doc/api_samples/os-networks/networks-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-networks/networks-list-resp.json rename to doc/api_samples/os-networks/networks-list-resp.json diff --git a/doc/v3/api_samples/os-pause-server/pause-server.json b/doc/api_samples/os-pause-server/pause-server.json similarity index 100% rename from doc/v3/api_samples/os-pause-server/pause-server.json rename to doc/api_samples/os-pause-server/pause-server.json diff --git a/doc/v3/api_samples/os-pause-server/unpause-server.json b/doc/api_samples/os-pause-server/unpause-server.json similarity index 100% rename from doc/v3/api_samples/os-pause-server/unpause-server.json rename to doc/api_samples/os-pause-server/unpause-server.json diff --git a/doc/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json b/doc/api_samples/os-pci/hypervisors-pci-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json rename to doc/api_samples/os-pci/hypervisors-pci-detail-resp.json diff --git a/doc/v3/api_samples/os-pci/hypervisors-pci-show-resp.json b/doc/api_samples/os-pci/hypervisors-pci-show-resp.json similarity index 100% rename from doc/v3/api_samples/os-pci/hypervisors-pci-show-resp.json rename to doc/api_samples/os-pci/hypervisors-pci-show-resp.json diff --git a/doc/v3/api_samples/os-pci/pci-detail-resp.json b/doc/api_samples/os-pci/pci-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-pci/pci-detail-resp.json rename to doc/api_samples/os-pci/pci-detail-resp.json diff --git a/doc/v3/api_samples/os-pci/pci-index-resp.json b/doc/api_samples/os-pci/pci-index-resp.json similarity index 100% rename from doc/v3/api_samples/os-pci/pci-index-resp.json rename to doc/api_samples/os-pci/pci-index-resp.json diff --git a/doc/v3/api_samples/os-pci/pci-show-resp.json b/doc/api_samples/os-pci/pci-show-resp.json similarity index 100% rename from doc/v3/api_samples/os-pci/pci-show-resp.json rename to doc/api_samples/os-pci/pci-show-resp.json diff --git a/doc/v3/api_samples/os-pci/server-get-resp.json b/doc/api_samples/os-pci/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-pci/server-get-resp.json rename to doc/api_samples/os-pci/server-get-resp.json diff --git a/doc/v3/api_samples/os-pci/servers-detail-resp.json b/doc/api_samples/os-pci/servers-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-pci/servers-detail-resp.json rename to doc/api_samples/os-pci/servers-detail-resp.json diff --git a/doc/v3/api_samples/os-personality/server-action-rebuild-req.json b/doc/api_samples/os-personality/server-action-rebuild-req.json similarity index 100% rename from doc/v3/api_samples/os-personality/server-action-rebuild-req.json rename to doc/api_samples/os-personality/server-action-rebuild-req.json diff --git a/doc/v3/api_samples/os-personality/server-action-rebuild-resp.json b/doc/api_samples/os-personality/server-action-rebuild-resp.json similarity index 100% rename from doc/v3/api_samples/os-personality/server-action-rebuild-resp.json rename to doc/api_samples/os-personality/server-action-rebuild-resp.json diff --git a/doc/v3/api_samples/os-personality/server-post-req.json b/doc/api_samples/os-personality/server-post-req.json similarity index 100% rename from doc/v3/api_samples/os-personality/server-post-req.json rename to doc/api_samples/os-personality/server-post-req.json diff --git a/doc/v3/api_samples/os-personality/server-post-resp.json b/doc/api_samples/os-personality/server-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-personality/server-post-resp.json rename to doc/api_samples/os-personality/server-post-resp.json diff --git a/doc/v3/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json similarity index 100% rename from doc/v3/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json rename to doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json diff --git a/doc/v3/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json similarity index 100% rename from doc/v3/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json rename to doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json diff --git a/doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json b/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json rename to doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json diff --git a/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.json b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.json similarity index 100% rename from doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.json rename to doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.json diff --git a/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json rename to doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json diff --git a/doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json rename to doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json diff --git a/doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.json b/doc/api_samples/os-quota-sets/quotas-show-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.json rename to doc/api_samples/os-quota-sets/quotas-show-get-resp.json diff --git a/doc/v3/api_samples/os-quota-sets/quotas-update-force-post-req.json b/doc/api_samples/os-quota-sets/quotas-update-force-post-req.json similarity index 100% rename from doc/v3/api_samples/os-quota-sets/quotas-update-force-post-req.json rename to doc/api_samples/os-quota-sets/quotas-update-force-post-req.json diff --git a/doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json b/doc/api_samples/os-quota-sets/quotas-update-force-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json rename to doc/api_samples/os-quota-sets/quotas-update-force-post-resp.json diff --git a/doc/v3/api_samples/os-quota-sets/quotas-update-post-req.json b/doc/api_samples/os-quota-sets/quotas-update-post-req.json similarity index 100% rename from doc/v3/api_samples/os-quota-sets/quotas-update-post-req.json rename to doc/api_samples/os-quota-sets/quotas-update-post-req.json diff --git a/doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.json b/doc/api_samples/os-quota-sets/quotas-update-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.json rename to doc/api_samples/os-quota-sets/quotas-update-post-resp.json diff --git a/doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json b/doc/api_samples/os-quota-sets/user-quotas-show-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json rename to doc/api_samples/os-quota-sets/user-quotas-show-get-resp.json diff --git a/doc/v3/api_samples/os-quota-sets/user-quotas-update-post-req.json b/doc/api_samples/os-quota-sets/user-quotas-update-post-req.json similarity index 100% rename from doc/v3/api_samples/os-quota-sets/user-quotas-update-post-req.json rename to doc/api_samples/os-quota-sets/user-quotas-update-post-req.json diff --git a/doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json b/doc/api_samples/os-quota-sets/user-quotas-update-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json rename to doc/api_samples/os-quota-sets/user-quotas-update-post-resp.json diff --git a/doc/v3/api_samples/os-remote-consoles/get-rdp-console-post-req.json b/doc/api_samples/os-remote-consoles/get-rdp-console-post-req.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/get-rdp-console-post-req.json rename to doc/api_samples/os-remote-consoles/get-rdp-console-post-req.json diff --git a/doc/v3/api_samples/os-remote-consoles/get-rdp-console-post-resp.json b/doc/api_samples/os-remote-consoles/get-rdp-console-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/get-rdp-console-post-resp.json rename to doc/api_samples/os-remote-consoles/get-rdp-console-post-resp.json diff --git a/doc/v3/api_samples/os-remote-consoles/get-serial-console-post-req.json b/doc/api_samples/os-remote-consoles/get-serial-console-post-req.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/get-serial-console-post-req.json rename to doc/api_samples/os-remote-consoles/get-serial-console-post-req.json diff --git a/doc/v3/api_samples/os-remote-consoles/get-serial-console-post-resp.json b/doc/api_samples/os-remote-consoles/get-serial-console-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/get-serial-console-post-resp.json rename to doc/api_samples/os-remote-consoles/get-serial-console-post-resp.json diff --git a/doc/v3/api_samples/os-remote-consoles/get-spice-console-post-req.json b/doc/api_samples/os-remote-consoles/get-spice-console-post-req.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/get-spice-console-post-req.json rename to doc/api_samples/os-remote-consoles/get-spice-console-post-req.json diff --git a/doc/v3/api_samples/os-remote-consoles/get-spice-console-post-resp.json b/doc/api_samples/os-remote-consoles/get-spice-console-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/get-spice-console-post-resp.json rename to doc/api_samples/os-remote-consoles/get-spice-console-post-resp.json diff --git a/doc/v3/api_samples/os-remote-consoles/get-vnc-console-post-req.json b/doc/api_samples/os-remote-consoles/get-vnc-console-post-req.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/get-vnc-console-post-req.json rename to doc/api_samples/os-remote-consoles/get-vnc-console-post-req.json diff --git a/doc/v3/api_samples/os-remote-consoles/get-vnc-console-post-resp.json b/doc/api_samples/os-remote-consoles/get-vnc-console-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/get-vnc-console-post-resp.json rename to doc/api_samples/os-remote-consoles/get-vnc-console-post-resp.json diff --git a/doc/v3/api_samples/os-remote-consoles/v2.6/create-vnc-console-req.json b/doc/api_samples/os-remote-consoles/v2.6/create-vnc-console-req.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/v2.6/create-vnc-console-req.json rename to doc/api_samples/os-remote-consoles/v2.6/create-vnc-console-req.json diff --git a/doc/v3/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json b/doc/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json rename to doc/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json diff --git a/doc/v3/api_samples/os-remote-consoles/v2.8/create-mks-console-req.json b/doc/api_samples/os-remote-consoles/v2.8/create-mks-console-req.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/v2.8/create-mks-console-req.json rename to doc/api_samples/os-remote-consoles/v2.8/create-mks-console-req.json diff --git a/doc/v3/api_samples/os-remote-consoles/v2.8/create-mks-console-resp.json b/doc/api_samples/os-remote-consoles/v2.8/create-mks-console-resp.json similarity index 100% rename from doc/v3/api_samples/os-remote-consoles/v2.8/create-mks-console-resp.json rename to doc/api_samples/os-remote-consoles/v2.8/create-mks-console-resp.json diff --git a/doc/v3/api_samples/os-rescue/server-get-resp-rescue.json b/doc/api_samples/os-rescue/server-get-resp-rescue.json similarity index 100% rename from doc/v3/api_samples/os-rescue/server-get-resp-rescue.json rename to doc/api_samples/os-rescue/server-get-resp-rescue.json diff --git a/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json b/doc/api_samples/os-rescue/server-get-resp-unrescue.json similarity index 100% rename from doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json rename to doc/api_samples/os-rescue/server-get-resp-unrescue.json diff --git a/doc/v3/api_samples/os-rescue/server-rescue-req-with-image-ref.json b/doc/api_samples/os-rescue/server-rescue-req-with-image-ref.json similarity index 100% rename from doc/v3/api_samples/os-rescue/server-rescue-req-with-image-ref.json rename to doc/api_samples/os-rescue/server-rescue-req-with-image-ref.json diff --git a/doc/v3/api_samples/os-rescue/server-rescue-req.json b/doc/api_samples/os-rescue/server-rescue-req.json similarity index 100% rename from doc/v3/api_samples/os-rescue/server-rescue-req.json rename to doc/api_samples/os-rescue/server-rescue-req.json diff --git a/doc/v3/api_samples/os-rescue/server-rescue.json b/doc/api_samples/os-rescue/server-rescue.json similarity index 100% rename from doc/v3/api_samples/os-rescue/server-rescue.json rename to doc/api_samples/os-rescue/server-rescue.json diff --git a/doc/v3/api_samples/os-rescue/server-unrescue-req.json b/doc/api_samples/os-rescue/server-unrescue-req.json similarity index 100% rename from doc/v3/api_samples/os-rescue/server-unrescue-req.json rename to doc/api_samples/os-rescue/server-unrescue-req.json diff --git a/doc/v3/api_samples/os-scheduler-hints/scheduler-hints-post-req.json b/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json similarity index 100% rename from doc/v3/api_samples/os-scheduler-hints/scheduler-hints-post-req.json rename to doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json diff --git a/doc/v3/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json b/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json rename to doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json diff --git a/doc/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json similarity index 100% rename from doc/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json rename to doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json diff --git a/doc/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json similarity index 100% rename from doc/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json rename to doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json diff --git a/doc/v3/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json rename to doc/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json diff --git a/doc/v3/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json similarity index 100% rename from doc/v3/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json rename to doc/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json diff --git a/doc/v3/api_samples/os-security-groups/security-group-add-post-req.json b/doc/api_samples/os-security-groups/security-group-add-post-req.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/security-group-add-post-req.json rename to doc/api_samples/os-security-groups/security-group-add-post-req.json diff --git a/doc/v3/api_samples/os-security-groups/security-group-post-req.json b/doc/api_samples/os-security-groups/security-group-post-req.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/security-group-post-req.json rename to doc/api_samples/os-security-groups/security-group-post-req.json diff --git a/doc/v3/api_samples/os-security-groups/security-group-remove-post-req.json b/doc/api_samples/os-security-groups/security-group-remove-post-req.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/security-group-remove-post-req.json rename to doc/api_samples/os-security-groups/security-group-remove-post-req.json diff --git a/doc/v3/api_samples/os-security-groups/security-groups-create-resp.json b/doc/api_samples/os-security-groups/security-groups-create-resp.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/security-groups-create-resp.json rename to doc/api_samples/os-security-groups/security-groups-create-resp.json diff --git a/doc/v3/api_samples/os-security-groups/security-groups-get-resp.json b/doc/api_samples/os-security-groups/security-groups-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/security-groups-get-resp.json rename to doc/api_samples/os-security-groups/security-groups-get-resp.json diff --git a/doc/v3/api_samples/os-security-groups/security-groups-list-get-resp.json b/doc/api_samples/os-security-groups/security-groups-list-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/security-groups-list-get-resp.json rename to doc/api_samples/os-security-groups/security-groups-list-get-resp.json diff --git a/doc/v3/api_samples/os-security-groups/server-get-resp.json b/doc/api_samples/os-security-groups/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/server-get-resp.json rename to doc/api_samples/os-security-groups/server-get-resp.json diff --git a/doc/v3/api_samples/os-security-groups/server-post-req.json b/doc/api_samples/os-security-groups/server-post-req.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/server-post-req.json rename to doc/api_samples/os-security-groups/server-post-req.json diff --git a/doc/v3/api_samples/os-security-groups/server-post-resp.json b/doc/api_samples/os-security-groups/server-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/server-post-resp.json rename to doc/api_samples/os-security-groups/server-post-resp.json diff --git a/doc/v3/api_samples/os-security-groups/server-security-groups-list-resp.json b/doc/api_samples/os-security-groups/server-security-groups-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/server-security-groups-list-resp.json rename to doc/api_samples/os-security-groups/server-security-groups-list-resp.json diff --git a/doc/v3/api_samples/os-security-groups/servers-detail-resp.json b/doc/api_samples/os-security-groups/servers-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-security-groups/servers-detail-resp.json rename to doc/api_samples/os-security-groups/servers-detail-resp.json diff --git a/doc/v3/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json b/doc/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json rename to doc/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json diff --git a/doc/v3/api_samples/os-server-external-events/event-create-req.json b/doc/api_samples/os-server-external-events/event-create-req.json similarity index 100% rename from doc/v3/api_samples/os-server-external-events/event-create-req.json rename to doc/api_samples/os-server-external-events/event-create-req.json diff --git a/doc/v3/api_samples/os-server-external-events/event-create-resp.json b/doc/api_samples/os-server-external-events/event-create-resp.json similarity index 100% rename from doc/v3/api_samples/os-server-external-events/event-create-resp.json rename to doc/api_samples/os-server-external-events/event-create-resp.json diff --git a/doc/v3/api_samples/os-server-groups/server-groups-get-resp.json b/doc/api_samples/os-server-groups/server-groups-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-server-groups/server-groups-get-resp.json rename to doc/api_samples/os-server-groups/server-groups-get-resp.json diff --git a/doc/v3/api_samples/os-server-groups/server-groups-list-resp.json b/doc/api_samples/os-server-groups/server-groups-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-server-groups/server-groups-list-resp.json rename to doc/api_samples/os-server-groups/server-groups-list-resp.json diff --git a/doc/v3/api_samples/os-server-groups/server-groups-post-req.json b/doc/api_samples/os-server-groups/server-groups-post-req.json similarity index 100% rename from doc/v3/api_samples/os-server-groups/server-groups-post-req.json rename to doc/api_samples/os-server-groups/server-groups-post-req.json diff --git a/doc/v3/api_samples/os-server-groups/server-groups-post-resp.json b/doc/api_samples/os-server-groups/server-groups-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-server-groups/server-groups-post-resp.json rename to doc/api_samples/os-server-groups/server-groups-post-resp.json diff --git a/doc/v3/api_samples/os-server-password/get-password-resp.json b/doc/api_samples/os-server-password/get-password-resp.json similarity index 100% rename from doc/v3/api_samples/os-server-password/get-password-resp.json rename to doc/api_samples/os-server-password/get-password-resp.json diff --git a/doc/v3/api_samples/os-server-usage/server-get-resp.json b/doc/api_samples/os-server-usage/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-server-usage/server-get-resp.json rename to doc/api_samples/os-server-usage/server-get-resp.json diff --git a/doc/v3/api_samples/os-server-usage/servers-detail-resp.json b/doc/api_samples/os-server-usage/servers-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-server-usage/servers-detail-resp.json rename to doc/api_samples/os-server-usage/servers-detail-resp.json diff --git a/doc/v3/api_samples/os-services/service-disable-log-put-req.json b/doc/api_samples/os-services/service-disable-log-put-req.json similarity index 100% rename from doc/v3/api_samples/os-services/service-disable-log-put-req.json rename to doc/api_samples/os-services/service-disable-log-put-req.json diff --git a/doc/v3/api_samples/os-services/service-disable-log-put-resp.json b/doc/api_samples/os-services/service-disable-log-put-resp.json similarity index 100% rename from doc/v3/api_samples/os-services/service-disable-log-put-resp.json rename to doc/api_samples/os-services/service-disable-log-put-resp.json diff --git a/doc/v3/api_samples/os-services/service-disable-put-req.json b/doc/api_samples/os-services/service-disable-put-req.json similarity index 100% rename from doc/v3/api_samples/os-services/service-disable-put-req.json rename to doc/api_samples/os-services/service-disable-put-req.json diff --git a/doc/v3/api_samples/os-services/service-disable-put-resp.json b/doc/api_samples/os-services/service-disable-put-resp.json similarity index 100% rename from doc/v3/api_samples/os-services/service-disable-put-resp.json rename to doc/api_samples/os-services/service-disable-put-resp.json diff --git a/doc/v3/api_samples/os-services/service-enable-put-req.json b/doc/api_samples/os-services/service-enable-put-req.json similarity index 100% rename from doc/v3/api_samples/os-services/service-enable-put-req.json rename to doc/api_samples/os-services/service-enable-put-req.json diff --git a/doc/v3/api_samples/os-services/service-enable-put-resp.json b/doc/api_samples/os-services/service-enable-put-resp.json similarity index 100% rename from doc/v3/api_samples/os-services/service-enable-put-resp.json rename to doc/api_samples/os-services/service-enable-put-resp.json diff --git a/doc/v3/api_samples/os-services/services-list-get-resp.json b/doc/api_samples/os-services/services-list-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-services/services-list-get-resp.json rename to doc/api_samples/os-services/services-list-get-resp.json diff --git a/doc/v3/api_samples/os-services/v2.11/service-disable-log-put-req.json b/doc/api_samples/os-services/v2.11/service-disable-log-put-req.json similarity index 100% rename from doc/v3/api_samples/os-services/v2.11/service-disable-log-put-req.json rename to doc/api_samples/os-services/v2.11/service-disable-log-put-req.json diff --git a/doc/v3/api_samples/os-services/v2.11/service-disable-log-put-resp.json b/doc/api_samples/os-services/v2.11/service-disable-log-put-resp.json similarity index 100% rename from doc/v3/api_samples/os-services/v2.11/service-disable-log-put-resp.json rename to doc/api_samples/os-services/v2.11/service-disable-log-put-resp.json diff --git a/doc/v3/api_samples/os-services/v2.11/service-disable-put-req.json b/doc/api_samples/os-services/v2.11/service-disable-put-req.json similarity index 100% rename from doc/v3/api_samples/os-services/v2.11/service-disable-put-req.json rename to doc/api_samples/os-services/v2.11/service-disable-put-req.json diff --git a/doc/v3/api_samples/os-services/v2.11/service-disable-put-resp.json b/doc/api_samples/os-services/v2.11/service-disable-put-resp.json similarity index 100% rename from doc/v3/api_samples/os-services/v2.11/service-disable-put-resp.json rename to doc/api_samples/os-services/v2.11/service-disable-put-resp.json diff --git a/doc/v3/api_samples/os-services/v2.11/service-enable-put-req.json b/doc/api_samples/os-services/v2.11/service-enable-put-req.json similarity index 100% rename from doc/v3/api_samples/os-services/v2.11/service-enable-put-req.json rename to doc/api_samples/os-services/v2.11/service-enable-put-req.json diff --git a/doc/v3/api_samples/os-services/v2.11/service-enable-put-resp.json b/doc/api_samples/os-services/v2.11/service-enable-put-resp.json similarity index 100% rename from doc/v3/api_samples/os-services/v2.11/service-enable-put-resp.json rename to doc/api_samples/os-services/v2.11/service-enable-put-resp.json diff --git a/doc/v3/api_samples/os-services/v2.11/service-force-down-put-req.json b/doc/api_samples/os-services/v2.11/service-force-down-put-req.json similarity index 100% rename from doc/v3/api_samples/os-services/v2.11/service-force-down-put-req.json rename to doc/api_samples/os-services/v2.11/service-force-down-put-req.json diff --git a/doc/v3/api_samples/os-services/v2.11/service-force-down-put-resp.json b/doc/api_samples/os-services/v2.11/service-force-down-put-resp.json similarity index 100% rename from doc/v3/api_samples/os-services/v2.11/service-force-down-put-resp.json rename to doc/api_samples/os-services/v2.11/service-force-down-put-resp.json diff --git a/doc/v3/api_samples/os-services/v2.11/services-list-get-resp.json b/doc/api_samples/os-services/v2.11/services-list-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-services/v2.11/services-list-get-resp.json rename to doc/api_samples/os-services/v2.11/services-list-get-resp.json diff --git a/doc/v3/api_samples/os-shelve/os-shelve-offload.json b/doc/api_samples/os-shelve/os-shelve-offload.json similarity index 100% rename from doc/v3/api_samples/os-shelve/os-shelve-offload.json rename to doc/api_samples/os-shelve/os-shelve-offload.json diff --git a/doc/v3/api_samples/os-shelve/os-shelve.json b/doc/api_samples/os-shelve/os-shelve.json similarity index 100% rename from doc/v3/api_samples/os-shelve/os-shelve.json rename to doc/api_samples/os-shelve/os-shelve.json diff --git a/doc/v3/api_samples/os-shelve/os-unshelve.json b/doc/api_samples/os-shelve/os-unshelve.json similarity index 100% rename from doc/v3/api_samples/os-shelve/os-unshelve.json rename to doc/api_samples/os-shelve/os-unshelve.json diff --git a/doc/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json similarity index 100% rename from doc/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json rename to doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json diff --git a/doc/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json similarity index 100% rename from doc/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json rename to doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json diff --git a/doc/v3/api_samples/os-suspend-server/server-resume.json b/doc/api_samples/os-suspend-server/server-resume.json similarity index 100% rename from doc/v3/api_samples/os-suspend-server/server-resume.json rename to doc/api_samples/os-suspend-server/server-resume.json diff --git a/doc/v3/api_samples/os-suspend-server/server-suspend.json b/doc/api_samples/os-suspend-server/server-suspend.json similarity index 100% rename from doc/v3/api_samples/os-suspend-server/server-suspend.json rename to doc/api_samples/os-suspend-server/server-suspend.json diff --git a/doc/v3/api_samples/os-tenant-networks/networks-list-res.json b/doc/api_samples/os-tenant-networks/networks-list-res.json similarity index 100% rename from doc/v3/api_samples/os-tenant-networks/networks-list-res.json rename to doc/api_samples/os-tenant-networks/networks-list-res.json diff --git a/doc/v3/api_samples/os-tenant-networks/networks-post-req.json b/doc/api_samples/os-tenant-networks/networks-post-req.json similarity index 100% rename from doc/v3/api_samples/os-tenant-networks/networks-post-req.json rename to doc/api_samples/os-tenant-networks/networks-post-req.json diff --git a/doc/v3/api_samples/os-tenant-networks/networks-post-res.json b/doc/api_samples/os-tenant-networks/networks-post-res.json similarity index 100% rename from doc/v3/api_samples/os-tenant-networks/networks-post-res.json rename to doc/api_samples/os-tenant-networks/networks-post-res.json diff --git a/doc/v3/api_samples/os-used-limits/usedlimits-get-resp.json b/doc/api_samples/os-used-limits/usedlimits-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-used-limits/usedlimits-get-resp.json rename to doc/api_samples/os-used-limits/usedlimits-get-resp.json diff --git a/doc/v3/api_samples/os-user-data/userdata-post-req.json b/doc/api_samples/os-user-data/userdata-post-req.json similarity index 100% rename from doc/v3/api_samples/os-user-data/userdata-post-req.json rename to doc/api_samples/os-user-data/userdata-post-req.json diff --git a/doc/v3/api_samples/os-user-data/userdata-post-resp.json b/doc/api_samples/os-user-data/userdata-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-user-data/userdata-post-resp.json rename to doc/api_samples/os-user-data/userdata-post-resp.json diff --git a/doc/v3/api_samples/os-virtual-interfaces/vifs-list-resp.json b/doc/api_samples/os-virtual-interfaces/vifs-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-virtual-interfaces/vifs-list-resp.json rename to doc/api_samples/os-virtual-interfaces/vifs-list-resp.json diff --git a/doc/v3/api_samples/os-volumes/attach-volume-to-server-req.json b/doc/api_samples/os-volumes/attach-volume-to-server-req.json similarity index 100% rename from doc/v3/api_samples/os-volumes/attach-volume-to-server-req.json rename to doc/api_samples/os-volumes/attach-volume-to-server-req.json diff --git a/doc/v3/api_samples/os-volumes/attach-volume-to-server-resp.json b/doc/api_samples/os-volumes/attach-volume-to-server-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/attach-volume-to-server-resp.json rename to doc/api_samples/os-volumes/attach-volume-to-server-resp.json diff --git a/doc/v3/api_samples/os-volumes/list-volume-attachments-resp.json b/doc/api_samples/os-volumes/list-volume-attachments-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/list-volume-attachments-resp.json rename to doc/api_samples/os-volumes/list-volume-attachments-resp.json diff --git a/doc/v3/api_samples/os-volumes/os-volumes-detail-resp.json b/doc/api_samples/os-volumes/os-volumes-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/os-volumes-detail-resp.json rename to doc/api_samples/os-volumes/os-volumes-detail-resp.json diff --git a/doc/v3/api_samples/os-volumes/os-volumes-get-resp.json b/doc/api_samples/os-volumes/os-volumes-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/os-volumes-get-resp.json rename to doc/api_samples/os-volumes/os-volumes-get-resp.json diff --git a/doc/v3/api_samples/os-volumes/os-volumes-index-resp.json b/doc/api_samples/os-volumes/os-volumes-index-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/os-volumes-index-resp.json rename to doc/api_samples/os-volumes/os-volumes-index-resp.json diff --git a/doc/v3/api_samples/os-volumes/os-volumes-post-req.json b/doc/api_samples/os-volumes/os-volumes-post-req.json similarity index 100% rename from doc/v3/api_samples/os-volumes/os-volumes-post-req.json rename to doc/api_samples/os-volumes/os-volumes-post-req.json diff --git a/doc/v3/api_samples/os-volumes/os-volumes-post-resp.json b/doc/api_samples/os-volumes/os-volumes-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/os-volumes-post-resp.json rename to doc/api_samples/os-volumes/os-volumes-post-resp.json diff --git a/doc/v3/api_samples/os-volumes/snapshot-create-req.json b/doc/api_samples/os-volumes/snapshot-create-req.json similarity index 100% rename from doc/v3/api_samples/os-volumes/snapshot-create-req.json rename to doc/api_samples/os-volumes/snapshot-create-req.json diff --git a/doc/v3/api_samples/os-volumes/snapshot-create-resp.json b/doc/api_samples/os-volumes/snapshot-create-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/snapshot-create-resp.json rename to doc/api_samples/os-volumes/snapshot-create-resp.json diff --git a/doc/v3/api_samples/os-volumes/snapshots-detail-resp.json b/doc/api_samples/os-volumes/snapshots-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/snapshots-detail-resp.json rename to doc/api_samples/os-volumes/snapshots-detail-resp.json diff --git a/doc/v3/api_samples/os-volumes/snapshots-list-resp.json b/doc/api_samples/os-volumes/snapshots-list-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/snapshots-list-resp.json rename to doc/api_samples/os-volumes/snapshots-list-resp.json diff --git a/doc/v3/api_samples/os-volumes/snapshots-show-resp.json b/doc/api_samples/os-volumes/snapshots-show-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/snapshots-show-resp.json rename to doc/api_samples/os-volumes/snapshots-show-resp.json diff --git a/doc/v3/api_samples/os-volumes/update-volume-req.json b/doc/api_samples/os-volumes/update-volume-req.json similarity index 100% rename from doc/v3/api_samples/os-volumes/update-volume-req.json rename to doc/api_samples/os-volumes/update-volume-req.json diff --git a/doc/v3/api_samples/os-volumes/volume-attachment-detail-resp.json b/doc/api_samples/os-volumes/volume-attachment-detail-resp.json similarity index 100% rename from doc/v3/api_samples/os-volumes/volume-attachment-detail-resp.json rename to doc/api_samples/os-volumes/volume-attachment-detail-resp.json diff --git a/doc/v3/api_samples/server-ips/server-ips-network-resp.json b/doc/api_samples/server-ips/server-ips-network-resp.json similarity index 100% rename from doc/v3/api_samples/server-ips/server-ips-network-resp.json rename to doc/api_samples/server-ips/server-ips-network-resp.json diff --git a/doc/v3/api_samples/server-ips/server-ips-resp.json b/doc/api_samples/server-ips/server-ips-resp.json similarity index 100% rename from doc/v3/api_samples/server-ips/server-ips-resp.json rename to doc/api_samples/server-ips/server-ips-resp.json diff --git a/doc/v3/api_samples/server-metadata/server-metadata-all-req.json b/doc/api_samples/server-metadata/server-metadata-all-req.json similarity index 100% rename from doc/v3/api_samples/server-metadata/server-metadata-all-req.json rename to doc/api_samples/server-metadata/server-metadata-all-req.json diff --git a/doc/v3/api_samples/server-metadata/server-metadata-all-resp.json b/doc/api_samples/server-metadata/server-metadata-all-resp.json similarity index 100% rename from doc/v3/api_samples/server-metadata/server-metadata-all-resp.json rename to doc/api_samples/server-metadata/server-metadata-all-resp.json diff --git a/doc/v3/api_samples/server-metadata/server-metadata-req.json b/doc/api_samples/server-metadata/server-metadata-req.json similarity index 100% rename from doc/v3/api_samples/server-metadata/server-metadata-req.json rename to doc/api_samples/server-metadata/server-metadata-req.json diff --git a/doc/v3/api_samples/server-metadata/server-metadata-resp.json b/doc/api_samples/server-metadata/server-metadata-resp.json similarity index 100% rename from doc/v3/api_samples/server-metadata/server-metadata-resp.json rename to doc/api_samples/server-metadata/server-metadata-resp.json diff --git a/doc/v3/api_samples/servers-sort/server-sort-keys-list-resp.json b/doc/api_samples/servers-sort/server-sort-keys-list-resp.json similarity index 100% rename from doc/v3/api_samples/servers-sort/server-sort-keys-list-resp.json rename to doc/api_samples/servers-sort/server-sort-keys-list-resp.json diff --git a/doc/v3/api_samples/servers/server-action-confirm-resize.json b/doc/api_samples/servers/server-action-confirm-resize.json similarity index 100% rename from doc/v3/api_samples/servers/server-action-confirm-resize.json rename to doc/api_samples/servers/server-action-confirm-resize.json diff --git a/doc/v3/api_samples/servers/server-action-create-image.json b/doc/api_samples/servers/server-action-create-image.json similarity index 100% rename from doc/v3/api_samples/servers/server-action-create-image.json rename to doc/api_samples/servers/server-action-create-image.json diff --git a/doc/v3/api_samples/servers/server-action-reboot.json b/doc/api_samples/servers/server-action-reboot.json similarity index 100% rename from doc/v3/api_samples/servers/server-action-reboot.json rename to doc/api_samples/servers/server-action-reboot.json diff --git a/doc/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral.json b/doc/api_samples/servers/server-action-rebuild-preserve-ephemeral.json similarity index 100% rename from doc/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral.json rename to doc/api_samples/servers/server-action-rebuild-preserve-ephemeral.json diff --git a/doc/v3/api_samples/servers/server-action-rebuild-resp.json b/doc/api_samples/servers/server-action-rebuild-resp.json similarity index 100% rename from doc/v3/api_samples/servers/server-action-rebuild-resp.json rename to doc/api_samples/servers/server-action-rebuild-resp.json diff --git a/doc/v3/api_samples/servers/server-action-rebuild.json b/doc/api_samples/servers/server-action-rebuild.json similarity index 100% rename from doc/v3/api_samples/servers/server-action-rebuild.json rename to doc/api_samples/servers/server-action-rebuild.json diff --git a/doc/v3/api_samples/servers/server-action-resize.json b/doc/api_samples/servers/server-action-resize.json similarity index 100% rename from doc/v3/api_samples/servers/server-action-resize.json rename to doc/api_samples/servers/server-action-resize.json diff --git a/doc/v3/api_samples/servers/server-action-revert-resize.json b/doc/api_samples/servers/server-action-revert-resize.json similarity index 100% rename from doc/v3/api_samples/servers/server-action-revert-resize.json rename to doc/api_samples/servers/server-action-revert-resize.json diff --git a/doc/v3/api_samples/servers/server-action-start.json b/doc/api_samples/servers/server-action-start.json similarity index 100% rename from doc/v3/api_samples/servers/server-action-start.json rename to doc/api_samples/servers/server-action-start.json diff --git a/doc/v3/api_samples/servers/server-action-stop.json b/doc/api_samples/servers/server-action-stop.json similarity index 100% rename from doc/v3/api_samples/servers/server-action-stop.json rename to doc/api_samples/servers/server-action-stop.json diff --git a/doc/v3/api_samples/servers/server-get-resp.json b/doc/api_samples/servers/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/servers/server-get-resp.json rename to doc/api_samples/servers/server-get-resp.json diff --git a/doc/v3/api_samples/servers/server-post-req.json b/doc/api_samples/servers/server-post-req.json similarity index 100% rename from doc/v3/api_samples/servers/server-post-req.json rename to doc/api_samples/servers/server-post-req.json diff --git a/doc/v3/api_samples/servers/server-post-resp.json b/doc/api_samples/servers/server-post-resp.json similarity index 100% rename from doc/v3/api_samples/servers/server-post-resp.json rename to doc/api_samples/servers/server-post-resp.json diff --git a/doc/v3/api_samples/servers/servers-details-resp.json b/doc/api_samples/servers/servers-details-resp.json similarity index 100% rename from doc/v3/api_samples/servers/servers-details-resp.json rename to doc/api_samples/servers/servers-details-resp.json diff --git a/doc/v3/api_samples/servers/servers-list-resp.json b/doc/api_samples/servers/servers-list-resp.json similarity index 100% rename from doc/v3/api_samples/servers/servers-list-resp.json rename to doc/api_samples/servers/servers-list-resp.json diff --git a/doc/v3/api_samples/servers/v2.9/server-get-resp.json b/doc/api_samples/servers/v2.9/server-get-resp.json similarity index 100% rename from doc/v3/api_samples/servers/v2.9/server-get-resp.json rename to doc/api_samples/servers/v2.9/server-get-resp.json diff --git a/doc/v3/api_samples/servers/v2.9/server-post-req.json b/doc/api_samples/servers/v2.9/server-post-req.json similarity index 100% rename from doc/v3/api_samples/servers/v2.9/server-post-req.json rename to doc/api_samples/servers/v2.9/server-post-req.json diff --git a/doc/v3/api_samples/servers/v2.9/server-post-resp.json b/doc/api_samples/servers/v2.9/server-post-resp.json similarity index 100% rename from doc/v3/api_samples/servers/v2.9/server-post-resp.json rename to doc/api_samples/servers/v2.9/server-post-resp.json diff --git a/doc/v3/api_samples/servers/v2.9/servers-details-resp.json b/doc/api_samples/servers/v2.9/servers-details-resp.json similarity index 100% rename from doc/v3/api_samples/servers/v2.9/servers-details-resp.json rename to doc/api_samples/servers/v2.9/servers-details-resp.json diff --git a/doc/v3/api_samples/servers/v2.9/servers-list-resp.json b/doc/api_samples/servers/v2.9/servers-list-resp.json similarity index 100% rename from doc/v3/api_samples/servers/v2.9/servers-list-resp.json rename to doc/api_samples/servers/v2.9/servers-list-resp.json diff --git a/doc/v3/api_samples/servers_v21/server-post-req.json b/doc/api_samples/servers_v21/server-post-req.json similarity index 100% rename from doc/v3/api_samples/servers_v21/server-post-req.json rename to doc/api_samples/servers_v21/server-post-req.json diff --git a/doc/v3/api_samples/servers_v21/server-post-resp.json b/doc/api_samples/servers_v21/server-post-resp.json similarity index 100% rename from doc/v3/api_samples/servers_v21/server-post-resp.json rename to doc/api_samples/servers_v21/server-post-resp.json diff --git a/nova/tests/functional/v3/api_paste_fixture.py b/nova/tests/functional/api_paste_fixture.py similarity index 100% rename from nova/tests/functional/v3/api_paste_fixture.py rename to nova/tests/functional/api_paste_fixture.py diff --git a/nova/tests/functional/v3/api_sample_base.py b/nova/tests/functional/api_sample_tests/api_sample_base.py similarity index 98% rename from nova/tests/functional/v3/api_sample_base.py rename to nova/tests/functional/api_sample_tests/api_sample_base.py index b26e8fb0dee3..88adad69d119 100644 --- a/nova/tests/functional/v3/api_sample_base.py +++ b/nova/tests/functional/api_sample_tests/api_sample_base.py @@ -22,8 +22,8 @@ from nova.api import openstack from nova.api.openstack import API_V3_CORE_EXTENSIONS # noqa from nova.api.openstack import compute from nova import test +from nova.tests.functional import api_paste_fixture from nova.tests.functional import api_samples_test_base -from nova.tests.functional.v3 import api_paste_fixture from nova.tests.unit import fake_network from nova.tests.unit import fake_utils @@ -107,7 +107,7 @@ class ApiSampleTestBaseV3(testscenarios.WithScenarios, def _get_sample(cls, name, api_version=None): dirname = os.path.dirname(os.path.abspath(__file__)) dirname = os.path.normpath(os.path.join(dirname, - "../../../../doc/v3")) + "../../../../doc")) return cls._get_sample_path(name, dirname, api_version=api_version) @classmethod diff --git a/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp-v2.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp-v2.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp-v2.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp-v2.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-action-confirm-resize.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-confirm-resize.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/server-action-confirm-resize.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-confirm-resize.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-action-create-image.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-create-image.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/server-action-create-image.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-create-image.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-action-reboot.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-reboot.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/server-action-reboot.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-reboot.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/server-action-rebuild-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-action-rebuild.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/server-action-rebuild.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-action-resize.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-resize.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/server-action-resize.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-resize.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-action-revert-resize.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-revert-resize.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/server-action-revert-resize.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-revert-resize.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/servers-details-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-details-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/all_extensions/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/all_extensions/servers-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/consoles/consoles-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/consoles/consoles-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/consoles/consoles-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/consoles/consoles-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/consoles/consoles-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/consoles/consoles-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/consoles/consoles-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/consoles/consoles-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/consoles/consoles-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/consoles/consoles-list-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/consoles/consoles-list-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/consoles/consoles-list-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/extension-info/extensions-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/extension-info/extensions-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/extension-info/extensions-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/extension-info/extensions-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-add-tenant-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-add-tenant-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-access/flavor-access-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-access/flavor-access-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-access/flavor-access-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-access/flavor-access-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-access/flavor-access-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-access/flavor-access-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-access/flavor-access-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-remove-tenant-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-remove-tenant-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-show-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-access/flavor-access-show-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-show-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-update-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-manage/flavor-create-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-manage/flavor-create-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavors/flavor-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavors/flavor-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavors/flavors-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavors/flavors-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/flavors/flavors-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/flavors/flavors-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/image-size/image-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/image-size/image-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/image-size/image-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/image-size/image-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/image-size/images-details-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/image-size/images-details-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/image-size/images-details-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/image-size/images-details-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/image-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/image-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/image-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/image-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/image-meta-key-get.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/image-meta-key-get.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/image-meta-key-get.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/image-meta-key-get.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/image-meta-key-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/image-meta-key-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/image-meta-key-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/image-meta-key-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/image-meta-key-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/image-meta-key-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/image-meta-key-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/image-meta-key-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/image-metadata-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/image-metadata-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/image-metadata-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/image-metadata-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/image-metadata-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/image-metadata-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/image-metadata-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/image-metadata-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/image-metadata-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/image-metadata-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/image-metadata-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/image-metadata-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/image-metadata-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/image-metadata-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/image-metadata-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/image-metadata-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/image-metadata-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/image-metadata-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/image-metadata-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/image-metadata-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/images-details-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/images-details-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/images-details-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/images-details-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/images/images-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/images-list-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/images/images-list-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/images/images-list-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/keypairs-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/keypairs-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/keypairs-import-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/keypairs-import-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/keypairs-import-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/keypairs-import-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/keypairs-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/keypairs-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/keypairs-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-import-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-import-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-import-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-import-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.10/keypairs-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-import-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-import-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-import-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-import-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/keypairs/v2.2/keypairs-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-access-ips/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-access-ips/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-access-ips/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-access-ips/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-access-ips/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-access-ips/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-access-ips/server-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-access-ips/server-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-access-ips/server-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-access-ips/server-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-access-ips/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-access-ips/servers-details-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-details-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-access-ips/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-access-ips/servers-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-admin-password/admin-password-change-password.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-admin-password/admin-password-change-password.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-admin-password/admin-password-change-password.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-admin-password/admin-password-change-password.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-agents/agent-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-agents/agent-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-agents/agent-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-agents/agent-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-agents/agent-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-agents/agent-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-agents/agent-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-agents/agent-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-agents/agent-update-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-agents/agent-update-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-agents/agent-update-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-agents/agent-update-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-agents/agent-update-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-agents/agent-update-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-agents/agent-update-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-agents/agent-update-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-agents/agents-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-agents/agents-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-agents/agents-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-agents/agents-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-update-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-update-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-update-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-update-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-attach-interfaces/attach-interfaces-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-availability-zone/availability-zone-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-availability-zone/availability-zone-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-availability-zone/availability-zone-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-availability-zone/availability-zone-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-cells/cells-capacities-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-cells/cells-capacities-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-cells/cells-capacities-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-cells/cells-capacities-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-cells/cells-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-cells/cells-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-cells/cells-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-cells/cells-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-cells/cells-list-empty-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-cells/cells-list-empty-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-cells/cells-list-empty-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-cells/cells-list-empty-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-cells/cells-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-cells/cells-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-cells/cells-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-cells/cells-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-certificates/certificate-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-certificates/certificate-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-certificates/certificate-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-certificates/certificate-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-certificates/certificate-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-certificates/certificate-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-certificates/certificate-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-certificates/certificate-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-certificates/certificate-get-root-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-certificates/certificate-get-root-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-certificates/certificate-get-root-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-certificates/certificate-get-root-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-cloudpipe/cloud-pipe-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-cloudpipe/cloud-pipe-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-cloudpipe/cloud-pipe-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-cloudpipe/cloud-pipe-update-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-config-drive/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-config-drive/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-config-drive/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-config-drive/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-console-auth-tokens/get-rdp-console-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-console-output/console-output-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-console-output/console-output-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-console-output/console-output-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-console-output/console-output-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-console-output/console-output-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-console-output/console-output-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-console-output/console-output-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-console-output/console-output-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-create-backup/create-backup-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-create-backup/create-backup-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-create-backup/create-backup-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-create-backup/create-backup-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-deferred-delete/force-delete-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-deferred-delete/force-delete-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-deferred-delete/force-delete-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-deferred-delete/force-delete-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-deferred-delete/restore-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-deferred-delete/restore-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-deferred-delete/restore-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-deferred-delete/restore-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/image-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/image-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/image-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/image-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/image-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/image-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/image-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/image-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/list-servers-detail-get.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/list-servers-detail-get.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-resize-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-resize-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/server-resize-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-resize-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-update-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-update-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/server-update-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-update-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-update-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-update-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-evacuate/server-evacuate-find-host-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-evacuate/server-evacuate-find-host-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-evacuate/server-evacuate-find-host-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-evacuate/server-evacuate-find-host-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-evacuate/server-evacuate-find-host-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-evacuate/server-evacuate-find-host-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-evacuate/server-evacuate-find-host-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-evacuate/server-evacuate-find-host-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-evacuate/server-evacuate-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-evacuate/server-evacuate-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-evacuate/server-evacuate-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-evacuate/server-evacuate-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-evacuate/server-evacuate-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-evacuate/server-evacuate-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-evacuate/server-evacuate-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-evacuate/server-evacuate-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-extended-status/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-extended-status/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-extended-status/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-extended-status/servers-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/servers-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-fixed-ips/fixedip-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-fixed-ips/fixedip-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-fixed-ips/fixedip-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-fixed-ips/fixedip-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-fixed-ips/fixedips-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-fixed-ips/v2.4/fixedip-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-fixed-ips/v2.4/fixedip-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-fixed-ips/v2.4/fixedip-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-fixed-ips/v2.4/fixedip-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ip-pools/floatingippools-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-fping/fping-get-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-details-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-fping/fping-get-details-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-details-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-fping/fping-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-fping/fping-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hosts/host-get-reboot.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-get-reboot.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hosts/host-get-reboot.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-get-reboot.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hosts/host-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hosts/host-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hosts/host-get-shutdown.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-get-shutdown.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hosts/host-get-shutdown.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-get-shutdown.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hosts/host-get-startup.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-get-startup.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hosts/host-get-startup.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-get-startup.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hosts/host-put-maintenance-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-put-maintenance-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hosts/host-put-maintenance-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-put-maintenance-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hosts/host-put-maintenance-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-put-maintenance-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hosts/host-put-maintenance-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hosts/host-put-maintenance-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hosts/hosts-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hosts/hosts-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-search-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-statistics-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-uptime-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-with-servers-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-with-servers-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-with-servers-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-with-servers-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-without-servers-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-without-servers-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-hypervisors/hypervisors-without-servers-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-without-servers-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-instance-actions/instance-action-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/instance-action-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-instance-actions/instance-action-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/instance-action-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/instance-actions-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-instance-actions/instance-instance-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/instance-instance-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-instance-actions/instance-instance-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/instance-instance-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-index-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-index-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-index-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-index-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-show-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-show-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-show-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-instance-usage-audit-log/inst-usage-audit-log-show-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-lock-server/lock-server.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-lock-server/lock-server.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-lock-server/lock-server.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-lock-server/lock-server.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-lock-server/unlock-server.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-lock-server/unlock-server.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-lock-server/unlock-server.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-lock-server/unlock-server.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-migrate-server/live-migrate-server.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-migrate-server/live-migrate-server.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-migrate-server/live-migrate-server.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-migrate-server/live-migrate-server.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-migrate-server/migrate-server.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-migrate-server/migrate-server.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-migrate-server/migrate-server.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-migrate-server/migrate-server.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-migrations/migrations-get.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-migrations/migrations-get.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-migrations/migrations-get.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-migrations/migrations-get.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-multinic/multinic-add-fixed-ip-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multinic/multinic-add-fixed-ip-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-multinic/multinic-add-fixed-ip-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-multinic/multinic-add-fixed-ip-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-multinic/multinic-remove-fixed-ip-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multinic/multinic-remove-fixed-ip-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-multinic/multinic-remove-fixed-ip-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-multinic/multinic-remove-fixed-ip-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-networks-associate/network-associate-host-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-networks-associate/network-associate-host-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-networks-associate/network-associate-host-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-networks-associate/network-associate-host-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-networks-associate/network-disassociate-host-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-networks-associate/network-disassociate-project-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-networks-associate/network-disassociate-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-networks-associate/network-disassociate-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-networks-associate/network-disassociate-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-networks-associate/network-disassociate-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-networks/network-add-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-networks/network-add-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-networks/network-add-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-networks/network-add-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-networks/network-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-networks/network-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-networks/network-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-networks/network-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-networks/network-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-networks/network-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-networks/network-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-networks/network-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-networks/network-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-networks/network-show-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-networks/network-show-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-networks/network-show-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-networks/networks-disassociate-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-networks/networks-disassociate-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-networks/networks-disassociate-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-networks/networks-disassociate-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-networks/networks-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-networks/networks-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-networks/networks-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-networks/networks-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-pause-server/pause-server.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pause-server/pause-server.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-pause-server/pause-server.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-pause-server/pause-server.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-pause-server/unpause-server.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pause-server/unpause-server.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-pause-server/unpause-server.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-pause-server/unpause-server.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-pci/hypervisors-pci-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-pci/hypervisors-pci-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pci/hypervisors-pci-show-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-pci/hypervisors-pci-show-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-pci/hypervisors-pci-show-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-pci/pci-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pci/pci-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-pci/pci-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-pci/pci-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-pci/pci-index-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pci/pci-index-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-pci/pci-index-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-pci/pci-index-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-pci/pci-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pci/pci-show-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-pci/pci-show-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-pci/pci-show-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-pci/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pci/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-pci/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-pci/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-pci/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pci/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-pci/servers-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-pci/servers-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-personality/server-action-rebuild-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-personality/server-action-rebuild-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-personality/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-personality/server-action-rebuild-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-personality/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-personality/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-personality/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-personality/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-sets/quotas-update-force-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-force-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-sets/quotas-update-force-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-force-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-sets/quotas-update-force-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-force-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-sets/quotas-update-force-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-force-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-sets/quotas-update-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-sets/quotas-update-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-sets/user-quotas-update-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-update-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-sets/user-quotas-update-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-update-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/get-rdp-console-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-rdp-console-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/get-rdp-console-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-rdp-console-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/get-rdp-console-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-rdp-console-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/get-rdp-console-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-rdp-console-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/get-serial-console-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-serial-console-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/get-serial-console-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-serial-console-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/get-serial-console-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-serial-console-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/get-serial-console-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-serial-console-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/get-spice-console-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-spice-console-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/get-spice-console-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-spice-console-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/get-spice-console-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-spice-console-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/get-spice-console-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-spice-console-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/get-vnc-console-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-vnc-console-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/get-vnc-console-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-vnc-console-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/get-vnc-console-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-vnc-console-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/get-vnc-console-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/get-vnc-console-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/v2.6/create-vnc-console-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/v2.6/create-vnc-console-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/v2.6/create-vnc-console-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/v2.6/create-vnc-console-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/v2.8/create-mks-console-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/v2.8/create-mks-console-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/v2.8/create-mks-console-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/v2.8/create-mks-console-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-remote-consoles/v2.8/create-mks-console-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/v2.8/create-mks-console-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-remote-consoles/v2.8/create-mks-console-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-remote-consoles/v2.8/create-mks-console-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-rescue/server-rescue-req-with-image-ref.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-rescue-req-with-image-ref.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-rescue/server-rescue-req-with-image-ref.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-rescue-req-with-image-ref.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-rescue/server-rescue-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-rescue-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-rescue/server-rescue-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-rescue-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-rescue/server-rescue.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-rescue.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-rescue/server-rescue.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-rescue.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-rescue/server-unrescue-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-unrescue-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-rescue/server-unrescue-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-unrescue-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/security-group-add-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-group-add-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/security-group-add-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-group-add-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/security-group-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-group-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/security-group-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-group-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/security-group-remove-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-group-remove-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/security-group-remove-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-group-remove-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/security-groups-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/security-groups-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/security-groups-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/security-groups-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-security-groups/servers-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-server-diagnostics/server-diagnostics-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-server-external-events/event-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-external-events/event-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-server-external-events/event-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-server-external-events/event-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-server-external-events/event-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-external-events/event-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-server-external-events/event-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-server-external-events/event-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-server-groups/server-groups-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/server-groups-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-server-groups/server-groups-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-server-groups/server-groups-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-server-groups/server-groups-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/server-groups-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-server-groups/server-groups-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-server-groups/server-groups-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-server-groups/server-groups-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/server-groups-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-server-groups/server-groups-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-server-groups/server-groups-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-server-groups/server-groups-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/server-groups-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-server-groups/server-groups-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-server-groups/server-groups-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-server-password/get-password-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-password/get-password-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-server-password/get-password-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-server-password/get-password-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-server-usage/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-server-usage/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-server-usage/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-server-usage/servers-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/service-disable-log-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/service-disable-log-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/service-disable-log-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/service-disable-log-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/service-disable-log-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/service-disable-log-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/service-disable-log-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/service-disable-log-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/service-disable-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/service-disable-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/service-disable-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/service-disable-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/service-disable-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/service-disable-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/service-disable-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/service-disable-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/service-enable-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/service-enable-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/service-enable-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/service-enable-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/service-enable-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/service-enable-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/service-enable-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/service-enable-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/services-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/services-list-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/services-list-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/services-list-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/v2.11/service-disable-log-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-disable-log-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/v2.11/service-disable-log-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-disable-log-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/v2.11/service-disable-log-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-disable-log-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/v2.11/service-disable-log-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-disable-log-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/v2.11/service-disable-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-disable-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/v2.11/service-disable-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-disable-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/v2.11/service-disable-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-disable-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/v2.11/service-disable-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-disable-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/v2.11/service-enable-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-enable-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/v2.11/service-enable-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-enable-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/v2.11/service-enable-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-enable-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/v2.11/service-enable-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-enable-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/v2.11/service-force-down-put-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-force-down-put-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/v2.11/service-force-down-put-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-force-down-put-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/v2.11/service-force-down-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-force-down-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/v2.11/service-force-down-put-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/service-force-down-put-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-services/v2.11/services-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/services-list-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-services/v2.11/services-list-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-services/v2.11/services-list-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-shelve/os-shelve-offload.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-shelve/os-shelve-offload.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-shelve/os-shelve-offload.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-shelve/os-shelve-offload.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-shelve/os-shelve.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-shelve/os-shelve.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-shelve/os-shelve.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-shelve/os-shelve.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-shelve/os-unshelve.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-shelve/os-unshelve.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-shelve/os-unshelve.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-shelve/os-unshelve.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-suspend-server/server-resume.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-suspend-server/server-resume.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-suspend-server/server-resume.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-suspend-server/server-resume.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-suspend-server/server-suspend.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-suspend-server/server-suspend.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-suspend-server/server-suspend.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-suspend-server/server-suspend.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-tenant-networks/networks-list-res.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-tenant-networks/networks-list-res.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-tenant-networks/networks-list-res.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-tenant-networks/networks-list-res.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-tenant-networks/networks-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-tenant-networks/networks-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-tenant-networks/networks-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-tenant-networks/networks-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-tenant-networks/networks-post-res.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-tenant-networks/networks-post-res.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-tenant-networks/networks-post-res.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-tenant-networks/networks-post-res.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-used-limits/usedlimits-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-used-limits/usedlimits-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-used-limits/usedlimits-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-used-limits/usedlimits-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-user-data/userdata-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-user-data/userdata-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-user-data/userdata-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-user-data/userdata-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/attach-volume-to-server-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/attach-volume-to-server-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/attach-volume-to-server-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/attach-volume-to-server-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/attach-volume-to-server-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/attach-volume-to-server-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/attach-volume-to-server-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/attach-volume-to-server-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/list-volume-attachments-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/list-volume-attachments-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/list-volume-attachments-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/list-volume-attachments-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/os-volumes-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/os-volumes-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/os-volumes-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/os-volumes-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/os-volumes-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/os-volumes-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/os-volumes-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/os-volumes-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/os-volumes-index-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/os-volumes-index-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/os-volumes-index-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/os-volumes-index-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/os-volumes-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/os-volumes-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/os-volumes-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/os-volumes-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/os-volumes-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/os-volumes-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/os-volumes-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/os-volumes-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/snapshot-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/snapshot-create-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/snapshot-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/snapshot-create-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/snapshot-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/snapshot-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/snapshot-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/snapshot-create-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/snapshots-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/snapshots-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/snapshots-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/snapshots-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/snapshots-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/snapshots-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/snapshots-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/snapshots-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/snapshots-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/snapshots-show-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/snapshots-show-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/snapshots-show-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/update-volume-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/update-volume-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/update-volume-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/update-volume-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-volumes/volume-attachment-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-volumes/volume-attachment-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-volumes/volume-attachment-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-volumes/volume-attachment-detail-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/server-ips/server-ips-network-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/server-ips/server-ips-network-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/server-ips/server-ips-network-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/server-ips/server-ips-network-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/server-ips/server-ips-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/server-ips/server-ips-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/server-ips/server-ips-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/server-ips/server-ips-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/server-metadata/server-metadata-all-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/server-metadata/server-metadata-all-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/server-metadata/server-metadata-all-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/server-metadata/server-metadata-all-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/server-metadata/server-metadata-all-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/server-metadata/server-metadata-all-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/server-metadata/server-metadata-all-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/server-metadata/server-metadata-all-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/server-metadata/server-metadata-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/server-metadata/server-metadata-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/server-metadata/server-metadata-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/server-metadata/server-metadata-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/server-metadata/server-metadata-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/server-metadata/server-metadata-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/server-metadata/server-metadata-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/server-metadata/server-metadata-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers-sort/server-sort-keys-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers-sort/server-sort-keys-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers-sort/server-sort-keys-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers-sort/server-sort-keys-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-action-confirm-resize.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-confirm-resize.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-action-confirm-resize.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-action-confirm-resize.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-action-create-image.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-create-image.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-action-create-image.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-action-create-image.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-action-reboot.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-reboot.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-action-reboot.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-action-reboot.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-action-rebuild-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-action-rebuild.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-action-rebuild.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-action-resize.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-resize.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-action-resize.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-action-resize.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-action-revert-resize.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-revert-resize.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-action-revert-resize.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-action-revert-resize.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-action-start.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-start.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-action-start.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-action-start.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-action-stop.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-stop.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-action-stop.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-action-stop.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/server-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/servers-details-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/servers-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/v2.9/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/v2.9/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/v2.9/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/v2.9/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/v2.9/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/v2.9/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/v2.9/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/v2.9/servers-details-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers/v2.9/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers/v2.9/servers-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers_v21/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers_v21/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers_v21/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers_v21/server-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/servers_v21/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers_v21/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/servers_v21/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers_v21/server-post-resp.json.tpl diff --git a/nova/tests/functional/v3/test_access_ips.py b/nova/tests/functional/api_sample_tests/test_access_ips.py similarity index 98% rename from nova/tests/functional/v3/test_access_ips.py rename to nova/tests/functional/api_sample_tests/test_access_ips.py index 7a835d3bce82..2adec0b23dd4 100644 --- a/nova/tests/functional/v3/test_access_ips.py +++ b/nova/tests/functional/api_sample_tests/test_access_ips.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_admin_actions.py b/nova/tests/functional/api_sample_tests/test_admin_actions.py similarity index 97% rename from nova/tests/functional/v3/test_admin_actions.py rename to nova/tests/functional/api_sample_tests/test_admin_actions.py index 10b067743abf..04fd8ebc3111 100644 --- a/nova/tests/functional/v3/test_admin_actions.py +++ b/nova/tests/functional/api_sample_tests/test_admin_actions.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_admin_password.py b/nova/tests/functional/api_sample_tests/test_admin_password.py similarity index 95% rename from nova/tests/functional/v3/test_admin_password.py rename to nova/tests/functional/api_sample_tests/test_admin_password.py index 1465a6fbe2d0..95ba5d54b537 100644 --- a/nova/tests/functional/v3/test_admin_password.py +++ b/nova/tests/functional/api_sample_tests/test_admin_password.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_agents.py b/nova/tests/functional/api_sample_tests/test_agents.py similarity index 98% rename from nova/tests/functional/v3/test_agents.py rename to nova/tests/functional/api_sample_tests/test_agents.py index daaef53819e8..bf079b6c3ae6 100644 --- a/nova/tests/functional/v3/test_agents.py +++ b/nova/tests/functional/api_sample_tests/test_agents.py @@ -17,7 +17,7 @@ from oslo_config import cfg from nova import db from nova.db.sqlalchemy import models -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_aggregates.py b/nova/tests/functional/api_sample_tests/test_aggregates.py similarity index 98% rename from nova/tests/functional/v3/test_aggregates.py rename to nova/tests/functional/api_sample_tests/test_aggregates.py index dc102c7e0248..b0187f6b22df 100644 --- a/nova/tests/functional/v3/test_aggregates.py +++ b/nova/tests/functional/api_sample_tests/test_aggregates.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_assisted_volume_snapshots.py b/nova/tests/functional/api_sample_tests/test_assisted_volume_snapshots.py similarity index 97% rename from nova/tests/functional/v3/test_assisted_volume_snapshots.py rename to nova/tests/functional/api_sample_tests/test_assisted_volume_snapshots.py index 6cdbae7963d8..2eaaa182781b 100644 --- a/nova/tests/functional/v3/test_assisted_volume_snapshots.py +++ b/nova/tests/functional/api_sample_tests/test_assisted_volume_snapshots.py @@ -15,7 +15,7 @@ from oslo_config import cfg from nova.compute import api as compute_api -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit.api.openstack import fakes CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_attach_interfaces.py b/nova/tests/functional/api_sample_tests/test_attach_interfaces.py similarity index 99% rename from nova/tests/functional/v3/test_attach_interfaces.py rename to nova/tests/functional/api_sample_tests/test_attach_interfaces.py index eccc2c0f0543..95a49c01a7ba 100644 --- a/nova/tests/functional/v3/test_attach_interfaces.py +++ b/nova/tests/functional/api_sample_tests/test_attach_interfaces.py @@ -18,7 +18,7 @@ from oslo_config import cfg from nova.compute import api as compute_api from nova import exception from nova.network import api as network_api -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit import fake_network_cache_model CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_availability_zone.py b/nova/tests/functional/api_sample_tests/test_availability_zone.py similarity index 97% rename from nova/tests/functional/v3/test_availability_zone.py rename to nova/tests/functional/api_sample_tests/test_availability_zone.py index 9ae59aa35910..d0ff53d72dd1 100644 --- a/nova/tests/functional/v3/test_availability_zone.py +++ b/nova/tests/functional/api_sample_tests/test_availability_zone.py @@ -14,7 +14,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('manager', 'nova.cells.opts', group='cells') diff --git a/nova/tests/functional/v3/test_baremetal_nodes.py b/nova/tests/functional/api_sample_tests/test_baremetal_nodes.py similarity index 98% rename from nova/tests/functional/v3/test_baremetal_nodes.py rename to nova/tests/functional/api_sample_tests/test_baremetal_nodes.py index 417f49919d78..32a12d97ba8b 100644 --- a/nova/tests/functional/v3/test_baremetal_nodes.py +++ b/nova/tests/functional/api_sample_tests/test_baremetal_nodes.py @@ -16,7 +16,7 @@ import mock from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_cells.py b/nova/tests/functional/api_sample_tests/test_cells.py similarity index 98% rename from nova/tests/functional/v3/test_cells.py rename to nova/tests/functional/api_sample_tests/test_cells.py index 4ac7db85a023..bb4f1dd8b2fc 100644 --- a/nova/tests/functional/v3/test_cells.py +++ b/nova/tests/functional/api_sample_tests/test_cells.py @@ -21,7 +21,7 @@ from nova.cells import state from nova import db from nova.db.sqlalchemy import models from nova import exception -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_certificates.py b/nova/tests/functional/api_sample_tests/test_certificates.py similarity index 96% rename from nova/tests/functional/v3/test_certificates.py rename to nova/tests/functional/api_sample_tests/test_certificates.py index 9709337b95ab..596f76e08ddb 100644 --- a/nova/tests/functional/v3/test_certificates.py +++ b/nova/tests/functional/api_sample_tests/test_certificates.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_cloudpipe.py b/nova/tests/functional/api_sample_tests/test_cloudpipe.py similarity index 98% rename from nova/tests/functional/v3/test_cloudpipe.py rename to nova/tests/functional/api_sample_tests/test_cloudpipe.py index 149c0954777b..328a214de1cf 100644 --- a/nova/tests/functional/v3/test_cloudpipe.py +++ b/nova/tests/functional/api_sample_tests/test_cloudpipe.py @@ -18,7 +18,7 @@ from oslo_config import cfg from nova.cloudpipe import pipelib from nova.network import api as network_api -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit.image import fake diff --git a/nova/tests/functional/v3/test_config_drive.py b/nova/tests/functional/api_sample_tests/test_config_drive.py similarity index 98% rename from nova/tests/functional/v3/test_config_drive.py rename to nova/tests/functional/api_sample_tests/test_config_drive.py index fcb5d1e339a9..4ec10d333b8d 100644 --- a/nova/tests/functional/v3/test_config_drive.py +++ b/nova/tests/functional/api_sample_tests/test_config_drive.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit.api.openstack import fakes from nova.tests.unit.image import fake diff --git a/nova/tests/functional/v3/test_console_auth_tokens.py b/nova/tests/functional/api_sample_tests/test_console_auth_tokens.py similarity index 97% rename from nova/tests/functional/v3/test_console_auth_tokens.py rename to nova/tests/functional/api_sample_tests/test_console_auth_tokens.py index ba4d9914e8d1..4b097c34cad0 100644 --- a/nova/tests/functional/v3/test_console_auth_tokens.py +++ b/nova/tests/functional/api_sample_tests/test_console_auth_tokens.py @@ -17,7 +17,7 @@ import re from oslo_config import cfg from oslo_serialization import jsonutils -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_console_output.py b/nova/tests/functional/api_sample_tests/test_console_output.py similarity index 96% rename from nova/tests/functional/v3/test_console_output.py rename to nova/tests/functional/api_sample_tests/test_console_output.py index c9e41a4d5ef7..cc8884c34b4b 100644 --- a/nova/tests/functional/v3/test_console_output.py +++ b/nova/tests/functional/api_sample_tests/test_console_output.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_consoles.py b/nova/tests/functional/api_sample_tests/test_consoles.py similarity index 97% rename from nova/tests/functional/v3/test_consoles.py rename to nova/tests/functional/api_sample_tests/test_consoles.py index 067e00e4f265..9aae44c3c0e3 100644 --- a/nova/tests/functional/v3/test_consoles.py +++ b/nova/tests/functional/api_sample_tests/test_consoles.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers class ConsolesSamplesJsonTest(test_servers.ServersSampleBase): diff --git a/nova/tests/functional/v3/test_create_backup.py b/nova/tests/functional/api_sample_tests/test_create_backup.py similarity index 97% rename from nova/tests/functional/v3/test_create_backup.py rename to nova/tests/functional/api_sample_tests/test_create_backup.py index 2a4e8f8afc45..d8be767b1c7e 100644 --- a/nova/tests/functional/v3/test_create_backup.py +++ b/nova/tests/functional/api_sample_tests/test_create_backup.py @@ -17,7 +17,7 @@ from oslo_config import cfg import mock -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_deferred_delete.py b/nova/tests/functional/api_sample_tests/test_deferred_delete.py similarity index 97% rename from nova/tests/functional/v3/test_deferred_delete.py rename to nova/tests/functional/api_sample_tests/test_deferred_delete.py index d68cbd1ff995..b150be48091e 100644 --- a/nova/tests/functional/v3/test_deferred_delete.py +++ b/nova/tests/functional/api_sample_tests/test_deferred_delete.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_disk_config.py b/nova/tests/functional/api_sample_tests/test_disk_config.py similarity index 98% rename from nova/tests/functional/v3/test_disk_config.py rename to nova/tests/functional/api_sample_tests/test_disk_config.py index f07c95824ecb..e481d268a775 100644 --- a/nova/tests/functional/v3/test_disk_config.py +++ b/nova/tests/functional/api_sample_tests/test_disk_config.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_evacuate.py b/nova/tests/functional/api_sample_tests/test_evacuate.py similarity index 98% rename from nova/tests/functional/v3/test_evacuate.py rename to nova/tests/functional/api_sample_tests/test_evacuate.py index 5dd7b404816a..360c1faed143 100644 --- a/nova/tests/functional/v3/test_evacuate.py +++ b/nova/tests/functional/api_sample_tests/test_evacuate.py @@ -19,7 +19,7 @@ from oslo_config import cfg 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.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_extended_availability_zone.py b/nova/tests/functional/api_sample_tests/test_extended_availability_zone.py similarity index 97% rename from nova/tests/functional/v3/test_extended_availability_zone.py rename to nova/tests/functional/api_sample_tests/test_extended_availability_zone.py index fa00d7fe8a35..5eedda6965b5 100644 --- a/nova/tests/functional/v3/test_extended_availability_zone.py +++ b/nova/tests/functional/api_sample_tests/test_extended_availability_zone.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_extended_server_attributes.py b/nova/tests/functional/api_sample_tests/test_extended_server_attributes.py similarity index 97% rename from nova/tests/functional/v3/test_extended_server_attributes.py rename to nova/tests/functional/api_sample_tests/test_extended_server_attributes.py index 536e1813bd60..c0ab7f2cccb7 100644 --- a/nova/tests/functional/v3/test_extended_server_attributes.py +++ b/nova/tests/functional/api_sample_tests/test_extended_server_attributes.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_extended_status.py b/nova/tests/functional/api_sample_tests/test_extended_status.py similarity index 97% rename from nova/tests/functional/v3/test_extended_status.py rename to nova/tests/functional/api_sample_tests/test_extended_status.py index 09d48051bb5a..32abce916ba6 100644 --- a/nova/tests/functional/v3/test_extended_status.py +++ b/nova/tests/functional/api_sample_tests/test_extended_status.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_extended_volumes.py b/nova/tests/functional/api_sample_tests/test_extended_volumes.py similarity index 98% rename from nova/tests/functional/v3/test_extended_volumes.py rename to nova/tests/functional/api_sample_tests/test_extended_volumes.py index 7a49ef677460..d50ea07b7690 100644 --- a/nova/tests/functional/v3/test_extended_volumes.py +++ b/nova/tests/functional/api_sample_tests/test_extended_volumes.py @@ -17,7 +17,7 @@ from oslo_config import cfg from nova.compute import api as compute_api from nova import db -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit.api.openstack import fakes from nova.tests.unit import fake_block_device from nova.tests.unit import fake_instance diff --git a/nova/tests/functional/v3/test_extension_info.py b/nova/tests/functional/api_sample_tests/test_extension_info.py similarity index 97% rename from nova/tests/functional/v3/test_extension_info.py rename to nova/tests/functional/api_sample_tests/test_extension_info.py index 3c6ced06f057..5e1b0e4851e5 100644 --- a/nova/tests/functional/v3/test_extension_info.py +++ b/nova/tests/functional/api_sample_tests/test_extension_info.py @@ -17,7 +17,7 @@ import mock from oslo_config import cfg from nova.api.openstack import extensions as api_extensions -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_fixed_ips.py b/nova/tests/functional/api_sample_tests/test_fixed_ips.py similarity index 98% rename from nova/tests/functional/v3/test_fixed_ips.py rename to nova/tests/functional/api_sample_tests/test_fixed_ips.py index 5aaa1927afd0..e95990459c86 100644 --- a/nova/tests/functional/v3/test_fixed_ips.py +++ b/nova/tests/functional/api_sample_tests/test_fixed_ips.py @@ -16,7 +16,7 @@ from oslo_config import cfg from nova import db from nova import exception -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit.objects import test_network from nova.tests.unit import utils as test_utils diff --git a/nova/tests/functional/v3/test_flavor_access.py b/nova/tests/functional/api_sample_tests/test_flavor_access.py similarity index 98% rename from nova/tests/functional/v3/test_flavor_access.py rename to nova/tests/functional/api_sample_tests/test_flavor_access.py index 0a23a3c8ca10..b86ce3620559 100644 --- a/nova/tests/functional/v3/test_flavor_access.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_access.py @@ -14,7 +14,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_flavor_extraspecs.py b/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py similarity index 97% rename from nova/tests/functional/v3/test_flavor_extraspecs.py rename to nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py index e6368d1999d3..78dd0fb2739d 100644 --- a/nova/tests/functional/v3/test_flavor_extraspecs.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_flavor_manage.py b/nova/tests/functional/api_sample_tests/test_flavor_manage.py similarity index 97% rename from nova/tests/functional/v3/test_flavor_manage.py rename to nova/tests/functional/api_sample_tests/test_flavor_manage.py index 5cf06c49d1b0..b22551b743a8 100644 --- a/nova/tests/functional/v3/test_flavor_manage.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_manage.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_flavor_rxtx.py b/nova/tests/functional/api_sample_tests/test_flavor_rxtx.py similarity index 97% rename from nova/tests/functional/v3/test_flavor_rxtx.py rename to nova/tests/functional/api_sample_tests/test_flavor_rxtx.py index 3cc755109735..4b43bb66484f 100644 --- a/nova/tests/functional/v3/test_flavor_rxtx.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_rxtx.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_flavors.py b/nova/tests/functional/api_sample_tests/test_flavors.py similarity index 97% rename from nova/tests/functional/v3/test_flavors.py rename to nova/tests/functional/api_sample_tests/test_flavors.py index 26fb1c29fb1d..f75c01e0391c 100644 --- a/nova/tests/functional/v3/test_flavors.py +++ b/nova/tests/functional/api_sample_tests/test_flavors.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_floating_ip_dns.py b/nova/tests/functional/api_sample_tests/test_floating_ip_dns.py similarity index 98% rename from nova/tests/functional/v3/test_floating_ip_dns.py rename to nova/tests/functional/api_sample_tests/test_floating_ip_dns.py index 2bb952abca0c..ba8830f28f89 100644 --- a/nova/tests/functional/v3/test_floating_ip_dns.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ip_dns.py @@ -14,7 +14,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_floating_ip_pools.py b/nova/tests/functional/api_sample_tests/test_floating_ip_pools.py similarity index 96% rename from nova/tests/functional/v3/test_floating_ip_pools.py rename to nova/tests/functional/api_sample_tests/test_floating_ip_pools.py index d714353d62c3..648cb5d771f2 100644 --- a/nova/tests/functional/v3/test_floating_ip_pools.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ip_pools.py @@ -15,7 +15,7 @@ from oslo_config import cfg from nova.network import api as network_api -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_floating_ips.py b/nova/tests/functional/api_sample_tests/test_floating_ips.py similarity index 98% rename from nova/tests/functional/v3/test_floating_ips.py rename to nova/tests/functional/api_sample_tests/test_floating_ips.py index ac726f208499..c2627c6e1948 100644 --- a/nova/tests/functional/v3/test_floating_ips.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ips.py @@ -16,7 +16,7 @@ from oslo_config import cfg from nova import context -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('default_floating_pool', 'nova.network.floating_ips') diff --git a/nova/tests/functional/v3/test_floating_ips_bulk.py b/nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py similarity index 98% rename from nova/tests/functional/v3/test_floating_ips_bulk.py rename to nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py index 52ac6ef75a94..ab0e7a3b4cfd 100644 --- a/nova/tests/functional/v3/test_floating_ips_bulk.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py @@ -16,7 +16,7 @@ from oslo_config import cfg from nova import context -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('default_floating_pool', 'nova.network.floating_ips') diff --git a/nova/tests/functional/v3/test_fping.py b/nova/tests/functional/api_sample_tests/test_fping.py similarity index 97% rename from nova/tests/functional/v3/test_fping.py rename to nova/tests/functional/api_sample_tests/test_fping.py index 2d625086110c..1928a207924b 100644 --- a/nova/tests/functional/v3/test_fping.py +++ b/nova/tests/functional/api_sample_tests/test_fping.py @@ -17,7 +17,7 @@ from oslo_config import cfg from nova.api.openstack.compute import fping from nova.api.openstack.compute.legacy_v2.contrib import fping as fping_v2 -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit.api.openstack.compute import test_fping from nova import utils diff --git a/nova/tests/functional/v3/test_hide_server_addresses.py b/nova/tests/functional/api_sample_tests/test_hide_server_addresses.py similarity index 96% rename from nova/tests/functional/v3/test_hide_server_addresses.py rename to nova/tests/functional/api_sample_tests/test_hide_server_addresses.py index 20f1731b59cf..8d2f57a24423 100644 --- a/nova/tests/functional/v3/test_hide_server_addresses.py +++ b/nova/tests/functional/api_sample_tests/test_hide_server_addresses.py @@ -16,7 +16,7 @@ from oslo_config import cfg from nova.compute import vm_states -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_hide_server_address_states', diff --git a/nova/tests/functional/v3/test_hosts.py b/nova/tests/functional/api_sample_tests/test_hosts.py similarity index 97% rename from nova/tests/functional/v3/test_hosts.py rename to nova/tests/functional/api_sample_tests/test_hosts.py index 89d5d27efdd8..0aed28cb5d39 100644 --- a/nova/tests/functional/v3/test_hosts.py +++ b/nova/tests/functional/api_sample_tests/test_hosts.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_hypervisors.py b/nova/tests/functional/api_sample_tests/test_hypervisors.py similarity index 99% rename from nova/tests/functional/v3/test_hypervisors.py rename to nova/tests/functional/api_sample_tests/test_hypervisors.py index b1102a9353e4..9962bdba9efc 100644 --- a/nova/tests/functional/v3/test_hypervisors.py +++ b/nova/tests/functional/api_sample_tests/test_hypervisors.py @@ -20,7 +20,7 @@ from nova.cells import utils as cells_utils from nova.compute import api as compute_api from nova.compute import cells_api as cells_api from nova import objects -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_image_size.py b/nova/tests/functional/api_sample_tests/test_image_size.py similarity index 96% rename from nova/tests/functional/v3/test_image_size.py rename to nova/tests/functional/api_sample_tests/test_image_size.py index 563ef452ce84..2c3a6e63a094 100644 --- a/nova/tests/functional/v3/test_image_size.py +++ b/nova/tests/functional/api_sample_tests/test_image_size.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_images.py b/nova/tests/functional/api_sample_tests/test_images.py similarity index 98% rename from nova/tests/functional/v3/test_images.py rename to nova/tests/functional/api_sample_tests/test_images.py index b764b7c50d13..843215e9fef9 100644 --- a/nova/tests/functional/v3/test_images.py +++ b/nova/tests/functional/api_sample_tests/test_images.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_instance_actions.py b/nova/tests/functional/api_sample_tests/test_instance_actions.py similarity index 98% rename from nova/tests/functional/v3/test_instance_actions.py rename to nova/tests/functional/api_sample_tests/test_instance_actions.py index e561368683a4..61f7e0338aa2 100644 --- a/nova/tests/functional/v3/test_instance_actions.py +++ b/nova/tests/functional/api_sample_tests/test_instance_actions.py @@ -20,7 +20,7 @@ import six from nova.compute import api as compute_api from nova import db -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit import fake_instance from nova.tests.unit import fake_server_actions from nova.tests.unit import utils as test_utils diff --git a/nova/tests/functional/v3/test_instance_usage_audit_log.py b/nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py similarity index 97% rename from nova/tests/functional/v3/test_instance_usage_audit_log.py rename to nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py index 08ccf0eb3455..8d08094022e8 100644 --- a/nova/tests/functional/v3/test_instance_usage_audit_log.py +++ b/nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py @@ -17,7 +17,7 @@ import urllib from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_keypairs.py b/nova/tests/functional/api_sample_tests/test_keypairs.py similarity index 99% rename from nova/tests/functional/v3/test_keypairs.py rename to nova/tests/functional/api_sample_tests/test_keypairs.py index c4f38523d0f8..f3ce15afc848 100644 --- a/nova/tests/functional/v3/test_keypairs.py +++ b/nova/tests/functional/api_sample_tests/test_keypairs.py @@ -18,7 +18,7 @@ import uuid from oslo_config import cfg from nova.objects import keypair as keypair_obj -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit import fake_crypto CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_lock_server.py b/nova/tests/functional/api_sample_tests/test_lock_server.py similarity index 97% rename from nova/tests/functional/v3/test_lock_server.py rename to nova/tests/functional/api_sample_tests/test_lock_server.py index 6d803047039a..f0bfbd1c4383 100644 --- a/nova/tests/functional/v3/test_lock_server.py +++ b/nova/tests/functional/api_sample_tests/test_lock_server.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_migrate_server.py b/nova/tests/functional/api_sample_tests/test_migrate_server.py similarity index 98% rename from nova/tests/functional/v3/test_migrate_server.py rename to nova/tests/functional/api_sample_tests/test_migrate_server.py index e425590abb3d..025710c39a4d 100644 --- a/nova/tests/functional/v3/test_migrate_server.py +++ b/nova/tests/functional/api_sample_tests/test_migrate_server.py @@ -18,7 +18,7 @@ from oslo_config import cfg from nova.conductor import manager as conductor_manager from nova import db -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova import utils CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_migrations.py b/nova/tests/functional/api_sample_tests/test_migrations.py similarity index 98% rename from nova/tests/functional/v3/test_migrations.py rename to nova/tests/functional/api_sample_tests/test_migrations.py index 54c24add30d8..fe6c2818e622 100644 --- a/nova/tests/functional/v3/test_migrations.py +++ b/nova/tests/functional/api_sample_tests/test_migrations.py @@ -18,7 +18,7 @@ import datetime from oslo_config import cfg from nova.compute import api as compute_api -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_multinic.py b/nova/tests/functional/api_sample_tests/test_multinic.py similarity index 97% rename from nova/tests/functional/v3/test_multinic.py rename to nova/tests/functional/api_sample_tests/test_multinic.py index bfac61e01c82..f97a18ef4c2d 100644 --- a/nova/tests/functional/v3/test_multinic.py +++ b/nova/tests/functional/api_sample_tests/test_multinic.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_multiple_create.py b/nova/tests/functional/api_sample_tests/test_multiple_create.py similarity index 97% rename from nova/tests/functional/v3/test_multiple_create.py rename to nova/tests/functional/api_sample_tests/test_multiple_create.py index bf7ca3e6d0ce..4efef8be2e14 100644 --- a/nova/tests/functional/v3/test_multiple_create.py +++ b/nova/tests/functional/api_sample_tests/test_multiple_create.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_networks.py b/nova/tests/functional/api_sample_tests/test_networks.py similarity index 98% rename from nova/tests/functional/v3/test_networks.py rename to nova/tests/functional/api_sample_tests/test_networks.py index d317834a18a0..45cf243daaea 100644 --- a/nova/tests/functional/v3/test_networks.py +++ b/nova/tests/functional/api_sample_tests/test_networks.py @@ -16,7 +16,7 @@ from oslo_config import cfg from nova.network import api as network_api -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit.api.openstack.compute import test_networks CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_networks_associate.py b/nova/tests/functional/api_sample_tests/test_networks_associate.py similarity index 98% rename from nova/tests/functional/v3/test_networks_associate.py rename to nova/tests/functional/api_sample_tests/test_networks_associate.py index 77899b8d1594..9c073dda4e1b 100644 --- a/nova/tests/functional/v3/test_networks_associate.py +++ b/nova/tests/functional/api_sample_tests/test_networks_associate.py @@ -16,7 +16,7 @@ from oslo_config import cfg from nova.network import api as network_api -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_pause_server.py b/nova/tests/functional/api_sample_tests/test_pause_server.py similarity index 97% rename from nova/tests/functional/v3/test_pause_server.py rename to nova/tests/functional/api_sample_tests/test_pause_server.py index c7b1d5f1159e..d6829de13e9b 100644 --- a/nova/tests/functional/v3/test_pause_server.py +++ b/nova/tests/functional/api_sample_tests/test_pause_server.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_pci.py b/nova/tests/functional/api_sample_tests/test_pci.py similarity index 98% rename from nova/tests/functional/v3/test_pci.py rename to nova/tests/functional/api_sample_tests/test_pci.py index 63530685ac73..b254083db99a 100644 --- a/nova/tests/functional/v3/test_pci.py +++ b/nova/tests/functional/api_sample_tests/test_pci.py @@ -22,8 +22,8 @@ from nova import db from nova import objects from nova.objects import fields from nova.objects import pci_device_pool -from nova.tests.functional.v3 import api_sample_base -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import api_sample_base +from nova.tests.functional.api_sample_tests import test_servers skip_msg = "Bug 1426241" diff --git a/nova/tests/functional/v3/test_personality.py b/nova/tests/functional/api_sample_tests/test_personality.py similarity index 96% rename from nova/tests/functional/v3/test_personality.py rename to nova/tests/functional/api_sample_tests/test_personality.py index bd3c967b3762..1042b5edeb56 100644 --- a/nova/tests/functional/v3/test_personality.py +++ b/nova/tests/functional/api_sample_tests/test_personality.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit.image import fake diff --git a/nova/tests/functional/v3/test_preserve_ephemeral_rebuild.py b/nova/tests/functional/api_sample_tests/test_preserve_ephemeral_rebuild.py similarity index 98% rename from nova/tests/functional/v3/test_preserve_ephemeral_rebuild.py rename to nova/tests/functional/api_sample_tests/test_preserve_ephemeral_rebuild.py index acdc03acdf98..1b52f6182882 100644 --- a/nova/tests/functional/v3/test_preserve_ephemeral_rebuild.py +++ b/nova/tests/functional/api_sample_tests/test_preserve_ephemeral_rebuild.py @@ -15,7 +15,7 @@ from oslo_config import cfg from nova.compute import api as compute_api -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_quota_classes.py b/nova/tests/functional/api_sample_tests/test_quota_classes.py similarity index 97% rename from nova/tests/functional/v3/test_quota_classes.py rename to nova/tests/functional/api_sample_tests/test_quota_classes.py index 89adfb0d3dce..89cf559e95aa 100644 --- a/nova/tests/functional/v3/test_quota_classes.py +++ b/nova/tests/functional/api_sample_tests/test_quota_classes.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_quota_sets.py b/nova/tests/functional/api_sample_tests/test_quota_sets.py similarity index 98% rename from nova/tests/functional/v3/test_quota_sets.py rename to nova/tests/functional/api_sample_tests/test_quota_sets.py index dcfc82926f97..d8e861d299a8 100644 --- a/nova/tests/functional/v3/test_quota_sets.py +++ b/nova/tests/functional/api_sample_tests/test_quota_sets.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_remote_consoles.py b/nova/tests/functional/api_sample_tests/test_remote_consoles.py similarity index 98% rename from nova/tests/functional/v3/test_remote_consoles.py rename to nova/tests/functional/api_sample_tests/test_remote_consoles.py index 4da22667fefa..baccdd54a8c0 100644 --- a/nova/tests/functional/v3/test_remote_consoles.py +++ b/nova/tests/functional/api_sample_tests/test_remote_consoles.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_rescue.py b/nova/tests/functional/api_sample_tests/test_rescue.py similarity index 98% rename from nova/tests/functional/v3/test_rescue.py rename to nova/tests/functional/api_sample_tests/test_rescue.py index c91542b3691f..404c7ad83950 100644 --- a/nova/tests/functional/v3/test_rescue.py +++ b/nova/tests/functional/api_sample_tests/test_rescue.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_scheduler_hints.py b/nova/tests/functional/api_sample_tests/test_scheduler_hints.py similarity index 96% rename from nova/tests/functional/v3/test_scheduler_hints.py rename to nova/tests/functional/api_sample_tests/test_scheduler_hints.py index 5dbd972cd286..ae30e85e6884 100644 --- a/nova/tests/functional/v3/test_scheduler_hints.py +++ b/nova/tests/functional/api_sample_tests/test_scheduler_hints.py @@ -17,7 +17,7 @@ import uuid from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_security_group_default_rules.py b/nova/tests/functional/api_sample_tests/test_security_group_default_rules.py similarity index 97% rename from nova/tests/functional/v3/test_security_group_default_rules.py rename to nova/tests/functional/api_sample_tests/test_security_group_default_rules.py index a84caa445443..a51ee56ea31e 100644 --- a/nova/tests/functional/v3/test_security_group_default_rules.py +++ b/nova/tests/functional/api_sample_tests/test_security_group_default_rules.py @@ -14,7 +14,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_security_groups.py b/nova/tests/functional/api_sample_tests/test_security_groups.py similarity index 99% rename from nova/tests/functional/v3/test_security_groups.py rename to nova/tests/functional/api_sample_tests/test_security_groups.py index 7f54aaceb9b4..23a70096514a 100644 --- a/nova/tests/functional/v3/test_security_groups.py +++ b/nova/tests/functional/api_sample_tests/test_security_groups.py @@ -16,7 +16,7 @@ from oslo_config import cfg from nova.network.security_group import neutron_driver -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_server_diagnostics.py b/nova/tests/functional/api_sample_tests/test_server_diagnostics.py similarity index 96% rename from nova/tests/functional/v3/test_server_diagnostics.py rename to nova/tests/functional/api_sample_tests/test_server_diagnostics.py index 3eb4f54c44d4..d351ba7c0344 100644 --- a/nova/tests/functional/v3/test_server_diagnostics.py +++ b/nova/tests/functional/api_sample_tests/test_server_diagnostics.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_server_external_events.py b/nova/tests/functional/api_sample_tests/test_server_external_events.py similarity index 96% rename from nova/tests/functional/v3/test_server_external_events.py rename to nova/tests/functional/api_sample_tests/test_server_external_events.py index 5c6659aea89d..8ceeff819b17 100644 --- a/nova/tests/functional/v3/test_server_external_events.py +++ b/nova/tests/functional/api_sample_tests/test_server_external_events.py @@ -14,7 +14,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_server_groups.py b/nova/tests/functional/api_sample_tests/test_server_groups.py similarity index 97% rename from nova/tests/functional/v3/test_server_groups.py rename to nova/tests/functional/api_sample_tests/test_server_groups.py index b84817896ca3..facc0feec840 100644 --- a/nova/tests/functional/v3/test_server_groups.py +++ b/nova/tests/functional/api_sample_tests/test_server_groups.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_server_metadata.py b/nova/tests/functional/api_sample_tests/test_server_metadata.py similarity index 98% rename from nova/tests/functional/v3/test_server_metadata.py rename to nova/tests/functional/api_sample_tests/test_server_metadata.py index 1197255a583e..8d3beb8c43c1 100644 --- a/nova/tests/functional/v3/test_server_metadata.py +++ b/nova/tests/functional/api_sample_tests/test_server_metadata.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_server_password.py b/nova/tests/functional/api_sample_tests/test_server_password.py similarity index 97% rename from nova/tests/functional/v3/test_server_password.py rename to nova/tests/functional/api_sample_tests/test_server_password.py index 6e1798bdf0e7..07f2740905ad 100644 --- a/nova/tests/functional/v3/test_server_password.py +++ b/nova/tests/functional/api_sample_tests/test_server_password.py @@ -15,7 +15,7 @@ import mock from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_server_usage.py b/nova/tests/functional/api_sample_tests/test_server_usage.py similarity index 97% rename from nova/tests/functional/v3/test_server_usage.py rename to nova/tests/functional/api_sample_tests/test_server_usage.py index fe036c4c99ff..b63c6925e8e0 100644 --- a/nova/tests/functional/v3/test_server_usage.py +++ b/nova/tests/functional/api_sample_tests/test_server_usage.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_servers.py b/nova/tests/functional/api_sample_tests/test_servers.py similarity index 99% rename from nova/tests/functional/v3/test_servers.py rename to nova/tests/functional/api_sample_tests/test_servers.py index 0bbcf0e3c157..2b3d798d9be4 100644 --- a/nova/tests/functional/v3/test_servers.py +++ b/nova/tests/functional/api_sample_tests/test_servers.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_servers_ips.py b/nova/tests/functional/api_sample_tests/test_servers_ips.py similarity index 96% rename from nova/tests/functional/v3/test_servers_ips.py rename to nova/tests/functional/api_sample_tests/test_servers_ips.py index 13d9f612ecf4..9d113a61bad2 100644 --- a/nova/tests/functional/v3/test_servers_ips.py +++ b/nova/tests/functional/api_sample_tests/test_servers_ips.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_services.py b/nova/tests/functional/api_sample_tests/test_services.py similarity index 98% rename from nova/tests/functional/v3/test_services.py rename to nova/tests/functional/api_sample_tests/test_services.py index b9686f26a8c5..2159d5e9a834 100644 --- a/nova/tests/functional/v3/test_services.py +++ b/nova/tests/functional/api_sample_tests/test_services.py @@ -17,7 +17,7 @@ from oslo_config import cfg from oslo_utils import timeutils from nova import db -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit.api.openstack.compute import test_services CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_shelve.py b/nova/tests/functional/api_sample_tests/test_shelve.py similarity index 97% rename from nova/tests/functional/v3/test_shelve.py rename to nova/tests/functional/api_sample_tests/test_shelve.py index ca2db366d696..cc17815c71ec 100644 --- a/nova/tests/functional/v3/test_shelve.py +++ b/nova/tests/functional/api_sample_tests/test_shelve.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('shelved_offload_time', 'nova.compute.manager') diff --git a/nova/tests/functional/v3/test_simple_tenant_usage.py b/nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py similarity index 97% rename from nova/tests/functional/v3/test_simple_tenant_usage.py rename to nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py index fe58d9521296..ebb749da48d4 100644 --- a/nova/tests/functional/v3/test_simple_tenant_usage.py +++ b/nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py @@ -18,7 +18,7 @@ import urllib from oslo_config import cfg from oslo_utils import timeutils -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_suspend_server.py b/nova/tests/functional/api_sample_tests/test_suspend_server.py similarity index 97% rename from nova/tests/functional/v3/test_suspend_server.py rename to nova/tests/functional/api_sample_tests/test_suspend_server.py index 13f9d759d415..b8683a839d18 100644 --- a/nova/tests/functional/v3/test_suspend_server.py +++ b/nova/tests/functional/api_sample_tests/test_suspend_server.py @@ -14,7 +14,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import test_servers CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', diff --git a/nova/tests/functional/v3/test_tenant_networks.py b/nova/tests/functional/api_sample_tests/test_tenant_networks.py similarity index 97% rename from nova/tests/functional/v3/test_tenant_networks.py rename to nova/tests/functional/api_sample_tests/test_tenant_networks.py index fee2c3e2c9c1..4eba44199264 100644 --- a/nova/tests/functional/v3/test_tenant_networks.py +++ b/nova/tests/functional/api_sample_tests/test_tenant_networks.py @@ -18,7 +18,7 @@ from oslo_config import cfg from oslo_serialization import jsonutils import nova.quota -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('enable_network_quota', diff --git a/nova/tests/functional/v3/test_used_limits.py b/nova/tests/functional/api_sample_tests/test_used_limits.py similarity index 95% rename from nova/tests/functional/v3/test_used_limits.py rename to nova/tests/functional/api_sample_tests/test_used_limits.py index a29bb404a87f..838bf8d74530 100644 --- a/nova/tests/functional/v3/test_used_limits.py +++ b/nova/tests/functional/api_sample_tests/test_used_limits.py @@ -14,7 +14,7 @@ # under the License. -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base class UsedLimitsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): diff --git a/nova/tests/functional/v3/test_user_data.py b/nova/tests/functional/api_sample_tests/test_user_data.py similarity index 96% rename from nova/tests/functional/v3/test_user_data.py rename to nova/tests/functional/api_sample_tests/test_user_data.py index c67fd6d4e4ae..8adc40e8ebeb 100644 --- a/nova/tests/functional/v3/test_user_data.py +++ b/nova/tests/functional/api_sample_tests/test_user_data.py @@ -16,7 +16,7 @@ import base64 from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit.image import fake CONF = cfg.CONF diff --git a/nova/tests/functional/v3/test_volumes.py b/nova/tests/functional/api_sample_tests/test_volumes.py similarity index 99% rename from nova/tests/functional/v3/test_volumes.py rename to nova/tests/functional/api_sample_tests/test_volumes.py index bf12c405d3d4..36adb68244e7 100644 --- a/nova/tests/functional/v3/test_volumes.py +++ b/nova/tests/functional/api_sample_tests/test_volumes.py @@ -22,8 +22,8 @@ from nova.compute import manager as compute_manager from nova import context from nova import db from nova import objects -from nova.tests.functional.v3 import api_sample_base -from nova.tests.functional.v3 import test_servers +from nova.tests.functional.api_sample_tests import api_sample_base +from nova.tests.functional.api_sample_tests 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 diff --git a/nova/tests/functional/test_legacy_v2_compatible_wrapper.py b/nova/tests/functional/test_legacy_v2_compatible_wrapper.py index 5f8c93ed124c..04e6ed1469ed 100644 --- a/nova/tests/functional/test_legacy_v2_compatible_wrapper.py +++ b/nova/tests/functional/test_legacy_v2_compatible_wrapper.py @@ -16,8 +16,8 @@ from nova.api import openstack from nova.api.openstack import compute from nova.api.openstack import wsgi +from nova.tests.functional import api_paste_fixture from nova.tests.functional import integrated_helpers -from nova.tests.functional.v3 import api_paste_fixture class LegacyV2CompatibleTestBase(integrated_helpers._IntegratedTestBase): diff --git a/nova/tests/functional/v3/__init__.py b/nova/tests/functional/v3/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/nova/tests/functional/wsgi/test_secgroup.py b/nova/tests/functional/wsgi/test_secgroup.py index 23459f4da14c..9fcb50b03a5f 100644 --- a/nova/tests/functional/wsgi/test_secgroup.py +++ b/nova/tests/functional/wsgi/test_secgroup.py @@ -17,7 +17,7 @@ import testscenarios from nova import test from nova.tests import fixtures as nova_fixtures -from nova.tests.functional.v3 import api_paste_fixture +from nova.tests.functional import api_paste_fixture import nova.tests.unit.image.fake from nova.tests.unit import policy_fixture