diff --git a/api-ref/source/extensions.inc b/api-ref/source/extensions.inc index 077db4e9b349..28123a89d059 100644 --- a/api-ref/source/extensions.inc +++ b/api-ref/source/extensions.inc @@ -51,7 +51,7 @@ Response Lists all extensions to the API. -.. literalinclude:: ../../doc/api_samples/all_extensions/extensions-list-resp.json +.. literalinclude:: ../../doc/api_samples/extension-info/extensions-list-resp.json :language: javascript diff --git a/api-ref/source/os-networks.inc b/api-ref/source/os-networks.inc index ab507da4b4f1..b5acfdc7e616 100644 --- a/api-ref/source/os-networks.inc +++ b/api-ref/source/os-networks.inc @@ -229,7 +229,7 @@ Request **Example Disassociate Network: JSON request** -.. literalinclude:: ../../doc/api_samples/os-networks/networks-disassociate-req.json +.. literalinclude:: ../../doc/api_samples/os-networks-associate/network-disassociate-req.json :language: javascript Response diff --git a/doc/api_samples/all_extensions/extensions-list-resp-v2.json b/doc/api_samples/all_extensions/extensions-list-resp-v2.json deleted file mode 100644 index ec9a4547d469..000000000000 --- a/doc/api_samples/all_extensions/extensions-list-resp-v2.json +++ /dev/null @@ -1,724 +0,0 @@ -{ - "extensions": [ - { - "alias": "NMN", - "description": "Multiple network support.", - "links": [], - "name": "Multinic", - "namespace": "http://docs.openstack.org/compute/ext/multinic/api/v1.1", - "updated": "2011-06-09T00:00:00Z" - }, - { - "alias": "OS-DCF", - "description": "Disk Management Extension.", - "links": [], - "name": "DiskConfig", - "namespace": "http://docs.openstack.org/compute/ext/disk_config/api/v1.1", - "updated": "2011-09-27T00:00:00Z" - }, - { - "alias": "OS-EXT-AZ", - "description": "Extended Availability Zone support.", - "links": [], - "name": "ExtendedAvailabilityZone", - "namespace": "http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2", - "updated": "2013-01-30T00:00:00Z" - }, - { - "alias": "OS-EXT-IMG-SIZE", - "description": "Adds image size to image listings.", - "links": [], - "name": "ImageSize", - "namespace": "http://docs.openstack.org/compute/ext/image_size/api/v1.1", - "updated": "2013-02-19T00:00:00Z" - }, - { - "alias": "OS-EXT-IPS", - "description": "Adds type parameter to the ip list.", - "links": [], - "name": "ExtendedIps", - "namespace": "http://docs.openstack.org/compute/ext/extended_ips/api/v1.1", - "updated": "2013-01-06T00:00:00Z" - }, - { - "alias": "OS-EXT-IPS-MAC", - "description": "Adds mac address parameter to the ip list.", - "links": [], - "name": "ExtendedIpsMac", - "namespace": "http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1", - "updated": "2013-03-07T00:00:00Z" - }, - { - "alias": "OS-EXT-SRV-ATTR", - "description": "Extended Server Attributes support.", - "links": [], - "name": "ExtendedServerAttributes", - "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1", - "updated": "2011-11-03T00:00:00Z" - }, - { - "alias": "OS-EXT-STS", - "description": "Extended Status support.", - "links": [], - "name": "ExtendedStatus", - "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1", - "updated": "2011-11-03T00:00:00Z" - }, - { - "alias": "OS-EXT-VIF-NET", - "description": "Adds network id parameter to the virtual interface list.", - "links": [], - "name": "ExtendedVIFNet", - "namespace": "http://docs.openstack.org/compute/ext/extended-virtual-interfaces-net/api/v1.1", - "updated": "2013-03-07T00:00:00Z" - }, - { - "alias": "OS-FLV-DISABLED", - "description": "Support to show the disabled status of a flavor.", - "links": [], - "name": "FlavorDisabled", - "namespace": "http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1", - "updated": "2012-08-29T00:00:00Z" - }, - { - "alias": "OS-FLV-EXT-DATA", - "description": "Provide additional data for flavors.", - "links": [], - "name": "FlavorExtraData", - "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1", - "updated": "2011-09-14T00:00:00Z" - }, - { - "alias": "OS-SCH-HNT", - "description": "Pass arbitrary key/value pairs to the scheduler.", - "links": [], - "name": "SchedulerHints", - "namespace": "http://docs.openstack.org/compute/ext/scheduler-hints/api/v2", - "updated": "2011-07-19T00:00:00Z" - }, - { - "alias": "OS-SRV-USG", - "description": "Adds launched_at and terminated_at on Servers.", - "links": [], - "name": "ServerUsage", - "namespace": "http://docs.openstack.org/compute/ext/server_usage/api/v1.1", - "updated": "2013-04-29T00:00:00Z" - }, - { - "alias": "os-admin-actions", - "description": "Enable admin-only server actions\n\n Actions include: pause, unpause, suspend, resume, migrate,\n resetNetwork, injectNetworkInfo, lock, unlock, createBackup\n ", - "links": [], - "name": "AdminActions", - "namespace": "http://docs.openstack.org/compute/ext/admin-actions/api/v1.1", - "updated": "2011-09-20T00:00:00Z" - }, - { - "alias": "os-agents", - "description": "Agents support.", - "links": [], - "name": "Agents", - "namespace": "http://docs.openstack.org/compute/ext/agents/api/v2", - "updated": "2012-10-28T00:00:00Z" - }, - { - "alias": "os-aggregates", - "description": "Admin-only aggregate administration.", - "links": [], - "name": "Aggregates", - "namespace": "http://docs.openstack.org/compute/ext/aggregates/api/v1.1", - "updated": "2012-01-12T00:00:00Z" - }, - { - "alias": "os-assisted-volume-snapshots", - "description": "Assisted volume snapshots.", - "links": [], - "name": "AssistedVolumeSnapshots", - "namespace": "http://docs.openstack.org/compute/ext/assisted-volume-snapshots/api/v2", - "updated": "2013-08-29T00:00:00Z" - }, - { - "alias": "os-attach-interfaces", - "description": "Attach interface support.", - "links": [], - "name": "AttachInterfaces", - "namespace": "http://docs.openstack.org/compute/ext/interfaces/api/v1.1", - "updated": "2012-07-22T00:00:00Z" - }, - { - "alias": "os-availability-zone", - "description": "1. Add availability_zone to the Create Server v1.1 API.\n 2. Add availability zones describing.\n ", - "links": [], - "name": "AvailabilityZone", - "namespace": "http://docs.openstack.org/compute/ext/availabilityzone/api/v1.1", - "updated": "2012-12-21T00:00:00Z" - }, - { - "alias": "os-baremetal-ext-status", - "description": "Add extended status in Baremetal Nodes v2 API.", - "links": [], - "name": "BareMetalExtStatus", - "namespace": "http://docs.openstack.org/compute/ext/baremetal_ext_status/api/v2", - "updated": "2013-08-27T00:00:00Z" - }, - { - "alias": "os-baremetal-nodes", - "description": "Admin-only bare-metal node administration.", - "links": [], - "name": "BareMetalNodes", - "namespace": "http://docs.openstack.org/compute/ext/baremetal_nodes/api/v2", - "updated": "2013-01-04T00:00:00Z" - }, - { - "alias": "os-block-device-mapping-v2-boot", - "description": "Allow boot with the new BDM data format.", - "links": [], - "name": "BlockDeviceMappingV2Boot", - "namespace": "http://docs.openstack.org/compute/ext/block_device_mapping_v2_boot/api/v2", - "updated": "2013-07-08T00:00:00Z" - }, - { - "alias": "os-cell-capacities", - "description": "Adding functionality to get cell capacities.", - "links": [], - "name": "CellCapacities", - "namespace": "http://docs.openstack.org/compute/ext/cell_capacities/api/v1.1", - "updated": "2013-05-27T00:00:00Z" - }, - { - "alias": "os-cells", - "description": "Enables cells-related functionality such as adding neighbor cells,\n listing neighbor cells, and getting the capabilities of the local cell.\n ", - "links": [], - "name": "Cells", - "namespace": "http://docs.openstack.org/compute/ext/cells/api/v1.1", - "updated": "2013-05-14T00:00:00Z" - }, - { - "alias": "os-certificates", - "description": "Certificates support.", - "links": [], - "name": "Certificates", - "namespace": "http://docs.openstack.org/compute/ext/certificates/api/v1.1", - "updated": "2012-01-19T00:00:00Z" - }, - { - "alias": "os-cloudpipe", - "description": "Adds actions to create cloudpipe instances.\n\n When running with the Vlan network mode, you need a mechanism to route\n from the public Internet to your vlans. This mechanism is known as a\n cloudpipe.\n\n At the time of creating this class, only OpenVPN is supported. Support for\n a SSH Bastion host is forthcoming.\n ", - "links": [], - "name": "Cloudpipe", - "namespace": "http://docs.openstack.org/compute/ext/cloudpipe/api/v1.1", - "updated": "2011-12-16T00:00:00Z" - }, - { - "alias": "os-cloudpipe-update", - "description": "Adds the ability to set the vpn ip/port for cloudpipe instances.", - "links": [], - "name": "CloudpipeUpdate", - "namespace": "http://docs.openstack.org/compute/ext/cloudpipe-update/api/v2", - "updated": "2012-11-14T00:00:00Z" - }, - { - "alias": "os-config-drive", - "description": "Config Drive Extension.", - "links": [], - "name": "ConfigDrive", - "namespace": "http://docs.openstack.org/compute/ext/config_drive/api/v1.1", - "updated": "2012-07-16T00:00:00Z" - }, - { - "alias": "os-console-auth-tokens", - "description": "Console token authentication support.", - "links": [], - "name": "ConsoleAuthTokens", - "namespace": "http://docs.openstack.org/compute/ext/consoles-auth-tokens/api/v2", - "updated": "2013-08-13T00:00:00Z" - }, - { - "alias": "os-console-output", - "description": "Console log output support, with tailing ability.", - "links": [], - "name": "ConsoleOutput", - "namespace": "http://docs.openstack.org/compute/ext/os-console-output/api/v2", - "updated": "2011-12-08T00:00:00Z" - }, - { - "alias": "os-consoles", - "description": "Interactive Console support.", - "links": [], - "name": "Consoles", - "namespace": "http://docs.openstack.org/compute/ext/os-consoles/api/v2", - "updated": "2011-12-23T00:00:00Z" - }, - { - "alias": "os-create-server-ext", - "description": "Extended support to the Create Server v1.1 API.", - "links": [], - "name": "Createserverext", - "namespace": "http://docs.openstack.org/compute/ext/createserverext/api/v1.1", - "updated": "2011-07-19T00:00:00Z" - }, - { - "alias": "os-deferred-delete", - "description": "Instance deferred delete.", - "links": [], - "name": "DeferredDelete", - "namespace": "http://docs.openstack.org/compute/ext/deferred-delete/api/v1.1", - "updated": "2011-09-01T00:00:00Z" - }, - { - "alias": "os-evacuate", - "description": "Enables server evacuation.", - "links": [], - "name": "Evacuate", - "namespace": "http://docs.openstack.org/compute/ext/evacuate/api/v2", - "updated": "2013-01-06T00:00:00Z" - }, - { - "alias": "os-extended-evacuate-find-host", - "description": "Enables server evacuation without target host. Scheduler will select\n one to target.\n ", - "links": [], - "name": "ExtendedEvacuateFindHost", - "namespace": "http://docs.openstack.org/compute/ext/extended_evacuate_find_host/api/v2", - "updated": "2014-02-12T00:00:00Z" - }, - { - "alias": "os-extended-floating-ips", - "description": "Adds optional fixed_address to the add floating IP command.", - "links": [], - "name": "ExtendedFloatingIps", - "namespace": "http://docs.openstack.org/compute/ext/extended_floating_ips/api/v2", - "updated": "2013-04-19T00:00:00Z" - }, - { - "alias": "os-extended-hypervisors", - "description": "Extended hypervisors support.", - "links": [], - "name": "ExtendedHypervisors", - "namespace": "http://docs.openstack.org/compute/ext/extended_hypervisors/api/v1.1", - "updated": "2014-01-04T00:00:00Z" - }, - { - "alias": "os-extended-networks", - "description": "Adds additional fields to networks", - "links": [], - "name": "ExtendedNetworks", - "namespace": "http://docs.openstack.org/compute/ext/extended_networks/api/v2", - "updated": "2014-05-09T00:00:00Z" - }, - { - "alias": "os-extended-quotas", - "description": "Adds ability for admins to delete quota\n and optionally force the update Quota command.\n ", - "links": [], - "name": "ExtendedQuotas", - "namespace": "http://docs.openstack.org/compute/ext/extended_quotas/api/v1.1", - "updated": "2013-06-09T00:00:00Z" - }, - { - "alias": "os-extended-rescue-with-image", - "description": "Allow the user to specify the image to use for rescue.", - "links": [], - "name": "ExtendedRescueWithImage", - "namespace": "http://docs.openstack.org/compute/ext/extended_rescue_with_image/api/v2", - "updated": "2014-01-04T00:00:00Z" - }, - { - "alias": "os-hypervisor-status", - "description": "Show hypervisor status.", - "links": [], - "name": "HypervisorStatus", - "namespace": "http://docs.openstack.org/compute/ext/hypervisor_status/api/v1.1", - "updated": "2014-04-17T00:00:00Z" - }, - { - "alias": "os-extended-services", - "description": "Extended services support.", - "links": [], - "name": "ExtendedServices", - "namespace": "http://docs.openstack.org/compute/ext/extended_services/api/v2", - "updated": "2013-05-17T00:00:00Z" - }, - { - "alias": "os-extended-services-delete", - "description": "Extended services deletion support.", - "links": [], - "name": "ExtendedServicesDelete", - "namespace": "http://docs.openstack.org/compute/ext/extended_services_delete/api/v2", - "updated": "2013-12-10T00:00:00Z" - }, - { - "alias": "os-extended-volumes", - "description": "Extended Volumes support.", - "links": [], - "name": "ExtendedVolumes", - "namespace": "http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1", - "updated": "2013-06-07T00:00:00Z" - }, - { - "alias": "os-fixed-ips", - "description": "Fixed IPs support.", - "links": [], - "name": "FixedIPs", - "namespace": "http://docs.openstack.org/compute/ext/fixed_ips/api/v2", - "updated": "2012-10-18T19:25:27Z" - }, - { - "alias": "os-flavor-access", - "description": "Flavor access support.", - "links": [], - "name": "FlavorAccess", - "namespace": "http://docs.openstack.org/compute/ext/flavor_access/api/v2", - "updated": "2012-08-01T00:00:00Z" - }, - { - "alias": "os-flavor-extra-specs", - "description": "Instance type (flavor) extra specs.", - "links": [], - "name": "FlavorExtraSpecs", - "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_specs/api/v1.1", - "updated": "2011-06-23T00:00:00Z" - }, - { - "alias": "os-flavor-manage", - "description": "Flavor create/delete API support.", - "links": [], - "name": "FlavorManage", - "namespace": "http://docs.openstack.org/compute/ext/flavor_manage/api/v1.1", - "updated": "2012-01-19T00:00:00Z" - }, - { - "alias": "os-flavor-rxtx", - "description": "Support to show the rxtx status of a flavor.", - "links": [], - "name": "FlavorRxtx", - "namespace": "http://docs.openstack.org/compute/ext/flavor_rxtx/api/v1.1", - "updated": "2012-08-29T00:00:00Z" - }, - { - "alias": "os-flavor-swap", - "description": "Support to show the swap status of a flavor.", - "links": [], - "name": "FlavorSwap", - "namespace": "http://docs.openstack.org/compute/ext/flavor_swap/api/v1.1", - "updated": "2012-08-29T00:00:00Z" - }, - { - "alias": "os-floating-ip-dns", - "description": "Floating IP DNS support.", - "links": [], - "name": "FloatingIpDns", - "namespace": "http://docs.openstack.org/ext/floating_ip_dns/api/v1.1", - "updated": "2011-12-23T00:00:00Z" - }, - { - "alias": "os-floating-ip-pools", - "description": "Floating IPs support.", - "links": [], - "name": "FloatingIpPools", - "namespace": "http://docs.openstack.org/compute/ext/floating_ip_pools/api/v1.1", - "updated": "2012-01-04T00:00:00Z" - }, - { - "alias": "os-floating-ips", - "description": "Floating IPs support.", - "links": [], - "name": "FloatingIps", - "namespace": "http://docs.openstack.org/compute/ext/floating_ips/api/v1.1", - "updated": "2011-06-16T00:00:00Z" - }, - { - "alias": "os-floating-ips-bulk", - "description": "Bulk handling of Floating IPs.", - "links": [], - "name": "FloatingIpsBulk", - "namespace": "http://docs.openstack.org/compute/ext/floating_ips_bulk/api/v2", - "updated": "2012-10-29T19:25:27Z" - }, - { - "alias": "os-fping", - "description": "Fping Management Extension.", - "links": [], - "name": "Fping", - "namespace": "http://docs.openstack.org/compute/ext/fping/api/v1.1", - "updated": "2012-07-06T00:00:00Z" - }, - { - "alias": "os-hide-server-addresses", - "description": "Support hiding server addresses in certain states.", - "links": [], - "name": "HideServerAddresses", - "namespace": "http://docs.openstack.org/compute/ext/hide_server_addresses/api/v1.1", - "updated": "2012-12-11T00:00:00Z" - }, - { - "alias": "os-hosts", - "description": "Admin-only host administration.", - "links": [], - "name": "Hosts", - "namespace": "http://docs.openstack.org/compute/ext/hosts/api/v1.1", - "updated": "2011-06-29T00:00:00Z" - }, - { - "alias": "os-hypervisors", - "description": "Admin-only hypervisor administration.", - "links": [], - "name": "Hypervisors", - "namespace": "http://docs.openstack.org/compute/ext/hypervisors/api/v1.1", - "updated": "2012-06-21T00:00:00Z" - }, - { - "alias": "os-instance-actions", - "description": "View a log of actions and events taken on an instance.", - "links": [], - "name": "InstanceActions", - "namespace": "http://docs.openstack.org/compute/ext/instance-actions/api/v1.1", - "updated": "2013-02-08T00:00:00Z" - }, - { - "alias": "os-instance_usage_audit_log", - "description": "Admin-only Task Log Monitoring.", - "links": [], - "name": "OSInstanceUsageAuditLog", - "namespace": "http://docs.openstack.org/ext/services/api/v1.1", - "updated": "2012-07-06T01:00:00Z" - }, - { - "alias": "os-keypairs", - "description": "Keypair Support.", - "links": [], - "name": "Keypairs", - "namespace": "http://docs.openstack.org/compute/ext/keypairs/api/v1.1", - "updated": "2011-08-08T00:00:00Z" - }, - { - "alias": "os-migrations", - "description": "Provide data on migrations.", - "links": [], - "name": "Migrations", - "namespace": "http://docs.openstack.org/compute/ext/migrations/api/v2.0", - "updated": "2013-05-30T00:00:00Z" - }, - { - "alias": "os-multiple-create", - "description": "Allow multiple create in the Create Server v1.1 API.", - "links": [], - "name": "MultipleCreate", - "namespace": "http://docs.openstack.org/compute/ext/multiplecreate/api/v1.1", - "updated": "2012-08-07T00:00:00Z" - }, - { - "alias": "os-networks", - "description": "Admin-only Network Management Extension.", - "links": [], - "name": "Networks", - "namespace": "http://docs.openstack.org/compute/ext/os-networks/api/v1.1", - "updated": "2011-12-23T00:00:00Z" - }, - { - "alias": "os-networks-associate", - "description": "Network association support.", - "links": [], - "name": "NetworkAssociationSupport", - "namespace": "http://docs.openstack.org/compute/ext/networks_associate/api/v2", - "updated": "2012-11-19T00:00:00Z" - }, - { - "alias": "os-preserve-ephemeral-rebuild", - "description": "Allow preservation of the ephemeral partition on rebuild.", - "links": [], - "name": "PreserveEphemeralOnRebuild", - "namespace": "http://docs.openstack.org/compute/ext/preserve_ephemeral_rebuild/api/v2", - "updated": "2013-12-17T00:00:00Z" - }, - { - "alias": "os-quota-class-sets", - "description": "Quota classes management support.", - "links": [], - "name": "QuotaClasses", - "namespace": "http://docs.openstack.org/compute/ext/quota-classes-sets/api/v1.1", - "updated": "2012-03-12T00:00:00Z" - }, - { - "alias": "os-quota-sets", - "description": "Quotas management support.", - "links": [], - "name": "Quotas", - "namespace": "http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1", - "updated": "2011-08-08T00:00:00Z" - }, - { - "alias": "os-rescue", - "description": "Instance rescue mode.", - "links": [], - "name": "Rescue", - "namespace": "http://docs.openstack.org/compute/ext/rescue/api/v1.1", - "updated": "2011-08-18T00:00:00Z" - }, - { - "alias": "os-security-group-default-rules", - "description": "Default rules for security group support.", - "links": [], - "name": "SecurityGroupDefaultRules", - "namespace": "http://docs.openstack.org/compute/ext/securitygroupdefaultrules/api/v1.1", - "updated": "2013-02-05T00:00:00Z" - }, - { - "alias": "os-security-groups", - "description": "Security group support.", - "links": [], - "name": "SecurityGroups", - "namespace": "http://docs.openstack.org/compute/ext/securitygroups/api/v1.1", - "updated": "2013-05-28T00:00:00Z" - }, - { - "alias": "os-server-diagnostics", - "description": "Allow Admins to view server diagnostics through server action.", - "links": [], - "name": "ServerDiagnostics", - "namespace": "http://docs.openstack.org/compute/ext/server-diagnostics/api/v1.1", - "updated": "2011-12-21T00:00:00Z" - }, - { - "alias": "os-server-external-events", - "description": "Server External Event Triggers.", - "links": [], - "name": "ServerExternalEvents", - "namespace": "http://docs.openstack.org/compute/ext/server-external-events/api/v2", - "updated": "2014-02-18T00:00:00Z" - }, - { - "alias": "os-server-groups", - "description": "Server group support.", - "links": [], - "name": "ServerGroups", - "namespace": "http://docs.openstack.org/compute/ext/servergroups/api/v2", - "updated": "2013-06-20T00:00:00Z" - }, - { - "alias": "os-server-group-quotas", - "description": "Adds quota support to server groups.", - "links": [], - "name": "ServerGroupQuotas", - "namespace": "http://docs.openstack.org/compute/ext/server-group-quotas/api/v2", - "updated": "2014-07-25T00:00:00Z" - }, - { - "alias": "os-server-list-multi-status", - "description": "Allow to filter the servers by a set of status values.", - "links": [], - "name": "ServerListMultiStatus", - "namespace": "http://docs.openstack.org/compute/ext/os-server-list-multi-status/api/v2", - "updated": "2014-05-11T00:00:00Z" - }, - { - "alias": "os-server-password", - "description": "Server password support.", - "links": [], - "name": "ServerPassword", - "namespace": "http://docs.openstack.org/compute/ext/server-password/api/v2", - "updated": "2012-11-29T00:00:00Z" - }, - { - "alias": "os-server-start-stop", - "description": "Start/Stop instance compute API support.", - "links": [], - "name": "ServerStartStop", - "namespace": "http://docs.openstack.org/compute/ext/servers/api/v1.1", - "updated": "2012-01-23T00:00:00Z" - }, - { - "alias": "os-services", - "description": "Services support.", - "links": [], - "name": "Services", - "namespace": "http://docs.openstack.org/compute/ext/services/api/v2", - "updated": "2012-10-28T00:00:00Z" - }, - { - "alias": "os-shelve", - "description": "Instance shelve mode.", - "links": [], - "name": "Shelve", - "namespace": "http://docs.openstack.org/compute/ext/shelve/api/v1.1", - "updated": "2013-04-06T00:00:00Z" - }, - { - "alias": "os-simple-tenant-usage", - "description": "Simple tenant usage extension.", - "links": [], - "name": "SimpleTenantUsage", - "namespace": "http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1", - "updated": "2011-08-19T00:00:00Z" - }, - { - "alias": "os-tenant-networks", - "description": "Tenant-based Network Management Extension.", - "links": [], - "name": "OSTenantNetworks", - "namespace": "http://docs.openstack.org/compute/ext/os-tenant-networks/api/v2", - "updated": "2012-03-07T14:46:43Z" - }, - { - "alias": "os-used-limits", - "description": "Provide data on limited resources that are being used.", - "links": [], - "name": "UsedLimits", - "namespace": "http://docs.openstack.org/compute/ext/used_limits/api/v1.1", - "updated": "2012-07-13T00:00:00Z" - }, - { - "alias": "os-used-limits-for-admin", - "description": "Provide data to admin on limited resources used by other tenants.", - "links": [], - "name": "UsedLimitsForAdmin", - "namespace": "http://docs.openstack.org/compute/ext/used_limits_for_admin/api/v1.1", - "updated": "2013-05-02T00:00:00Z" - }, - { - "alias": "os-user-data", - "description": "Add user_data to the Create Server v1.1 API.", - "links": [], - "name": "UserData", - "namespace": "http://docs.openstack.org/compute/ext/userdata/api/v1.1", - "updated": "2012-08-07T00:00:00Z" - }, - { - "alias": "os-user-quotas", - "description": "Project user quota support.", - "links": [], - "name": "UserQuotas", - "namespace": "http://docs.openstack.org/compute/ext/user_quotas/api/v1.1", - "updated": "2013-07-18T00:00:00Z" - }, - { - "alias": "os-virtual-interfaces", - "description": "Virtual interface support.", - "links": [], - "name": "VirtualInterfaces", - "namespace": "http://docs.openstack.org/compute/ext/virtual_interfaces/api/v1.1", - "updated": "2011-08-17T00:00:00Z" - }, - { - "alias": "os-volume-attachment-update", - "description": "Support for updating a volume attachment.", - "links": [], - "name": "VolumeAttachmentUpdate", - "namespace": "http://docs.openstack.org/compute/ext/os-volume-attachment-update/api/v2", - "updated": "2013-06-20T00:00:00Z" - }, - { - "alias": "os-volumes", - "description": "Volumes support.", - "links": [], - "name": "Volumes", - "namespace": "http://docs.openstack.org/compute/ext/volumes/api/v1.1", - "updated": "2011-03-25T00:00:00Z" - }, - { - "alias": "os-server-sort-keys", - "description": "Add sorting support in get Server v2 API.", - "links": [], - "name": "ServerSortKeys", - "namespace": "http://docs.openstack.org/compute/ext/server_sort_keys/api/v2", - "updated": "2014-05-22T00:00:00Z" - } - ] -} diff --git a/doc/api_samples/all_extensions/extensions-list-resp-v21-compatible.json b/doc/api_samples/extension-info/extensions-list-resp-v21-compatible.json similarity index 99% rename from doc/api_samples/all_extensions/extensions-list-resp-v21-compatible.json rename to doc/api_samples/extension-info/extensions-list-resp-v21-compatible.json index 0b2afb608505..e1da6a0a0933 100644 --- a/doc/api_samples/all_extensions/extensions-list-resp-v21-compatible.json +++ b/doc/api_samples/extension-info/extensions-list-resp-v21-compatible.json @@ -801,4 +801,4 @@ "updated": "2014-12-03T00:00:00Z" } ] -} +} \ No newline at end of file diff --git a/doc/api_samples/all_extensions/extensions-list-resp.json b/doc/api_samples/extension-info/extensions-list-resp.json similarity index 99% rename from doc/api_samples/all_extensions/extensions-list-resp.json rename to doc/api_samples/extension-info/extensions-list-resp.json index 9bfd5b0884c0..751260d89f9b 100644 --- a/doc/api_samples/all_extensions/extensions-list-resp.json +++ b/doc/api_samples/extension-info/extensions-list-resp.json @@ -793,4 +793,4 @@ "updated": "2014-12-03T00:00:00Z" } ] -} +} \ No newline at end of file diff --git a/doc/api_samples/limits/limit-get-resp.json b/doc/api_samples/limits/limit-get-resp.json index 79171f5ff026..28309af04c6c 100644 --- a/doc/api_samples/limits/limit-get-resp.json +++ b/doc/api_samples/limits/limit-get-resp.json @@ -13,7 +13,13 @@ "maxTotalKeypairs": 100, "maxTotalRAMSize": 51200, "maxServerGroups": 10, - "maxServerGroupMembers": 10 + "maxServerGroupMembers": 10, + "totalCoresUsed": 0, + "totalInstancesUsed": 0, + "totalRAMUsed": 0, + "totalSecurityGroupsUsed": 0, + "totalFloatingIpsUsed": 0, + "totalServerGroupsUsed": 0 }, "rate": [] } diff --git a/doc/api_samples/os-networks/networks-disassociate-req.json b/doc/api_samples/os-networks/networks-disassociate-req.json deleted file mode 100644 index 2e09d15a60a9..000000000000 --- a/doc/api_samples/os-networks/networks-disassociate-req.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "disassociate": null -} diff --git a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json b/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json deleted file mode 100644 index 981b5b63b5ca..000000000000 --- a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "server" : { - "name" : "new-server-test", - "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "1" - }, - "OS-SCH-HNT:scheduler_hints": { - "same_host": "48e6a9f6-30af-47e0-bc04-acaed113bb4e" - } -} diff --git a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json b/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json deleted file mode 100644 index 13471f613858..000000000000 --- a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "erQXgJ8NBDD4", - "id": "4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", - "rel": "bookmark" - } - ] - } -} diff --git a/doc/api_samples/os-security-groups/server-post-req.json b/doc/api_samples/os-security-groups/server-post-req.json deleted file mode 100644 index cc589208cc19..000000000000 --- a/doc/api_samples/os-security-groups/server-post-req.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "server" : { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "name" : "new-server-test", - "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - }, - "security_groups": [{"name": "test"}] - } -} diff --git a/doc/api_samples/os-security-groups/server-post-resp.json b/doc/api_samples/os-security-groups/server-post-resp.json deleted file mode 100644 index 19a4b8d475e1..000000000000 --- a/doc/api_samples/os-security-groups/server-post-resp.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "adminPass": "6NpUwoz2QDRN", - "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", - "rel": "bookmark" - } - ], - "security_groups": [{"name": "test"}] - } -} diff --git a/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json b/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json index 9a96098482a2..2e6e3680f563 100644 --- a/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json +++ b/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json @@ -70,7 +70,7 @@ "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:hostname": "fake-hostname", "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-SRV-ATTR:user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", diff --git a/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json b/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json index e3bbe1c7daee..dc22eeb13fcb 100644 --- a/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json +++ b/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json @@ -69,7 +69,7 @@ "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:hostname": "fake-hostname", "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-SRV-ATTR:user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", diff --git a/doc/api_samples/os-used-limits/usedlimits-get-resp.json b/doc/api_samples/os-used-limits/usedlimits-get-resp.json deleted file mode 100644 index 28309af04c6c..000000000000 --- a/doc/api_samples/os-used-limits/usedlimits-get-resp.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "limits": { - "absolute": { - "maxImageMeta": 128, - "maxPersonality": 5, - "maxPersonalitySize": 10240, - "maxSecurityGroupRules": 20, - "maxSecurityGroups": 10, - "maxServerMeta": 128, - "maxTotalCores": 20, - "maxTotalFloatingIps": 10, - "maxTotalInstances": 10, - "maxTotalKeypairs": 100, - "maxTotalRAMSize": 51200, - "maxServerGroups": 10, - "maxServerGroupMembers": 10, - "totalCoresUsed": 0, - "totalInstancesUsed": 0, - "totalRAMUsed": 0, - "totalSecurityGroupsUsed": 0, - "totalFloatingIpsUsed": 0, - "totalServerGroupsUsed": 0 - }, - "rate": [] - } -} diff --git a/doc/api_samples/os-user-data/userdata-post-req.json b/doc/api_samples/os-user-data/userdata-post-req.json deleted file mode 100644 index e8f78ff4b397..000000000000 --- a/doc/api_samples/os-user-data/userdata-post-req.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "server" : { - "name" : "new-server-test", - "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - }, - "user_data" : "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==" - } -} diff --git a/doc/api_samples/os-user-data/userdata-post-resp.json b/doc/api_samples/os-user-data/userdata-post-resp.json deleted file mode 100644 index 1e14966de1ca..000000000000 --- a/doc/api_samples/os-user-data/userdata-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "2xHoDU7Gd7vw", - "id": "976a62bb-0d4a-4e17-9044-1864e888a557", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/976a62bb-0d4a-4e17-9044-1864e888a557", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/976a62bb-0d4a-4e17-9044-1864e888a557", - "rel": "bookmark" - } - ] - } -} diff --git a/doc/api_samples/servers/server-create-req.json b/doc/api_samples/servers/server-create-req.json index 25a99d8d3f94..6d90a3041ed8 100644 --- a/doc/api_samples/servers/server-create-req.json +++ b/doc/api_samples/servers/server-create-req.json @@ -20,6 +20,10 @@ { "name": "default" } - ] + ], + "user_data" : "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==", + "OS-SCH-HNT:scheduler_hints": { + "same_host": "48e6a9f6-30af-47e0-bc04-acaed113bb4e" + } } } diff --git a/doc/api_samples/servers/server-post-req.json b/doc/api_samples/servers/server-post-req.json deleted file mode 100644 index ca53f3a7c26c..000000000000 --- a/doc/api_samples/servers/server-post-req.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "server" : { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "name" : "new-server-test", - "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - } - } -} diff --git a/doc/api_samples/servers/server-post-resp.json b/doc/api_samples/servers/server-post-resp.json deleted file mode 100644 index 9c3ad3d8c83f..000000000000 --- a/doc/api_samples/servers/server-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "6NpUwoz2QDRN", - "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", - "rel": "bookmark" - } - ] - } -} diff --git a/doc/api_samples/servers/v2.16/server-get-resp.json b/doc/api_samples/servers/v2.16/server-get-resp.json index e39236f1250d..8737a0e80d3a 100644 --- a/doc/api_samples/servers/v2.16/server-get-resp.json +++ b/doc/api_samples/servers/v2.16/server-get-resp.json @@ -58,7 +58,7 @@ "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", "OS-EXT-SRV-ATTR:kernel_id": null, "OS-EXT-SRV-ATTR:ramdisk_id": null, - "OS-EXT-SRV-ATTR:user_data": null, + "OS-EXT-SRV-ATTR:user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", diff --git a/doc/api_samples/servers/v2.16/servers-details-resp.json b/doc/api_samples/servers/v2.16/servers-details-resp.json index ce7354f2e9de..125f8caaaa80 100644 --- a/doc/api_samples/servers/v2.16/servers-details-resp.json +++ b/doc/api_samples/servers/v2.16/servers-details-resp.json @@ -59,7 +59,7 @@ "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", "OS-EXT-SRV-ATTR:kernel_id": null, "OS-EXT-SRV-ATTR:ramdisk_id": null, - "OS-EXT-SRV-ATTR:user_data": null, + "OS-EXT-SRV-ATTR:user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==", "locked": false, "accessIPv4": "1.2.3.4", "accessIPv6": "80fe::", diff --git a/doc/api_samples/servers/v2.19/server-post-req.json b/doc/api_samples/servers/v2.19/server-create-req.json similarity index 100% rename from doc/api_samples/servers/v2.19/server-post-req.json rename to doc/api_samples/servers/v2.19/server-create-req.json diff --git a/doc/api_samples/servers/v2.19/server-post-resp.json b/doc/api_samples/servers/v2.19/server-create-resp.json similarity index 100% rename from doc/api_samples/servers/v2.19/server-post-resp.json rename to doc/api_samples/servers/v2.19/server-create-resp.json diff --git a/doc/api_samples/servers/v2.9/server-get-resp.json b/doc/api_samples/servers/v2.9/server-get-resp.json index 2e3c7b3b8a6d..c92ff85fd581 100644 --- a/doc/api_samples/servers/v2.9/server-get-resp.json +++ b/doc/api_samples/servers/v2.9/server-get-resp.json @@ -60,7 +60,7 @@ "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:hostname": "fake-hostname", "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-SRV-ATTR:user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", diff --git a/doc/api_samples/servers/v2.9/servers-details-resp.json b/doc/api_samples/servers/v2.9/servers-details-resp.json index a944c304ebdf..4c9768dbe7b8 100644 --- a/doc/api_samples/servers/v2.9/servers-details-resp.json +++ b/doc/api_samples/servers/v2.9/servers-details-resp.json @@ -61,7 +61,7 @@ "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:hostname": "fake-hostname", "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-SRV-ATTR:user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", diff --git a/nova/tests/functional/api_sample_tests/api_sample_base.py b/nova/tests/functional/api_sample_tests/api_sample_base.py index 74b66fa1652b..9a5a9a0aa2fa 100644 --- a/nova/tests/functional/api_sample_tests/api_sample_base.py +++ b/nova/tests/functional/api_sample_tests/api_sample_base.py @@ -61,7 +61,6 @@ class ApiSampleTestBaseV21(testscenarios.WithScenarios, # any additional fixtures needed for this scenario _additional_fixtures = [] sample_dir = None - extra_extensions_to_load = None _project_id = True scenarios = [ @@ -83,18 +82,6 @@ class ApiSampleTestBaseV21(testscenarios.WithScenarios, self.flags(use_ipv6=False, osapi_compute_link_prefix=self._get_host(), osapi_glance_link_prefix=self._get_glance_host()) - if not self.all_extensions: - # Set the whitelist to ensure only the extensions we are - # interested in are loaded so the api samples don't include - # data from extensions we are not interested in - whitelist = API_V21_CORE_EXTENSIONS.copy() - if self.extension_name: - whitelist.add(self.extension_name) - if self.extra_extensions_to_load: - whitelist.update(set(self.extra_extensions_to_load)) - - CONF.set_override('extensions_whitelist', whitelist, - 'osapi_v21') # load any additional fixtures specified by the scenario for fix in self._additional_fixtures: diff --git a/nova/tests/functional/api_sample_tests/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 deleted file mode 100644 index 0815c7ab869c..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp-v2.json.tpl +++ /dev/null @@ -1,724 +0,0 @@ -{ - "extensions": [ - { - "alias": "NMN", - "description": "%(text)s", - "links": [], - "name": "Multinic", - "namespace": "http://docs.openstack.org/compute/ext/multinic/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "OS-DCF", - "description": "%(text)s", - "links": [], - "name": "DiskConfig", - "namespace": "http://docs.openstack.org/compute/ext/disk_config/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "OS-EXT-AZ", - "description": "%(text)s", - "links": [], - "name": "ExtendedAvailabilityZone", - "namespace": "http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "OS-EXT-IPS", - "description": "%(text)s", - "links": [], - "name": "ExtendedIps", - "namespace": "http://docs.openstack.org/compute/ext/extended_ips/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "OS-EXT-IPS-MAC", - "description": "%(text)s", - "links": [], - "name": "ExtendedIpsMac", - "namespace": "http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "OS-EXT-IMG-SIZE", - "description": "%(text)s", - "links": [], - "name": "ImageSize", - "namespace": "http://docs.openstack.org/compute/ext/image_size/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "OS-EXT-SRV-ATTR", - "description": "%(text)s", - "links": [], - "name": "ExtendedServerAttributes", - "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "OS-EXT-STS", - "description": "%(text)s", - "links": [], - "name": "ExtendedStatus", - "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-extended-volumes", - "description": "%(text)s", - "links": [], - "name": "ExtendedVolumes", - "namespace": "http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "OS-EXT-VIF-NET", - "description": "%(text)s", - "links": [], - "name": "ExtendedVIFNet", - "namespace": "http://docs.openstack.org/compute/ext/extended-virtual-interfaces-net/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "OS-FLV-DISABLED", - "description": "%(text)s", - "links": [], - "name": "FlavorDisabled", - "namespace": "http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "OS-FLV-EXT-DATA", - "description": "%(text)s", - "links": [], - "name": "FlavorExtraData", - "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "OS-SRV-USG", - "description": "%(text)s", - "links": [], - "name": "ServerUsage", - "namespace": "http://docs.openstack.org/compute/ext/server_usage/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-console-auth-tokens", - "description": "%(text)s", - "links": [], - "name": "ConsoleAuthTokens", - "namespace": "http://docs.openstack.org/compute/ext/consoles-auth-tokens/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "OS-SCH-HNT", - "description": "%(text)s", - "links": [], - "name": "SchedulerHints", - "namespace": "http://docs.openstack.org/compute/ext/scheduler-hints/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-admin-actions", - "description": "%(text)s", - "links": [], - "name": "AdminActions", - "namespace": "http://docs.openstack.org/compute/ext/admin-actions/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-aggregates", - "description": "%(text)s", - "links": [], - "name": "Aggregates", - "namespace": "http://docs.openstack.org/compute/ext/aggregates/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-agents", - "description": "%(text)s", - "links": [], - "name": "Agents", - "namespace": "http://docs.openstack.org/compute/ext/agents/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-assisted-volume-snapshots", - "description": "%(text)s", - "links": [], - "name": "AssistedVolumeSnapshots", - "namespace": "http://docs.openstack.org/compute/ext/assisted-volume-snapshots/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-attach-interfaces", - "description": "Attach interface support.", - "links": [], - "name": "AttachInterfaces", - "namespace": "http://docs.openstack.org/compute/ext/interfaces/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-availability-zone", - "description": "%(text)s", - "links": [], - "name": "AvailabilityZone", - "namespace": "http://docs.openstack.org/compute/ext/availabilityzone/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-baremetal-nodes", - "description": "%(text)s", - "links": [], - "name": "BareMetalNodes", - "namespace": "http://docs.openstack.org/compute/ext/baremetal_nodes/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-block-device-mapping-v2-boot", - "description": "%(text)s", - "links": [], - "name": "BlockDeviceMappingV2Boot", - "namespace": "http://docs.openstack.org/compute/ext/block_device_mapping_v2_boot/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-cells", - "description": "%(text)s", - "links": [], - "name": "Cells", - "namespace": "http://docs.openstack.org/compute/ext/cells/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-cell-capacities", - "description": "%(text)s", - "links": [], - "name": "CellCapacities", - "namespace": "http://docs.openstack.org/compute/ext/cell_capacities/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-certificates", - "description": "%(text)s", - "links": [], - "name": "Certificates", - "namespace": "http://docs.openstack.org/compute/ext/certificates/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-cloudpipe", - "description": "%(text)s", - "links": [], - "name": "Cloudpipe", - "namespace": "http://docs.openstack.org/compute/ext/cloudpipe/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-cloudpipe-update", - "description": "%(text)s", - "links": [], - "name": "CloudpipeUpdate", - "namespace": "http://docs.openstack.org/compute/ext/cloudpipe-update/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-config-drive", - "description": "%(text)s", - "links": [], - "name": "ConfigDrive", - "namespace": "http://docs.openstack.org/compute/ext/config_drive/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-console-output", - "description": "%(text)s", - "links": [], - "name": "ConsoleOutput", - "namespace": "http://docs.openstack.org/compute/ext/os-console-output/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-consoles", - "description": "%(text)s", - "links": [], - "name": "Consoles", - "namespace": "http://docs.openstack.org/compute/ext/os-consoles/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-create-server-ext", - "description": "%(text)s", - "links": [], - "name": "Createserverext", - "namespace": "http://docs.openstack.org/compute/ext/createserverext/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-deferred-delete", - "description": "%(text)s", - "links": [], - "name": "DeferredDelete", - "namespace": "http://docs.openstack.org/compute/ext/deferred-delete/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-evacuate", - "description": "%(text)s", - "links": [], - "name": "Evacuate", - "namespace": "http://docs.openstack.org/compute/ext/evacuate/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-extended-floating-ips", - "description": "%(text)s", - "links": [], - "name": "ExtendedFloatingIps", - "namespace": "http://docs.openstack.org/compute/ext/extended_floating_ips/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-fixed-ips", - "description": "Fixed IPs support.", - "links": [], - "name": "FixedIPs", - "namespace": "http://docs.openstack.org/compute/ext/fixed_ips/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-flavor-access", - "description": "%(text)s", - "links": [], - "name": "FlavorAccess", - "namespace": "http://docs.openstack.org/compute/ext/flavor_access/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-flavor-extra-specs", - "description": "%(text)s", - "links": [], - "name": "FlavorExtraSpecs", - "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_specs/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-flavor-manage", - "description": "%(text)s", - "links": [], - "name": "FlavorManage", - "namespace": "http://docs.openstack.org/compute/ext/flavor_manage/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-flavor-rxtx", - "description": "%(text)s", - "links": [], - "name": "FlavorRxtx", - "namespace": "http://docs.openstack.org/compute/ext/flavor_rxtx/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-flavor-swap", - "description": "%(text)s", - "links": [], - "name": "FlavorSwap", - "namespace": "http://docs.openstack.org/compute/ext/flavor_swap/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-floating-ip-dns", - "description": "%(text)s", - "links": [], - "name": "FloatingIpDns", - "namespace": "http://docs.openstack.org/ext/floating_ip_dns/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-floating-ip-pools", - "description": "%(text)s", - "links": [], - "name": "FloatingIpPools", - "namespace": "http://docs.openstack.org/compute/ext/floating_ip_pools/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-floating-ips", - "description": "%(text)s", - "links": [], - "name": "FloatingIps", - "namespace": "http://docs.openstack.org/compute/ext/floating_ips/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-floating-ips-bulk", - "description": "%(text)s", - "links": [], - "name": "FloatingIpsBulk", - "namespace": "http://docs.openstack.org/compute/ext/floating_ips_bulk/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-hide-server-addresses", - "description": "Support hiding server addresses in certain states.", - "links": [], - "name": "HideServerAddresses", - "namespace": "http://docs.openstack.org/compute/ext/hide_server_addresses/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-hosts", - "description": "%(text)s", - "links": [], - "name": "Hosts", - "namespace": "http://docs.openstack.org/compute/ext/hosts/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-services", - "description": "%(text)s", - "links": [], - "name": "Services", - "namespace": "http://docs.openstack.org/compute/ext/services/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-extended-services", - "description": "%(text)s", - "links": [], - "name": "ExtendedServices", - "namespace": "http://docs.openstack.org/compute/ext/extended_services/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-fping", - "description": "%(text)s", - "links": [], - "name": "Fping", - "namespace": "http://docs.openstack.org/compute/ext/fping/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-hypervisors", - "description": "%(text)s", - "links": [], - "name": "Hypervisors", - "namespace": "http://docs.openstack.org/compute/ext/hypervisors/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-extended-hypervisors", - "description": "%(text)s", - "links": [], - "name": "ExtendedHypervisors", - "namespace": "http://docs.openstack.org/compute/ext/extended_hypervisors/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-hypervisor-status", - "description": "%(text)s", - "links": [], - "name": "HypervisorStatus", - "namespace": "http://docs.openstack.org/compute/ext/hypervisor_status/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-server-external-events", - "description": "%(text)s", - "links": [], - "name": "ServerExternalEvents", - "namespace": "http://docs.openstack.org/compute/ext/server-external-events/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-instance_usage_audit_log", - "description": "%(text)s", - "links": [], - "name": "OSInstanceUsageAuditLog", - "namespace": "http://docs.openstack.org/ext/services/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-keypairs", - "description": "%(text)s", - "links": [], - "name": "Keypairs", - "namespace": "http://docs.openstack.org/compute/ext/keypairs/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-multiple-create", - "description": "%(text)s", - "links": [], - "name": "MultipleCreate", - "namespace": "http://docs.openstack.org/compute/ext/multiplecreate/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-networks", - "description": "%(text)s", - "links": [], - "name": "Networks", - "namespace": "http://docs.openstack.org/compute/ext/os-networks/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-tenant-networks", - "description": "%(text)s", - "links": [], - "name": "OSTenantNetworks", - "namespace": "http://docs.openstack.org/compute/ext/os-tenant-networks/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-networks-associate", - "description": "%(text)s", - "links": [], - "name": "NetworkAssociationSupport", - "namespace": "http://docs.openstack.org/compute/ext/networks_associate/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-quota-class-sets", - "description": "%(text)s", - "links": [], - "name": "QuotaClasses", - "namespace": "http://docs.openstack.org/compute/ext/quota-classes-sets/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-extended-networks", - "description": "%(text)s", - "links": [], - "name": "ExtendedNetworks", - "namespace": "http://docs.openstack.org/compute/ext/extended_networks/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-extended-quotas", - "description": "%(text)s", - "links": [], - "name": "ExtendedQuotas", - "namespace": "http://docs.openstack.org/compute/ext/extended_quotas/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-quota-sets", - "description": "%(text)s", - "links": [], - "name": "Quotas", - "namespace": "http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-user-quotas", - "description": "%(text)s", - "links": [], - "name": "UserQuotas", - "namespace": "http://docs.openstack.org/compute/ext/user_quotas/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-rescue", - "description": "%(text)s", - "links": [], - "name": "Rescue", - "namespace": "http://docs.openstack.org/compute/ext/rescue/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-extended-rescue-with-image", - "description": "%(text)s", - "links": [], - "name": "ExtendedRescueWithImage", - "namespace": "http://docs.openstack.org/compute/ext/extended_rescue_with_image/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-security-group-default-rules", - "description": "%(text)s", - "links": [], - "name": "SecurityGroupDefaultRules", - "namespace": "http://docs.openstack.org/compute/ext/securitygroupdefaultrules/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-security-groups", - "description": "%(text)s", - "links": [], - "name": "SecurityGroups", - "namespace": "http://docs.openstack.org/compute/ext/securitygroups/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-server-diagnostics", - "description": "%(text)s", - "links": [], - "name": "ServerDiagnostics", - "namespace": "http://docs.openstack.org/compute/ext/server-diagnostics/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-server-list-multi-status", - "description": "%(text)s", - "links": [], - "name": "ServerListMultiStatus", - "namespace": "http://docs.openstack.org/compute/ext/os-server-list-multi-status/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-server-password", - "description": "%(text)s", - "links": [], - "name": "ServerPassword", - "namespace": "http://docs.openstack.org/compute/ext/server-password/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-server-start-stop", - "description": "%(text)s", - "links": [], - "name": "ServerStartStop", - "namespace": "http://docs.openstack.org/compute/ext/servers/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-shelve", - "description": "%(text)s", - "links": [], - "name": "Shelve", - "namespace": "http://docs.openstack.org/compute/ext/shelve/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-simple-tenant-usage", - "description": "%(text)s", - "links": [], - "name": "SimpleTenantUsage", - "namespace": "http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-used-limits", - "description": "%(text)s", - "links": [], - "name": "UsedLimits", - "namespace": "http://docs.openstack.org/compute/ext/used_limits/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-used-limits-for-admin", - "description": "%(text)s", - "links": [], - "name": "UsedLimitsForAdmin", - "namespace": "http://docs.openstack.org/compute/ext/used_limits_for_admin/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-user-data", - "description": "%(text)s", - "links": [], - "name": "UserData", - "namespace": "http://docs.openstack.org/compute/ext/userdata/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-virtual-interfaces", - "description": "%(text)s", - "links": [], - "name": "VirtualInterfaces", - "namespace": "http://docs.openstack.org/compute/ext/virtual_interfaces/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-volume-attachment-update", - "description": "%(text)s", - "links": [], - "name": "VolumeAttachmentUpdate", - "namespace": "http://docs.openstack.org/compute/ext/os-volume-attachment-update/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-volumes", - "description": "%(text)s", - "links": [], - "name": "Volumes", - "namespace": "http://docs.openstack.org/compute/ext/volumes/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-instance-actions", - "description": "%(text)s", - "links": [], - "name": "InstanceActions", - "namespace": "http://docs.openstack.org/compute/ext/instance-actions/api/v1.1", - "updated": "%(isotime)s" - }, - { - "alias": "os-migrations", - "description": "%(text)s", - "links": [], - "name": "Migrations", - "namespace": "http://docs.openstack.org/compute/ext/migrations/api/v2.0", - "updated": "%(isotime)s" - }, - { - "alias": "os-baremetal-ext-status", - "description": "%(text)s", - "links": [], - "name": "BareMetalExtStatus", - "namespace": "http://docs.openstack.org/compute/ext/baremetal_ext_status/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-preserve-ephemeral-rebuild", - "description": "%(text)s", - "links": [], - "name": "PreserveEphemeralOnRebuild", - "namespace": "http://docs.openstack.org/compute/ext/preserve_ephemeral_rebuild/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-extended-services-delete", - "description": "%(text)s", - "links": [], - "name": "ExtendedServicesDelete", - "namespace": "http://docs.openstack.org/compute/ext/extended_services_delete/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-server-groups", - "description": "%(text)s", - "links": [], - "name": "ServerGroups", - "namespace": "http://docs.openstack.org/compute/ext/servergroups/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-extended-evacuate-find-host", - "description": "%(text)s", - "links": [], - "name": "ExtendedEvacuateFindHost", - "namespace": "http://docs.openstack.org/compute/ext/extended_evacuate_find_host/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-server-group-quotas", - "description": "%(text)s", - "links": [], - "name": "ServerGroupQuotas", - "namespace": "http://docs.openstack.org/compute/ext/server-group-quotas/api/v2", - "updated": "%(isotime)s" - }, - { - "alias": "os-server-sort-keys", - "description": "%(text)s", - "links": [], - "name": "ServerSortKeys", - "namespace": "http://docs.openstack.org/compute/ext/server_sort_keys/api/v2", - "updated": "%(isotime)s" - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp-v21-compatible.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp-v21-compatible.json.tpl deleted file mode 100644 index 0b2afb608505..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp-v21-compatible.json.tpl +++ /dev/null @@ -1,804 +0,0 @@ -{ - "extensions": [ - { - "alias": "NMN", - "description": "Multiple network support.", - "links": [], - "name": "Multinic", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-DCF", - "description": "Disk Management Extension.", - "links": [], - "name": "DiskConfig", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-AZ", - "description": "Extended Availability Zone support.", - "links": [], - "name": "ExtendedAvailabilityZone", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-IMG-SIZE", - "description": "Adds image size to image listings.", - "links": [], - "name": "ImageSize", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-IPS", - "description": "", - "links": [], - "name": "ExtendedIps", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-IPS-MAC", - "description": "", - "links": [], - "name": "ExtendedIpsMac", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-SRV-ATTR", - "description": "Extended Server Attributes support.", - "links": [], - "name": "ExtendedServerAttributes", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-STS", - "description": "", - "links": [], - "name": "ExtendedStatus", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-VIF-NET", - "description": "", - "links": [], - "name": "ExtendedVIFNet", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-FLV-DISABLED", - "description": "", - "links": [], - "name": "FlavorDisabled", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-FLV-EXT-DATA", - "description": "", - "links": [], - "name": "FlavorExtraData", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-SCH-HNT", - "description": "Pass arbitrary key/value pairs to the scheduler.", - "links": [], - "name": "SchedulerHints", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-SRV-USG", - "description": "Adds launched_at and terminated_at on Servers.", - "links": [], - "name": "ServerUsage", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-access-ips", - "description": "Access IPs support.", - "links": [], - "name": "AccessIPs", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-admin-actions", - "description": "Enable admin-only server actions\n\n Actions include: resetNetwork, injectNetworkInfo, os-resetState\n ", - "links": [], - "name": "AdminActions", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-admin-password", - "description": "Admin password management support.", - "links": [], - "name": "AdminPassword", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-agents", - "description": "Agents support.", - "links": [], - "name": "Agents", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-aggregates", - "description": "Admin-only aggregate administration.", - "links": [], - "name": "Aggregates", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-assisted-volume-snapshots", - "description": "Assisted volume snapshots.", - "links": [], - "name": "AssistedVolumeSnapshots", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-attach-interfaces", - "description": "Attach interface support.", - "links": [], - "name": "AttachInterfaces", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-availability-zone", - "description": "1. Add availability_zone to the Create Server API.\n 2. Add availability zones describing.\n ", - "links": [], - "name": "AvailabilityZone", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-baremetal-ext-status", - "description": "", - "links": [], - "name": "BareMetalExtStatus", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-baremetal-nodes", - "description": "Admin-only bare-metal node administration.", - "links": [], - "name": "BareMetalNodes", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-block-device-mapping", - "description": "Block device mapping boot support.", - "links": [], - "name": "BlockDeviceMapping", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-block-device-mapping-v2-boot", - "description": "", - "links": [], - "name": "BlockDeviceMappingV2Boot", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-cell-capacities", - "description": "", - "links": [], - "name": "CellCapacities", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-cells", - "description": "Enables cells-related functionality such as adding neighbor cells,\n listing neighbor cells, and getting the capabilities of the local cell.\n ", - "links": [], - "name": "Cells", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-certificates", - "description": "Certificates support.", - "links": [], - "name": "Certificates", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-cloudpipe", - "description": "Adds actions to create cloudpipe instances.\n\n When running with the Vlan network mode, you need a mechanism to route\n from the public Internet to your vlans. This mechanism is known as a\n cloudpipe.\n\n At the time of creating this class, only OpenVPN is supported. Support for\n a SSH Bastion host is forthcoming.\n ", - "links": [], - "name": "Cloudpipe", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-cloudpipe-update", - "description": "", - "links": [], - "name": "CloudpipeUpdate", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-config-drive", - "description": "Config Drive Extension.", - "links": [], - "name": "ConfigDrive", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-console-auth-tokens", - "description": "Console token authentication support.", - "links": [], - "name": "ConsoleAuthTokens", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-console-output", - "description": "Console log output support, with tailing ability.", - "links": [], - "name": "ConsoleOutput", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-consoles", - "description": "Interactive Console support.", - "links": [], - "name": "Consoles", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-create-backup", - "description": "Create a backup of a server.", - "links": [], - "name": "CreateBackup", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-create-server-ext", - "description": "", - "links": [], - "name": "Createserverext", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-deferred-delete", - "description": "Instance deferred delete.", - "links": [], - "name": "DeferredDelete", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-evacuate", - "description": "Enables server evacuation.", - "links": [], - "name": "Evacuate", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-evacuate-find-host", - "description": "", - "links": [], - "name": "ExtendedEvacuateFindHost", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-floating-ips", - "description": "", - "links": [], - "name": "ExtendedFloatingIps", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-hypervisors", - "description": "", - "links": [], - "name": "ExtendedHypervisors", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-networks", - "description": "", - "links": [], - "name": "ExtendedNetworks", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-quotas", - "description": "", - "links": [], - "name": "ExtendedQuotas", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-rescue-with-image", - "description": "", - "links": [], - "name": "ExtendedRescueWithImage", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-services", - "description": "", - "links": [], - "name": "ExtendedServices", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-services-delete", - "description": "", - "links": [], - "name": "ExtendedServicesDelete", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-status", - "description": "Extended Status support.", - "links": [], - "name": "ExtendedStatus", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-volumes", - "description": "Extended Volumes support.", - "links": [], - "name": "ExtendedVolumes", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-fixed-ips", - "description": "Fixed IPs support.", - "links": [], - "name": "FixedIPs", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-flavor-access", - "description": "Flavor access support.", - "links": [], - "name": "FlavorAccess", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-flavor-extra-specs", - "description": "Flavors extra specs support.", - "links": [], - "name": "FlavorExtraSpecs", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-flavor-manage", - "description": "Flavor create/delete API support.", - "links": [], - "name": "FlavorManage", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-flavor-rxtx", - "description": "Support to show the rxtx status of a flavor.", - "links": [], - "name": "FlavorRxtx", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-flavor-swap", - "description": "", - "links": [], - "name": "FlavorSwap", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-floating-ip-dns", - "description": "Floating IP DNS support.", - "links": [], - "name": "FloatingIpDns", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-floating-ip-pools", - "description": "Floating IPs support.", - "links": [], - "name": "FloatingIpPools", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-floating-ips", - "description": "Floating IPs support.", - "links": [], - "name": "FloatingIps", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-floating-ips-bulk", - "description": "Bulk handling of Floating IPs.", - "links": [], - "name": "FloatingIpsBulk", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-fping", - "description": "Fping Management Extension.", - "links": [], - "name": "Fping", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-hide-server-addresses", - "description": "Support hiding server addresses in certain states.", - "links": [], - "name": "HideServerAddresses", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-hosts", - "description": "Admin-only host administration.", - "links": [], - "name": "Hosts", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-hypervisor-status", - "description": "", - "links": [], - "name": "HypervisorStatus", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-hypervisors", - "description": "Admin-only hypervisor administration.", - "links": [], - "name": "Hypervisors", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-instance-actions", - "description": "View a log of actions and events taken on an instance.", - "links": [], - "name": "InstanceActions", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-instance_usage_audit_log", - "description": "Admin-only Task Log Monitoring.", - "links": [], - "name": "OSInstanceUsageAuditLog", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-keypairs", - "description": "Keypair Support.", - "links": [], - "name": "Keypairs", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-lock-server", - "description": "Enable lock/unlock server actions.", - "links": [], - "name": "LockServer", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-migrate-server", - "description": "Enable migrate and live-migrate server actions.", - "links": [], - "name": "MigrateServer", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-migrations", - "description": "Provide data on migrations.", - "links": [], - "name": "Migrations", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-multiple-create", - "description": "Allow multiple create in the Create Server v2.1 API.", - "links": [], - "name": "MultipleCreate", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-networks", - "description": "Admin-only Network Management Extension.", - "links": [], - "name": "Networks", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-networks-associate", - "description": "Network association support.", - "links": [], - "name": "NetworkAssociationSupport", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-pause-server", - "description": "Enable pause/unpause server actions.", - "links": [], - "name": "PauseServer", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-personality", - "description": "Personality support.", - "links": [], - "name": "Personality", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-preserve-ephemeral-rebuild", - "description": "Allow preservation of the ephemeral partition on rebuild.", - "links": [], - "name": "PreserveEphemeralOnRebuild", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-quota-class-sets", - "description": "Quota classes management support.", - "links": [], - "name": "QuotaClasses", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-quota-sets", - "description": "Quotas management support.", - "links": [], - "name": "Quotas", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-rescue", - "description": "Instance rescue mode.", - "links": [], - "name": "Rescue", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-security-group-default-rules", - "description": "Default rules for security group support.", - "links": [], - "name": "SecurityGroupDefaultRules", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-security-groups", - "description": "Security group support.", - "links": [], - "name": "SecurityGroups", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-diagnostics", - "description": "Allow Admins to view server diagnostics through server action.", - "links": [], - "name": "ServerDiagnostics", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-external-events", - "description": "Server External Event Triggers.", - "links": [], - "name": "ServerExternalEvents", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-group-quotas", - "description": "", - "links": [], - "name": "ServerGroupQuotas", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-groups", - "description": "Server group support.", - "links": [], - "name": "ServerGroups", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-list-multi-status", - "description": "", - "links": [], - "name": "ServerListMultiStatus", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-password", - "description": "Server password support.", - "links": [], - "name": "ServerPassword", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-sort-keys", - "description": "", - "links": [], - "name": "ServerSortKeys", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-start-stop", - "description": "", - "links": [], - "name": "ServerStartStop", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-services", - "description": "Services support.", - "links": [], - "name": "Services", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-shelve", - "description": "Instance shelve mode.", - "links": [], - "name": "Shelve", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-simple-tenant-usage", - "description": "Simple tenant usage extension.", - "links": [], - "name": "SimpleTenantUsage", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-suspend-server", - "description": "Enable suspend/resume server actions.", - "links": [], - "name": "SuspendServer", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-tenant-networks", - "description": "Tenant-based Network Management Extension.", - "links": [], - "name": "OSTenantNetworks", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-used-limits", - "description": "Provide data on limited resources that are being used.", - "links": [], - "name": "UsedLimits", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-used-limits-for-admin", - "description": "", - "links": [], - "name": "UsedLimitsForAdmin", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-user-data", - "description": "Add user_data to the Create Server API.", - "links": [], - "name": "UserData", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-user-quotas", - "description": "", - "links": [], - "name": "UserQuotas", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-virtual-interfaces", - "description": "Virtual interface support.", - "links": [], - "name": "VirtualInterfaces", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-volume-attachment-update", - "description": "", - "links": [], - "name": "VolumeAttachmentUpdate", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-volumes", - "description": "Volumes support.", - "links": [], - "name": "Volumes", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/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 deleted file mode 100644 index 9bfd5b0884c0..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/extensions-list-resp.json.tpl +++ /dev/null @@ -1,796 +0,0 @@ -{ - "extensions": [ - { - "alias": "NMN", - "description": "Multiple network support.", - "links": [], - "name": "Multinic", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-DCF", - "description": "Disk Management Extension.", - "links": [], - "name": "DiskConfig", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-AZ", - "description": "Extended Availability Zone support.", - "links": [], - "name": "ExtendedAvailabilityZone", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-IMG-SIZE", - "description": "Adds image size to image listings.", - "links": [], - "name": "ImageSize", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-IPS", - "description": "", - "links": [], - "name": "ExtendedIps", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-IPS-MAC", - "description": "", - "links": [], - "name": "ExtendedIpsMac", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-SRV-ATTR", - "description": "Extended Server Attributes support.", - "links": [], - "name": "ExtendedServerAttributes", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-EXT-STS", - "description": "", - "links": [], - "name": "ExtendedStatus", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-FLV-DISABLED", - "description": "", - "links": [], - "name": "FlavorDisabled", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-FLV-EXT-DATA", - "description": "", - "links": [], - "name": "FlavorExtraData", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-SCH-HNT", - "description": "Pass arbitrary key/value pairs to the scheduler.", - "links": [], - "name": "SchedulerHints", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "OS-SRV-USG", - "description": "Adds launched_at and terminated_at on Servers.", - "links": [], - "name": "ServerUsage", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-access-ips", - "description": "Access IPs support.", - "links": [], - "name": "AccessIPs", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-admin-actions", - "description": "Enable admin-only server actions\n\n Actions include: resetNetwork, injectNetworkInfo, os-resetState\n ", - "links": [], - "name": "AdminActions", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-admin-password", - "description": "Admin password management support.", - "links": [], - "name": "AdminPassword", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-agents", - "description": "Agents support.", - "links": [], - "name": "Agents", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-aggregates", - "description": "Admin-only aggregate administration.", - "links": [], - "name": "Aggregates", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-assisted-volume-snapshots", - "description": "Assisted volume snapshots.", - "links": [], - "name": "AssistedVolumeSnapshots", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-attach-interfaces", - "description": "Attach interface support.", - "links": [], - "name": "AttachInterfaces", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-availability-zone", - "description": "1. Add availability_zone to the Create Server API.\n 2. Add availability zones describing.\n ", - "links": [], - "name": "AvailabilityZone", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-baremetal-ext-status", - "description": "", - "links": [], - "name": "BareMetalExtStatus", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-baremetal-nodes", - "description": "Admin-only bare-metal node administration.", - "links": [], - "name": "BareMetalNodes", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-block-device-mapping", - "description": "Block device mapping boot support.", - "links": [], - "name": "BlockDeviceMapping", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-block-device-mapping-v2-boot", - "description": "", - "links": [], - "name": "BlockDeviceMappingV2Boot", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-cell-capacities", - "description": "", - "links": [], - "name": "CellCapacities", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-cells", - "description": "Enables cells-related functionality such as adding neighbor cells,\n listing neighbor cells, and getting the capabilities of the local cell.\n ", - "links": [], - "name": "Cells", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-certificates", - "description": "Certificates support.", - "links": [], - "name": "Certificates", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-cloudpipe", - "description": "Adds actions to create cloudpipe instances.\n\n When running with the Vlan network mode, you need a mechanism to route\n from the public Internet to your vlans. This mechanism is known as a\n cloudpipe.\n\n At the time of creating this class, only OpenVPN is supported. Support for\n a SSH Bastion host is forthcoming.\n ", - "links": [], - "name": "Cloudpipe", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-cloudpipe-update", - "description": "", - "links": [], - "name": "CloudpipeUpdate", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-config-drive", - "description": "Config Drive Extension.", - "links": [], - "name": "ConfigDrive", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-console-auth-tokens", - "description": "Console token authentication support.", - "links": [], - "name": "ConsoleAuthTokens", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-console-output", - "description": "Console log output support, with tailing ability.", - "links": [], - "name": "ConsoleOutput", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-consoles", - "description": "Interactive Console support.", - "links": [], - "name": "Consoles", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-create-backup", - "description": "Create a backup of a server.", - "links": [], - "name": "CreateBackup", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-create-server-ext", - "description": "", - "links": [], - "name": "Createserverext", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-deferred-delete", - "description": "Instance deferred delete.", - "links": [], - "name": "DeferredDelete", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-evacuate", - "description": "Enables server evacuation.", - "links": [], - "name": "Evacuate", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-evacuate-find-host", - "description": "", - "links": [], - "name": "ExtendedEvacuateFindHost", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-floating-ips", - "description": "", - "links": [], - "name": "ExtendedFloatingIps", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-hypervisors", - "description": "", - "links": [], - "name": "ExtendedHypervisors", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-networks", - "description": "", - "links": [], - "name": "ExtendedNetworks", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-quotas", - "description": "", - "links": [], - "name": "ExtendedQuotas", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-rescue-with-image", - "description": "", - "links": [], - "name": "ExtendedRescueWithImage", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-services", - "description": "", - "links": [], - "name": "ExtendedServices", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-services-delete", - "description": "", - "links": [], - "name": "ExtendedServicesDelete", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-status", - "description": "Extended Status support.", - "links": [], - "name": "ExtendedStatus", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-extended-volumes", - "description": "Extended Volumes support.", - "links": [], - "name": "ExtendedVolumes", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-fixed-ips", - "description": "Fixed IPs support.", - "links": [], - "name": "FixedIPs", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-flavor-access", - "description": "Flavor access support.", - "links": [], - "name": "FlavorAccess", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-flavor-extra-specs", - "description": "Flavors extra specs support.", - "links": [], - "name": "FlavorExtraSpecs", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-flavor-manage", - "description": "Flavor create/delete API support.", - "links": [], - "name": "FlavorManage", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-flavor-rxtx", - "description": "Support to show the rxtx status of a flavor.", - "links": [], - "name": "FlavorRxtx", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-flavor-swap", - "description": "", - "links": [], - "name": "FlavorSwap", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-floating-ip-dns", - "description": "Floating IP DNS support.", - "links": [], - "name": "FloatingIpDns", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-floating-ip-pools", - "description": "Floating IPs support.", - "links": [], - "name": "FloatingIpPools", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-floating-ips", - "description": "Floating IPs support.", - "links": [], - "name": "FloatingIps", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-floating-ips-bulk", - "description": "Bulk handling of Floating IPs.", - "links": [], - "name": "FloatingIpsBulk", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-fping", - "description": "Fping Management Extension.", - "links": [], - "name": "Fping", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-hide-server-addresses", - "description": "Support hiding server addresses in certain states.", - "links": [], - "name": "HideServerAddresses", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-hosts", - "description": "Admin-only host administration.", - "links": [], - "name": "Hosts", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-hypervisor-status", - "description": "", - "links": [], - "name": "HypervisorStatus", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-hypervisors", - "description": "Admin-only hypervisor administration.", - "links": [], - "name": "Hypervisors", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-instance-actions", - "description": "View a log of actions and events taken on an instance.", - "links": [], - "name": "InstanceActions", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-instance_usage_audit_log", - "description": "Admin-only Task Log Monitoring.", - "links": [], - "name": "OSInstanceUsageAuditLog", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-keypairs", - "description": "Keypair Support.", - "links": [], - "name": "Keypairs", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-lock-server", - "description": "Enable lock/unlock server actions.", - "links": [], - "name": "LockServer", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-migrate-server", - "description": "Enable migrate and live-migrate server actions.", - "links": [], - "name": "MigrateServer", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-migrations", - "description": "Provide data on migrations.", - "links": [], - "name": "Migrations", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-multiple-create", - "description": "Allow multiple create in the Create Server v2.1 API.", - "links": [], - "name": "MultipleCreate", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-networks", - "description": "Admin-only Network Management Extension.", - "links": [], - "name": "Networks", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-networks-associate", - "description": "Network association support.", - "links": [], - "name": "NetworkAssociationSupport", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-pause-server", - "description": "Enable pause/unpause server actions.", - "links": [], - "name": "PauseServer", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-personality", - "description": "Personality support.", - "links": [], - "name": "Personality", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-preserve-ephemeral-rebuild", - "description": "Allow preservation of the ephemeral partition on rebuild.", - "links": [], - "name": "PreserveEphemeralOnRebuild", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-quota-class-sets", - "description": "Quota classes management support.", - "links": [], - "name": "QuotaClasses", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-quota-sets", - "description": "Quotas management support.", - "links": [], - "name": "Quotas", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-rescue", - "description": "Instance rescue mode.", - "links": [], - "name": "Rescue", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-security-group-default-rules", - "description": "Default rules for security group support.", - "links": [], - "name": "SecurityGroupDefaultRules", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-security-groups", - "description": "Security group support.", - "links": [], - "name": "SecurityGroups", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-diagnostics", - "description": "Allow Admins to view server diagnostics through server action.", - "links": [], - "name": "ServerDiagnostics", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-external-events", - "description": "Server External Event Triggers.", - "links": [], - "name": "ServerExternalEvents", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-group-quotas", - "description": "", - "links": [], - "name": "ServerGroupQuotas", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-groups", - "description": "Server group support.", - "links": [], - "name": "ServerGroups", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-list-multi-status", - "description": "", - "links": [], - "name": "ServerListMultiStatus", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-password", - "description": "Server password support.", - "links": [], - "name": "ServerPassword", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-sort-keys", - "description": "", - "links": [], - "name": "ServerSortKeys", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-server-start-stop", - "description": "", - "links": [], - "name": "ServerStartStop", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-services", - "description": "Services support.", - "links": [], - "name": "Services", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-shelve", - "description": "Instance shelve mode.", - "links": [], - "name": "Shelve", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-simple-tenant-usage", - "description": "Simple tenant usage extension.", - "links": [], - "name": "SimpleTenantUsage", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-suspend-server", - "description": "Enable suspend/resume server actions.", - "links": [], - "name": "SuspendServer", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-tenant-networks", - "description": "Tenant-based Network Management Extension.", - "links": [], - "name": "OSTenantNetworks", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-used-limits", - "description": "Provide data on limited resources that are being used.", - "links": [], - "name": "UsedLimits", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-used-limits-for-admin", - "description": "", - "links": [], - "name": "UsedLimitsForAdmin", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-user-data", - "description": "Add user_data to the Create Server API.", - "links": [], - "name": "UserData", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-user-quotas", - "description": "", - "links": [], - "name": "UserQuotas", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-virtual-interfaces", - "description": "Virtual interface support.", - "links": [], - "name": "VirtualInterfaces", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-volume-attachment-update", - "description": "", - "links": [], - "name": "VolumeAttachmentUpdate", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - }, - { - "alias": "os-volumes", - "description": "Volumes support.", - "links": [], - "name": "Volumes", - "namespace": "http://docs.openstack.org/compute/ext/fake_xml", - "updated": "2014-12-03T00:00:00Z" - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/limits/limit-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/limits/limit-get-resp.json.tpl index d1d8342fc083..049874a16259 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/limits/limit-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/limits/limit-get-resp.json.tpl @@ -13,7 +13,13 @@ "maxSecurityGroups": 10, "maxSecurityGroupRules": 20, "maxServerGroups": 10, - "maxServerGroupMembers": 10 + "maxServerGroupMembers": 10, + "totalCoresUsed": 0, + "totalInstancesUsed": 0, + "totalRAMUsed": 0, + "totalSecurityGroupsUsed": 0, + "totalFloatingIpsUsed": 0, + "totalServerGroupsUsed": 0 }, "rate": [] } diff --git a/nova/tests/functional/api_sample_tests/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 deleted file mode 100644 index 2e09d15a60a9..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-networks/networks-disassociate-req.json.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{ - "disassociate": null -} diff --git a/nova/tests/functional/api_sample_tests/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 deleted file mode 100644 index a85308a90e72..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{ - "server" : { - "name" : "new-server-test", - "imageRef" : "%(image_id)s", - "flavorRef" : "1" - }, - "OS-SCH-HNT:scheduler_hints": { - "same_host": "%(uuid)s" - } -} diff --git a/nova/tests/functional/api_sample_tests/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 deleted file mode 100644 index 5358868400cd..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "%(password)s", - "id": "%(id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/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 deleted file mode 100644 index d6a08a2c52eb..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-req.json.tpl +++ /dev/null @@ -1,13 +0,0 @@ -{ - "server" : { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "name" : "new-server-test", - "imageRef" : "%(image_id)s", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - }, - "security_groups": [{"name": "test"}] - } -} diff --git a/nova/tests/functional/api_sample_tests/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 deleted file mode 100644 index 30d21c96c49a..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "adminPass": "%(password)s", - "id": "%(id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ], - "security_groups": [{"name": "test"}] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl index 3b2273d99e37..7b375238a914 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl @@ -70,7 +70,7 @@ "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:hostname": "%(hostname)s", "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-SRV-ATTR:user_data": "%(user_data)s", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl index cc5137aa869d..127baf215d5f 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl @@ -69,7 +69,7 @@ "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:hostname": "%(hostname)s", "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-SRV-ATTR:user_data": "%(user_data)s", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", diff --git a/nova/tests/functional/api_sample_tests/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 deleted file mode 100644 index 28309af04c6c..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-used-limits/usedlimits-get-resp.json.tpl +++ /dev/null @@ -1,26 +0,0 @@ -{ - "limits": { - "absolute": { - "maxImageMeta": 128, - "maxPersonality": 5, - "maxPersonalitySize": 10240, - "maxSecurityGroupRules": 20, - "maxSecurityGroups": 10, - "maxServerMeta": 128, - "maxTotalCores": 20, - "maxTotalFloatingIps": 10, - "maxTotalInstances": 10, - "maxTotalKeypairs": 100, - "maxTotalRAMSize": 51200, - "maxServerGroups": 10, - "maxServerGroupMembers": 10, - "totalCoresUsed": 0, - "totalInstancesUsed": 0, - "totalRAMUsed": 0, - "totalSecurityGroupsUsed": 0, - "totalFloatingIpsUsed": 0, - "totalServerGroupsUsed": 0 - }, - "rate": [] - } -} diff --git a/nova/tests/functional/api_sample_tests/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 deleted file mode 100644 index a57dfae32df9..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-req.json.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{ - "server" : { - "name" : "new-server-test", - "imageRef" : "%(image_id)s", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - }, - "user_data" : "%(user_data)s" - } -} diff --git a/nova/tests/functional/api_sample_tests/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 deleted file mode 100644 index 5358868400cd..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-resp.json.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "%(password)s", - "id": "%(id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-create-req.json.tpl index 7cba81763e05..91ae7232ca3d 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-create-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-create-req.json.tpl @@ -20,6 +20,10 @@ { "name": "default" } - ] + ], + "user_data" : "%(user_data)s" + }, + "OS-SCH-HNT:scheduler_hints": { + "same_host": "%(uuid)s" } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-req.json.tpl deleted file mode 100644 index 25b6415890ba..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-req.json.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{ - "server" : { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "name" : "new-server-test", - "imageRef" : "%(image_id)s", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - } - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-resp.json.tpl deleted file mode 100644 index 5358868400cd..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-resp.json.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "%(password)s", - "id": "%(id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl index 91b8edd5f958..bcbfd47e9082 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl @@ -12,7 +12,7 @@ "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", "OS-EXT-SRV-ATTR:kernel_id": null, "OS-EXT-SRV-ATTR:ramdisk_id": null, - "OS-EXT-SRV-ATTR:user_data": null, + "OS-EXT-SRV-ATTR:user_data": "%(user_data)s", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", @@ -52,7 +52,7 @@ ] }, "hostId": "%(hostid)s", - "id": "%(uuid)s", + "id": "%(id)s", "image": { "id": "%(uuid)s", "links": [ diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl index 3b2f46fc129e..771b13fc14de 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl @@ -61,7 +61,7 @@ "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:hostname": "%(hostname)s", "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-SRV-ATTR:user_data": "%(user_data)s", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-create-req.json.tpl similarity index 100% rename from nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-create-req.json.tpl diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-create-resp.json.tpl diff --git a/nova/tests/functional/api_sample_tests/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 index ba03f39dd29f..3bac1e253ccb 100644 --- a/nova/tests/functional/api_sample_tests/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 @@ -60,7 +60,7 @@ "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:hostname": "%(hostname)s", "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-SRV-ATTR:user_data": "%(user_data)s", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", diff --git a/nova/tests/functional/api_sample_tests/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 index 08a41e47c802..341332c2d23a 100644 --- a/nova/tests/functional/api_sample_tests/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 @@ -61,7 +61,7 @@ "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:hostname": "%(hostname)s", "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-SRV-ATTR:user_data": "%(user_data)s", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", diff --git a/nova/tests/functional/api_sample_tests/test_admin_actions.py b/nova/tests/functional/api_sample_tests/test_admin_actions.py index b7c2e0872eee..aaa967a70781 100644 --- a/nova/tests/functional/api_sample_tests/test_admin_actions.py +++ b/nova/tests/functional/api_sample_tests/test_admin_actions.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import test_servers class AdminActionsSamplesJsonTest(test_servers.ServersSampleBase): - extension_name = "os-admin-actions" + sample_dir = "os-admin-actions" def setUp(self): """setUp Method for AdminActions api samples extension diff --git a/nova/tests/functional/api_sample_tests/test_admin_password.py b/nova/tests/functional/api_sample_tests/test_admin_password.py index e86408666a66..3c6e72271ea1 100644 --- a/nova/tests/functional/api_sample_tests/test_admin_password.py +++ b/nova/tests/functional/api_sample_tests/test_admin_password.py @@ -20,7 +20,7 @@ CONF = nova.conf.CONF class AdminPasswordJsonTest(test_servers.ServersSampleBase): - extension_name = 'os-admin-password' + sample_dir = 'os-admin-password' def test_server_password(self): uuid = self._post_server() diff --git a/nova/tests/functional/api_sample_tests/test_agents.py b/nova/tests/functional/api_sample_tests/test_agents.py index fa86c3449d1b..e22205d57068 100644 --- a/nova/tests/functional/api_sample_tests/test_agents.py +++ b/nova/tests/functional/api_sample_tests/test_agents.py @@ -19,7 +19,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class AgentsJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-agents" + sample_dir = "os-agents" def setUp(self): super(AgentsJsonTest, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_aggregates.py b/nova/tests/functional/api_sample_tests/test_aggregates.py index 43df18c575a5..0e1e79f1a16f 100644 --- a/nova/tests/functional/api_sample_tests/test_aggregates.py +++ b/nova/tests/functional/api_sample_tests/test_aggregates.py @@ -18,7 +18,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-aggregates" + sample_dir = "os-aggregates" def test_aggregate_create(self): subs = { diff --git a/nova/tests/functional/api_sample_tests/test_assisted_volume_snapshots.py b/nova/tests/functional/api_sample_tests/test_assisted_volume_snapshots.py index 8e571e5f168c..8de9e64da487 100644 --- a/nova/tests/functional/api_sample_tests/test_assisted_volume_snapshots.py +++ b/nova/tests/functional/api_sample_tests/test_assisted_volume_snapshots.py @@ -17,7 +17,7 @@ from nova.tests.unit.api.openstack import fakes class AssistedVolumeSnapshotsJsonTests(test_servers.ServersSampleBase): - extension_name = "os-assisted-volume-snapshots" + sample_dir = "os-assisted-volume-snapshots" def test_create(self): """Create a volume snapshots.""" diff --git a/nova/tests/functional/api_sample_tests/test_attach_interfaces.py b/nova/tests/functional/api_sample_tests/test_attach_interfaces.py index 4d6f374adc06..626a79063fd6 100644 --- a/nova/tests/functional/api_sample_tests/test_attach_interfaces.py +++ b/nova/tests/functional/api_sample_tests/test_attach_interfaces.py @@ -20,7 +20,7 @@ from nova.tests.unit import fake_network_cache_model class AttachInterfacesSampleJsonTest(test_servers.ServersSampleBase): - extension_name = 'os-attach-interfaces' + sample_dir = 'os-attach-interfaces' def setUp(self): super(AttachInterfacesSampleJsonTest, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_availability_zone.py b/nova/tests/functional/api_sample_tests/test_availability_zone.py index 2cc5caa0e181..688ec4422d04 100644 --- a/nova/tests/functional/api_sample_tests/test_availability_zone.py +++ b/nova/tests/functional/api_sample_tests/test_availability_zone.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import test_servers class AvailabilityZoneJsonTest(test_servers.ServersSampleBase): ADMIN_API = True - extension_name = "os-availability-zone" + sample_dir = "os-availability-zone" def test_availability_zone_list(self): response = self._do_get('os-availability-zone') diff --git a/nova/tests/functional/api_sample_tests/test_baremetal_nodes.py b/nova/tests/functional/api_sample_tests/test_baremetal_nodes.py index fd8e1e3080b2..59ef2496b54f 100644 --- a/nova/tests/functional/api_sample_tests/test_baremetal_nodes.py +++ b/nova/tests/functional/api_sample_tests/test_baremetal_nodes.py @@ -44,7 +44,7 @@ class fake_client(object): class BareMetalNodesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-baremetal-nodes" + sample_dir = "os-baremetal-nodes" @mock.patch("nova.api.openstack.compute.baremetal_nodes" "._get_ironic_client") diff --git a/nova/tests/functional/api_sample_tests/test_block_device_mapping_boot.py b/nova/tests/functional/api_sample_tests/test_block_device_mapping_boot.py index ab7cdc0255cd..2c93f90f100a 100644 --- a/nova/tests/functional/api_sample_tests/test_block_device_mapping_boot.py +++ b/nova/tests/functional/api_sample_tests/test_block_device_mapping_boot.py @@ -18,7 +18,7 @@ from nova.tests.unit.api.openstack import fakes class BlockDeviceMappingV1BootJsonTest(test_servers.ServersSampleBase): - extension_name = "os-block-device-mapping-v1" + sample_dir = "os-block-device-mapping-v1" def test_servers_post_with_bdm(self): self.stub_out('nova.volume.cinder.API.get', fakes.stub_volume_get) @@ -28,4 +28,4 @@ class BlockDeviceMappingV1BootJsonTest(test_servers.ServersSampleBase): class BlockDeviceMappingV2BootJsonTest(BlockDeviceMappingV1BootJsonTest): - extension_name = "os-block-device-mapping" + sample_dir = "os-block-device-mapping" diff --git a/nova/tests/functional/api_sample_tests/test_cells.py b/nova/tests/functional/api_sample_tests/test_cells.py index feb767e63ef1..4dd8ed39f53e 100644 --- a/nova/tests/functional/api_sample_tests/test_cells.py +++ b/nova/tests/functional/api_sample_tests/test_cells.py @@ -26,7 +26,7 @@ CONF = nova.conf.CONF class CellsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): - extension_name = "os-cells" + sample_dir = "os-cells" def setUp(self): # db_check_interval < 0 makes cells manager always hit the DB diff --git a/nova/tests/functional/api_sample_tests/test_certificates.py b/nova/tests/functional/api_sample_tests/test_certificates.py index 1f2f6871598f..a8db8eb5a215 100644 --- a/nova/tests/functional/api_sample_tests/test_certificates.py +++ b/nova/tests/functional/api_sample_tests/test_certificates.py @@ -18,7 +18,7 @@ from nova.tests.unit import fake_crypto class CertificatesSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): - extension_name = "os-certificates" + sample_dir = "os-certificates" def setUp(self): super(CertificatesSamplesJsonTest, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_cloudpipe.py b/nova/tests/functional/api_sample_tests/test_cloudpipe.py index bc37b22eb843..6b0a9ef4bee9 100644 --- a/nova/tests/functional/api_sample_tests/test_cloudpipe.py +++ b/nova/tests/functional/api_sample_tests/test_cloudpipe.py @@ -24,7 +24,7 @@ CONF = nova.conf.CONF class CloudPipeSampleTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-cloudpipe" + sample_dir = "os-cloudpipe" def setUp(self): super(CloudPipeSampleTest, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_console_auth_tokens.py b/nova/tests/functional/api_sample_tests/test_console_auth_tokens.py index c20343ba69e6..fcd79d54b6f7 100644 --- a/nova/tests/functional/api_sample_tests/test_console_auth_tokens.py +++ b/nova/tests/functional/api_sample_tests/test_console_auth_tokens.py @@ -21,8 +21,7 @@ from nova.tests.functional.api_sample_tests import test_servers class ConsoleAuthTokensSampleJsonTests(test_servers.ServersSampleBase): ADMIN_API = True - extension_name = "os-console-auth-tokens" - extra_extensions_to_load = ["os-remote-consoles", "os-access-ips"] + sample_dir = "os-console-auth-tokens" def _get_console_url(self, data): return jsonutils.loads(data)["console"]["url"] diff --git a/nova/tests/functional/api_sample_tests/test_console_output.py b/nova/tests/functional/api_sample_tests/test_console_output.py index 92e97b4695d8..fc57c0112ad0 100644 --- a/nova/tests/functional/api_sample_tests/test_console_output.py +++ b/nova/tests/functional/api_sample_tests/test_console_output.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import test_servers class ConsoleOutputSampleJsonTest(test_servers.ServersSampleBase): - extension_name = "os-console-output" + sample_dir = "os-console-output" def test_get_console_output(self): uuid = self._post_server() diff --git a/nova/tests/functional/api_sample_tests/test_create_backup.py b/nova/tests/functional/api_sample_tests/test_create_backup.py index 07ec04d4813d..5bb4b6c247e8 100644 --- a/nova/tests/functional/api_sample_tests/test_create_backup.py +++ b/nova/tests/functional/api_sample_tests/test_create_backup.py @@ -20,7 +20,7 @@ from nova.tests.unit.image import fake class CreateBackupSamplesJsonTest(test_servers.ServersSampleBase): - extension_name = "os-create-backup" + sample_dir = "os-create-backup" def setUp(self): """setUp Method for PauseServer api samples extension diff --git a/nova/tests/functional/api_sample_tests/test_deferred_delete.py b/nova/tests/functional/api_sample_tests/test_deferred_delete.py index 41db0664130e..2639487481a4 100644 --- a/nova/tests/functional/api_sample_tests/test_deferred_delete.py +++ b/nova/tests/functional/api_sample_tests/test_deferred_delete.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import test_servers class DeferredDeleteSampleJsonTests(test_servers.ServersSampleBase): - extension_name = "os-deferred-delete" + sample_dir = "os-deferred-delete" def setUp(self): super(DeferredDeleteSampleJsonTests, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_evacuate.py b/nova/tests/functional/api_sample_tests/test_evacuate.py index 5f2828e5eee6..948df6a5eb92 100644 --- a/nova/tests/functional/api_sample_tests/test_evacuate.py +++ b/nova/tests/functional/api_sample_tests/test_evacuate.py @@ -21,7 +21,7 @@ from nova.tests.functional.api_sample_tests import test_servers class EvacuateJsonTest(test_servers.ServersSampleBase): ADMIN_API = True - extension_name = "os-evacuate" + sample_dir = "os-evacuate" def _test_evacuate(self, req_subs, server_req, server_resp, expected_resp_code): diff --git a/nova/tests/functional/api_sample_tests/test_extension_info.py b/nova/tests/functional/api_sample_tests/test_extension_info.py index 5677ca3ea85b..7920b4830d74 100644 --- a/nova/tests/functional/api_sample_tests/test_extension_info.py +++ b/nova/tests/functional/api_sample_tests/test_extension_info.py @@ -26,8 +26,7 @@ def fake_soft_extension_authorizer(extension_name, core=False): class ExtensionInfoAllSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): - sample_dir = "all_extensions" - all_extensions = True + sample_dir = "extension-info" @mock.patch.object(api_extensions, 'os_compute_soft_authorizer') def test_list_extensions(self, soft_auth): @@ -45,7 +44,6 @@ class ExtensionInfoAllSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): class ExtensionInfoSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): sample_dir = "extension-info" - all_extensions = True @mock.patch.object(api_extensions, 'os_compute_soft_authorizer') def test_get_extensions(self, soft_auth): diff --git a/nova/tests/functional/api_sample_tests/test_fixed_ips.py b/nova/tests/functional/api_sample_tests/test_fixed_ips.py index df15d1e6cc14..59ded50d0db8 100644 --- a/nova/tests/functional/api_sample_tests/test_fixed_ips.py +++ b/nova/tests/functional/api_sample_tests/test_fixed_ips.py @@ -20,8 +20,7 @@ from nova.tests import uuidsentinel as uuids class FixedIpTest(test_servers.ServersSampleBase): - extension_name = "os-fixed-ips" - + sample_dir = "os-fixed-ips" microversion = None def setUp(self): diff --git a/nova/tests/functional/api_sample_tests/test_flavor_access.py b/nova/tests/functional/api_sample_tests/test_flavor_access.py index 8cc3813725f9..0f7d204dda9a 100644 --- a/nova/tests/functional/api_sample_tests/test_flavor_access.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_access.py @@ -18,9 +18,6 @@ from nova.tests.functional.api_sample_tests import api_sample_base class FlavorAccessTestsBase(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True sample_dir = 'flavor-access' - # TODO(gmann): This will be removed once all API tests runs for - # all extension enable. - all_extensions = True def _add_tenant(self): subs = { diff --git a/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py b/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py index d2bd20744ca4..a838fac85469 100644 --- a/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py @@ -20,10 +20,6 @@ class FlavorExtraSpecsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True sample_dir = 'flavor-extra-specs' - # TODO(gmann): This will be removed once all API tests runs for - # all extension enable. - all_extensions = True - def _flavor_extra_specs_create(self): subs = {'value1': 'value1', 'value2': 'value2' diff --git a/nova/tests/functional/api_sample_tests/test_flavor_manage.py b/nova/tests/functional/api_sample_tests/test_flavor_manage.py index a3ee93655e47..2808d6126acf 100644 --- a/nova/tests/functional/api_sample_tests/test_flavor_manage.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_manage.py @@ -20,10 +20,6 @@ class FlavorManageSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True sample_dir = 'flavor-manage' - # TODO(gmann): This will be removed once all API tests runs for - # all extension enable. - all_extensions = True - def _create_flavor(self): """Create a flavor.""" subs = { diff --git a/nova/tests/functional/api_sample_tests/test_flavors.py b/nova/tests/functional/api_sample_tests/test_flavors.py index c9e89f9ede85..4745c8a52b5d 100644 --- a/nova/tests/functional/api_sample_tests/test_flavors.py +++ b/nova/tests/functional/api_sample_tests/test_flavors.py @@ -19,10 +19,6 @@ from nova.tests.functional.api_sample_tests import api_sample_base class FlavorsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): sample_dir = 'flavors' - # TODO(gmann): This will be removed once all API tests runs for - # all extension enable. - all_extensions = True - def test_flavors_get(self): response = self._do_get('flavors/1') self._verify_response('flavor-get-resp', {}, response, 200) diff --git a/nova/tests/functional/api_sample_tests/test_floating_ip_dns.py b/nova/tests/functional/api_sample_tests/test_floating_ip_dns.py index dc60fbfa4ae2..273b7f3a6c0b 100644 --- a/nova/tests/functional/api_sample_tests/test_floating_ip_dns.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ip_dns.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class FloatingIpDNSTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-floating-ip-dns" + sample_dir = "os-floating-ip-dns" domain = 'domain1.example.org' name = 'instance1' diff --git a/nova/tests/functional/api_sample_tests/test_floating_ip_pools.py b/nova/tests/functional/api_sample_tests/test_floating_ip_pools.py index ce46d86b8b57..ef66c93a4d6b 100644 --- a/nova/tests/functional/api_sample_tests/test_floating_ip_pools.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ip_pools.py @@ -16,7 +16,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class FloatingIPPoolsSampleTests(api_sample_base.ApiSampleTestBaseV21): - extension_name = "os-floating-ip-pools" + sample_dir = "os-floating-ip-pools" def test_list_floatingippools(self): pool_list = ["pool1", "pool2"] diff --git a/nova/tests/functional/api_sample_tests/test_floating_ips.py b/nova/tests/functional/api_sample_tests/test_floating_ips.py index b443d7b9b848..302b9ca18bd7 100644 --- a/nova/tests/functional/api_sample_tests/test_floating_ips.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ips.py @@ -21,7 +21,7 @@ CONF = nova.conf.CONF class FloatingIpsTest(api_sample_base.ApiSampleTestBaseV21): - extension_name = "os-floating-ips" + sample_dir = "os-floating-ips" def setUp(self): super(FloatingIpsTest, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py b/nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py index 7d146b965afc..aa891cad9d24 100644 --- a/nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py @@ -22,7 +22,7 @@ CONF = nova.conf.CONF class FloatingIpsBulkTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-floating-ips-bulk" + sample_dir = "os-floating-ips-bulk" def setUp(self): super(FloatingIpsBulkTest, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_fping.py b/nova/tests/functional/api_sample_tests/test_fping.py index 0547a9d54049..a6e4d369a713 100644 --- a/nova/tests/functional/api_sample_tests/test_fping.py +++ b/nova/tests/functional/api_sample_tests/test_fping.py @@ -18,7 +18,7 @@ from nova.tests.unit.api.openstack.compute import test_fping class FpingSampleJsonTests(test_servers.ServersSampleBase): - extension_name = "os-fping" + sample_dir = "os-fping" def setUp(self): super(FpingSampleJsonTests, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_hide_server_addresses.py b/nova/tests/functional/api_sample_tests/test_hide_server_addresses.py index a1eedbb5315e..ba9f68cade12 100644 --- a/nova/tests/functional/api_sample_tests/test_hide_server_addresses.py +++ b/nova/tests/functional/api_sample_tests/test_hide_server_addresses.py @@ -21,11 +21,7 @@ CONF = nova.conf.CONF class ServersSampleHideAddressesJsonTest(test_servers.ServersSampleJsonTest): - extension_name = 'os-hide-server-addresses' - # Override the sample dirname because - # test_servers.ServersSampleJsonTest does and so it won't default - # to the extension name - sample_dir = extension_name + sample_dir = 'os-hide-server-addresses' def setUp(self): # We override osapi_hide_server_address_states in order diff --git a/nova/tests/functional/api_sample_tests/test_hosts.py b/nova/tests/functional/api_sample_tests/test_hosts.py index 2391476c779c..1d247176b2a0 100644 --- a/nova/tests/functional/api_sample_tests/test_hosts.py +++ b/nova/tests/functional/api_sample_tests/test_hosts.py @@ -18,7 +18,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class HostsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-hosts" + sample_dir = "os-hosts" def test_host_startup(self): response = self._do_get('os-hosts/%s/startup' % self.compute.host) diff --git a/nova/tests/functional/api_sample_tests/test_hypervisors.py b/nova/tests/functional/api_sample_tests/test_hypervisors.py index 9626a69bde17..161c743269bf 100644 --- a/nova/tests/functional/api_sample_tests/test_hypervisors.py +++ b/nova/tests/functional/api_sample_tests/test_hypervisors.py @@ -22,7 +22,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class HypervisorsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-hypervisors" + sample_dir = "os-hypervisors" def test_hypervisors_list(self): response = self._do_get('os-hypervisors') @@ -94,7 +94,7 @@ class HypervisorsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): @mock.patch("nova.servicegroup.API.service_is_up", return_value=True) class HypervisorsCellsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-hypervisors" + sample_dir = "os-hypervisors" def setUp(self): self.flags(enable=True, cell_type='api', group='cells') diff --git a/nova/tests/functional/api_sample_tests/test_images.py b/nova/tests/functional/api_sample_tests/test_images.py index ade68dd458bf..a30db51dd8fd 100644 --- a/nova/tests/functional/api_sample_tests/test_images.py +++ b/nova/tests/functional/api_sample_tests/test_images.py @@ -22,9 +22,6 @@ CONF = nova.conf.CONF class ImagesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): sample_dir = 'images' - # TODO(gmann): This will be removed once all API tests runs for - # all extension enable. - all_extensions = True def test_images_list(self): # Get api sample of images get list request. diff --git a/nova/tests/functional/api_sample_tests/test_instance_actions.py b/nova/tests/functional/api_sample_tests/test_instance_actions.py index 4a59a15dc3ae..2eefb469f58d 100644 --- a/nova/tests/functional/api_sample_tests/test_instance_actions.py +++ b/nova/tests/functional/api_sample_tests/test_instance_actions.py @@ -26,7 +26,7 @@ from nova.tests.unit import utils as test_utils class ServerActionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): microversion = None ADMIN_API = True - extension_name = 'os-instance-actions' + sample_dir = 'os-instance-actions' def setUp(self): super(ServerActionsSampleJsonTest, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py b/nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py index 08014b39565e..8d22939896a0 100644 --- a/nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py +++ b/nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py @@ -20,7 +20,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class InstanceUsageAuditLogJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-instance-usage-audit-log" + sample_dir = "os-instance-usage-audit-log" def test_show_instance_usage_audit_log(self): response = self._do_get('os-instance_usage_audit_log/%s' % diff --git a/nova/tests/functional/api_sample_tests/test_limits.py b/nova/tests/functional/api_sample_tests/test_limits.py index 5d92cf75d61f..d946b574f6ff 100644 --- a/nova/tests/functional/api_sample_tests/test_limits.py +++ b/nova/tests/functional/api_sample_tests/test_limits.py @@ -18,7 +18,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class LimitsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "limits" + sample_dir = "limits" def setUp(self): super(LimitsSampleJsonTest, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_lock_server.py b/nova/tests/functional/api_sample_tests/test_lock_server.py index d555bed17abc..69e806b42715 100644 --- a/nova/tests/functional/api_sample_tests/test_lock_server.py +++ b/nova/tests/functional/api_sample_tests/test_lock_server.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import test_servers class LockServerSamplesJsonTest(test_servers.ServersSampleBase): - extension_name = "os-lock-server" + sample_dir = "os-lock-server" def setUp(self): """setUp Method for LockServer api samples extension diff --git a/nova/tests/functional/api_sample_tests/test_migrate_server.py b/nova/tests/functional/api_sample_tests/test_migrate_server.py index 2da38bfe96b3..68c0645aaea0 100644 --- a/nova/tests/functional/api_sample_tests/test_migrate_server.py +++ b/nova/tests/functional/api_sample_tests/test_migrate_server.py @@ -21,7 +21,7 @@ from nova.tests.functional.api_sample_tests import test_servers class MigrateServerSamplesJsonTest(test_servers.ServersSampleBase): - extension_name = "os-migrate-server" + sample_dir = "os-migrate-server" def setUp(self): """setUp Method for MigrateServer api samples extension @@ -77,7 +77,7 @@ class MigrateServerSamplesJsonTest(test_servers.ServersSampleBase): class MigrateServerSamplesJsonTestV225(MigrateServerSamplesJsonTest): - extension_name = "os-migrate-server" + sample_dir = "os-migrate-server" microversion = '2.25' scenarios = [('v2_25', {'api_major_version': 'v2.1'})] @@ -87,7 +87,7 @@ class MigrateServerSamplesJsonTestV225(MigrateServerSamplesJsonTest): class MigrateServerSamplesJsonTestV230(MigrateServerSamplesJsonTest): - extension_name = "os-migrate-server" + sample_dir = "os-migrate-server" microversion = '2.30' scenarios = [('v2_30', {'api_major_version': 'v2.1'})] diff --git a/nova/tests/functional/api_sample_tests/test_migrations.py b/nova/tests/functional/api_sample_tests/test_migrations.py index 5d111610d544..957d29a73638 100644 --- a/nova/tests/functional/api_sample_tests/test_migrations.py +++ b/nova/tests/functional/api_sample_tests/test_migrations.py @@ -70,7 +70,7 @@ def _stub_migrations(stub_self, context, filters): class MigrationsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-migrations" + sample_dir = "os-migrations" def setUp(self): super(MigrationsSamplesJsonTest, self).setUp() @@ -86,7 +86,7 @@ class MigrationsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): class MigrationsSamplesJsonTestV2_23(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-migrations" + sample_dir = "os-migrations" microversion = '2.23' scenarios = [('v2_23', {'api_major_version': 'v2.1'})] diff --git a/nova/tests/functional/api_sample_tests/test_multinic.py b/nova/tests/functional/api_sample_tests/test_multinic.py index ec01ce1976a3..dc2df7dff9e0 100644 --- a/nova/tests/functional/api_sample_tests/test_multinic.py +++ b/nova/tests/functional/api_sample_tests/test_multinic.py @@ -18,7 +18,7 @@ from nova.tests.functional.api_sample_tests import test_servers class MultinicSampleJsonTest(test_servers.ServersSampleBase): ADMIN_API = True - extension_name = "os-multinic" + sample_dir = "os-multinic" def _disable_instance_dns_manager(self): # NOTE(markmc): it looks like multinic and instance_dns_manager are diff --git a/nova/tests/functional/api_sample_tests/test_multiple_create.py b/nova/tests/functional/api_sample_tests/test_multiple_create.py index 344914b04f70..db06c947821b 100644 --- a/nova/tests/functional/api_sample_tests/test_multiple_create.py +++ b/nova/tests/functional/api_sample_tests/test_multiple_create.py @@ -18,7 +18,7 @@ from nova.tests.unit.image import fake class MultipleCreateJsonTest(test_servers.ServersSampleBase): - extension_name = "os-multiple-create" + sample_dir = "os-multiple-create" def test_multiple_create(self): subs = { diff --git a/nova/tests/functional/api_sample_tests/test_networks.py b/nova/tests/functional/api_sample_tests/test_networks.py index 71d92bdc3d50..d32331f02b03 100644 --- a/nova/tests/functional/api_sample_tests/test_networks.py +++ b/nova/tests/functional/api_sample_tests/test_networks.py @@ -38,7 +38,7 @@ def _fixtures_passthrough(method_name): class NetworksJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-networks" + sample_dir = "os-networks" def setUp(self): super(NetworksJsonTests, self).setUp() @@ -59,13 +59,6 @@ class NetworksJsonTests(api_sample_base.ApiSampleTestBaseV21): response = self._do_get('os-networks') self._verify_response('networks-list-resp', {}, response, 200) - def test_network_disassociate(self): - uuid = test_networks.FAKE_NETWORKS[0]['uuid'] - response = self._do_post('os-networks/%s/action' % uuid, - 'networks-disassociate-req', {}) - self.assertEqual(202, response.status_code) - self.assertEqual("", response.content) - def test_network_show(self): uuid = test_networks.FAKE_NETWORKS[0]['uuid'] response = self._do_get('os-networks/%s' % uuid) diff --git a/nova/tests/functional/api_sample_tests/test_networks_associate.py b/nova/tests/functional/api_sample_tests/test_networks_associate.py index d34d13222b3f..ba717978e2c7 100644 --- a/nova/tests/functional/api_sample_tests/test_networks_associate.py +++ b/nova/tests/functional/api_sample_tests/test_networks_associate.py @@ -18,8 +18,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class NetworksAssociateJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-networks-associate" - extra_extensions_to_load = ["os-networks"] + sample_dir = "os-networks-associate" _sentinel = object() diff --git a/nova/tests/functional/api_sample_tests/test_pause_server.py b/nova/tests/functional/api_sample_tests/test_pause_server.py index 2fbe995dd7b2..2a048e169cef 100644 --- a/nova/tests/functional/api_sample_tests/test_pause_server.py +++ b/nova/tests/functional/api_sample_tests/test_pause_server.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import test_servers class PauseServerSamplesJsonTest(test_servers.ServersSampleBase): - extension_name = "os-pause-server" + sample_dir = "os-pause-server" def setUp(self): """setUp Method for PauseServer api samples extension diff --git a/nova/tests/functional/api_sample_tests/test_pci.py b/nova/tests/functional/api_sample_tests/test_pci.py index 62f278615844..0b1f0cca1bec 100644 --- a/nova/tests/functional/api_sample_tests/test_pci.py +++ b/nova/tests/functional/api_sample_tests/test_pci.py @@ -68,7 +68,7 @@ fake_db_dev_2 = { class ExtendedServerPciSampleJsonTest(test_servers.ServersSampleBase): - extension_name = "os-pci" + sample_dir = "os-pci" def setUp(self): raise testtools.TestCase.skipException(skip_msg) @@ -88,8 +88,7 @@ class ExtendedServerPciSampleJsonTest(test_servers.ServersSampleBase): class ExtendedHyervisorPciSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extra_extensions_to_load = ['os-hypervisors'] - extension_name = 'os-pci' + sample_dir = 'os-pci' def setUp(self): raise testtools.TestCase.skipException(skip_msg) @@ -172,7 +171,7 @@ class ExtendedHyervisorPciSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class PciSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-pci" + sample_dir = "os-pci" def setUp(self): raise testtools.TestCase.skipException(skip_msg) diff --git a/nova/tests/functional/api_sample_tests/test_preserve_ephemeral_rebuild.py b/nova/tests/functional/api_sample_tests/test_preserve_ephemeral_rebuild.py index 5adb915470b1..35cf22a18594 100644 --- a/nova/tests/functional/api_sample_tests/test_preserve_ephemeral_rebuild.py +++ b/nova/tests/functional/api_sample_tests/test_preserve_ephemeral_rebuild.py @@ -18,7 +18,7 @@ from nova.tests.unit.image import fake class PreserveEphemeralOnRebuildJsonTest(test_servers.ServersSampleBase): - extension_name = 'os-preserve-ephemeral-rebuild' + sample_dir = 'os-preserve-ephemeral-rebuild' def _test_server_rebuild_preserve_ephemeral(self, value, resp_tpl=None): uuid = self._post_server() diff --git a/nova/tests/functional/api_sample_tests/test_quota_classes.py b/nova/tests/functional/api_sample_tests/test_quota_classes.py index 8b65839218b9..d162100f64cf 100644 --- a/nova/tests/functional/api_sample_tests/test_quota_classes.py +++ b/nova/tests/functional/api_sample_tests/test_quota_classes.py @@ -18,7 +18,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class QuotaClassesSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-quota-class-sets" + sample_dir = "os-quota-class-sets" set_id = 'test_class' def test_show_quota_classes(self): diff --git a/nova/tests/functional/api_sample_tests/test_quota_sets.py b/nova/tests/functional/api_sample_tests/test_quota_sets.py index 5f274a264204..84d79ad9762e 100644 --- a/nova/tests/functional/api_sample_tests/test_quota_sets.py +++ b/nova/tests/functional/api_sample_tests/test_quota_sets.py @@ -18,7 +18,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class QuotaSetsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-quota-sets" + sample_dir = "os-quota-sets" def test_show_quotas(self): # Get api sample to show quotas. diff --git a/nova/tests/functional/api_sample_tests/test_remote_consoles.py b/nova/tests/functional/api_sample_tests/test_remote_consoles.py index cfb206aad62a..65ae3f1f5d1d 100644 --- a/nova/tests/functional/api_sample_tests/test_remote_consoles.py +++ b/nova/tests/functional/api_sample_tests/test_remote_consoles.py @@ -18,7 +18,7 @@ from nova.tests.functional.api_sample_tests import test_servers class ConsolesSampleJsonTests(test_servers.ServersSampleBase): microversion = None - extension_name = "os-remote-consoles" + sample_dir = "os-remote-consoles" def setUp(self): super(ConsolesSampleJsonTests, self).setUp() @@ -70,7 +70,7 @@ class ConsolesSampleJsonTests(test_servers.ServersSampleBase): class ConsolesV26SampleJsonTests(test_servers.ServersSampleBase): microversion = '2.6' - extension_name = "os-remote-consoles" + sample_dir = "os-remote-consoles" # NOTE(gmann): microversion tests do not need to run for v2 API # so defining scenarios only for v2.6 which will run the original tests # by appending '(v2_6)' in test_id. @@ -91,7 +91,7 @@ class ConsolesV26SampleJsonTests(test_servers.ServersSampleBase): class ConsolesV28SampleJsonTests(test_servers.ServersSampleBase): - extension_name = "os-remote-consoles" + sample_dir = "os-remote-consoles" microversion = '2.8' scenarios = [('v2_8', {'api_major_version': 'v2.1'})] diff --git a/nova/tests/functional/api_sample_tests/test_rescue.py b/nova/tests/functional/api_sample_tests/test_rescue.py index e905e386dba3..f5b21e9e7790 100644 --- a/nova/tests/functional/api_sample_tests/test_rescue.py +++ b/nova/tests/functional/api_sample_tests/test_rescue.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import test_servers class RescueJsonTest(test_servers.ServersSampleBase): - extension_name = "os-rescue" + sample_dir = "os-rescue" def _rescue(self, uuid): req_subs = { diff --git a/nova/tests/functional/api_sample_tests/test_scheduler_hints.py b/nova/tests/functional/api_sample_tests/test_scheduler_hints.py deleted file mode 100644 index bdf731ccd6b0..000000000000 --- a/nova/tests/functional/api_sample_tests/test_scheduler_hints.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# Copyright 2013 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import uuid - -from nova.tests.functional.api_sample_tests import api_sample_base -from nova.tests.unit.image import fake - - -class SchedulerHintsJsonTest(api_sample_base.ApiSampleTestBaseV21): - extension_name = "os-scheduler-hints" - - def test_scheduler_hints_post(self): - # Get api sample of scheduler hint post request. - subs = {'image_id': fake.get_valid_image_id(), - 'uuid': str(uuid.uuid4())} - response = self._do_post('servers', 'scheduler-hints-post-req', - subs) - del subs['uuid'] - self._verify_response('scheduler-hints-post-resp', subs, response, 202) diff --git a/nova/tests/functional/api_sample_tests/test_security_group_default_rules.py b/nova/tests/functional/api_sample_tests/test_security_group_default_rules.py index bac663ac84b1..2af269aa5a46 100644 --- a/nova/tests/functional/api_sample_tests/test_security_group_default_rules.py +++ b/nova/tests/functional/api_sample_tests/test_security_group_default_rules.py @@ -18,7 +18,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class SecurityGroupDefaultRulesSampleJsonTest( api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = 'os-security-group-default-rules' + sample_dir = 'os-security-group-default-rules' def test_security_group_default_rules_create(self): response = self._do_post('os-security-group-default-rules', diff --git a/nova/tests/functional/api_sample_tests/test_security_groups.py b/nova/tests/functional/api_sample_tests/test_security_groups.py index eb91156e6ced..57f2d4e94954 100644 --- a/nova/tests/functional/api_sample_tests/test_security_groups.py +++ b/nova/tests/functional/api_sample_tests/test_security_groups.py @@ -58,7 +58,7 @@ def fake_create_security_group(self, context, name, description): class SecurityGroupsJsonTest(test_servers.ServersSampleBase): - extension_name = 'os-security-groups' + sample_dir = 'os-security-groups' def setUp(self): self.flags(security_group_api=('neutron')) @@ -113,21 +113,21 @@ class SecurityGroupsJsonTest(test_servers.ServersSampleBase): def test_security_groups_list_server(self): # Get api sample of security groups for a specific server. - uuid = self._post_server(use_common_server_api_samples=False) + uuid = self._post_server() response = self._do_get('servers/%s/os-security-groups' % uuid) self._verify_response('server-security-groups-list-resp', {}, response, 200) def test_security_groups_add(self): self._create_security_group() - uuid = self._post_server(use_common_server_api_samples=False) + uuid = self._post_server() response = self._add_group(uuid) self.assertEqual(202, response.status_code) self.assertEqual('', response.content) def test_security_groups_remove(self): self._create_security_group() - uuid = self._post_server(use_common_server_api_samples=False) + uuid = self._post_server() self._add_group(uuid) subs = { 'group_name': 'test' diff --git a/nova/tests/functional/api_sample_tests/test_server_diagnostics.py b/nova/tests/functional/api_sample_tests/test_server_diagnostics.py index 16a211ad167b..0edf02580eb5 100644 --- a/nova/tests/functional/api_sample_tests/test_server_diagnostics.py +++ b/nova/tests/functional/api_sample_tests/test_server_diagnostics.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import test_servers class ServerDiagnosticsSamplesJsonTest(test_servers.ServersSampleBase): - extension_name = "os-server-diagnostics" + sample_dir = "os-server-diagnostics" def test_server_diagnostics_get(self): uuid = self._post_server() diff --git a/nova/tests/functional/api_sample_tests/test_server_external_events.py b/nova/tests/functional/api_sample_tests/test_server_external_events.py index af5dd5c52879..c67eb1105460 100644 --- a/nova/tests/functional/api_sample_tests/test_server_external_events.py +++ b/nova/tests/functional/api_sample_tests/test_server_external_events.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import test_servers class ServerExternalEventsSamplesJsonTest(test_servers.ServersSampleBase): ADMIN_API = True - extension_name = "os-server-external-events" + sample_dir = "os-server-external-events" def setUp(self): """setUp Method for AdminActions api samples extension diff --git a/nova/tests/functional/api_sample_tests/test_server_groups.py b/nova/tests/functional/api_sample_tests/test_server_groups.py index fbbbec6e4005..c7e9afb146cf 100644 --- a/nova/tests/functional/api_sample_tests/test_server_groups.py +++ b/nova/tests/functional/api_sample_tests/test_server_groups.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base class ServerGroupsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): - extension_name = "os-server-groups" + sample_dir = "os-server-groups" def _get_create_subs(self): return {'name': 'test'} diff --git a/nova/tests/functional/api_sample_tests/test_server_migrations.py b/nova/tests/functional/api_sample_tests/test_server_migrations.py index f7da1d80dd16..182c35326bb7 100644 --- a/nova/tests/functional/api_sample_tests/test_server_migrations.py +++ b/nova/tests/functional/api_sample_tests/test_server_migrations.py @@ -25,9 +25,8 @@ from nova.tests.unit import fake_instance class ServerMigrationsSampleJsonTest(test_servers.ServersSampleBase): - extension_name = 'server-migrations' + sample_dir = 'server-migrations' scenarios = [('v2_22', {'api_major_version': 'v2.1'})] - extra_extensions_to_load = ["os-migrate-server", "os-access-ips"] def setUp(self): """setUp method for server usage.""" @@ -66,7 +65,7 @@ class ServerMigrationsSampleJsonTest(test_servers.ServersSampleBase): class ServerMigrationsSamplesJsonTestV2_23(test_servers.ServersSampleBase): ADMIN_API = True - extension_name = "server-migrations" + sample_dir = "server-migrations" microversion = '2.23' scenarios = [('v2_23', {'api_major_version': 'v2.1'})] UUID_1 = '4cfba335-03d8-49b2-8c52-e69043d1e8fe' @@ -163,9 +162,8 @@ class ServerMigrationsSamplesJsonTestV2_23(test_servers.ServersSampleBase): class ServerMigrationsSampleJsonTestV2_24(test_servers.ServersSampleBase): ADMIN_API = True - extension_name = "server-migrations" + sample_dir = "server-migrations" scenarios = [('v2_24', {'api_major_version': 'v2.1'})] - extra_extensions_to_load = ["os-migrate-server", "os-access-ips"] def setUp(self): """setUp method for server usage.""" diff --git a/nova/tests/functional/api_sample_tests/test_server_password.py b/nova/tests/functional/api_sample_tests/test_server_password.py index e21aacc0eca6..11921291f15d 100644 --- a/nova/tests/functional/api_sample_tests/test_server_password.py +++ b/nova/tests/functional/api_sample_tests/test_server_password.py @@ -18,7 +18,7 @@ from nova.tests.functional.api_sample_tests import test_servers class ServerPasswordSampleJsonTests(test_servers.ServersSampleBase): - extension_name = "os-server-password" + sample_dir = "os-server-password" @mock.patch("nova.api.metadata.password.extract_password") def test_get_password(self, mock_extract_password): diff --git a/nova/tests/functional/api_sample_tests/test_server_tags.py b/nova/tests/functional/api_sample_tests/test_server_tags.py index 8f1b64c2cabd..28b9aa8498f5 100644 --- a/nova/tests/functional/api_sample_tests/test_server_tags.py +++ b/nova/tests/functional/api_sample_tests/test_server_tags.py @@ -17,7 +17,7 @@ TAG = 'sometag' class ServerTagsJsonTest(test_servers.ServersSampleBase): - extension_name = 'os-server-tags' + sample_dir = 'os-server-tags' microversion = '2.26' scenarios = [('v2_26', {'api_major_version': 'v2.1'})] @@ -55,6 +55,7 @@ class ServerTagsJsonTest(test_servers.ServersSampleBase): subs['instance_name'] = 'instance-\d{8}' subs['hypervisor_hostname'] = r'[\w\.\-]+' subs['cdrive'] = '.*' + subs['user_data'] = self.user_data self._verify_response('server-tags-show-details-resp', subs, response, 200) @@ -70,6 +71,7 @@ class ServerTagsJsonTest(test_servers.ServersSampleBase): subs['instance_name'] = 'instance-\d{8}' subs['hypervisor_hostname'] = r'[\w\.\-]+' subs['cdrive'] = '.*' + subs['user_data'] = self.user_data self._verify_response('servers-tags-details-resp', subs, response, 200) def test_server_tags_index(self): diff --git a/nova/tests/functional/api_sample_tests/test_servers.py b/nova/tests/functional/api_sample_tests/test_servers.py index bf499a165998..c8dd330bb897 100644 --- a/nova/tests/functional/api_sample_tests/test_servers.py +++ b/nova/tests/functional/api_sample_tests/test_servers.py @@ -13,6 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. +import base64 + from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.unit.api.openstack import fakes from nova.tests.unit.image import fake @@ -20,7 +22,10 @@ from nova.tests.unit.image import fake class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21): microversion = None - all_extensions = True + sample_dir = 'servers' + + user_data_contents = '#!/bin/bash\n/bin/su\necho "I am in you!"\n' + user_data = base64.b64encode(user_data_contents) def _post_server(self, use_common_server_api_samples=True): # param use_common_server_api_samples: Boolean to set whether tests use @@ -28,7 +33,6 @@ class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21): # Default is True which means _get_sample_path method will fetch the # common server sample files from 'servers' directory. # Set False if tests need to use extension specific sample files - subs = { 'image_id': fake.get_valid_image_id(), 'host': self._get_host(), @@ -36,24 +40,19 @@ class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21): 'versioned_compute_endpoint': self._get_vers_compute_endpoint(), 'glance_host': self._get_glance_host(), 'access_ip_v4': '1.2.3.4', - 'access_ip_v6': '80fe::' + 'access_ip_v6': '80fe::', + 'user_data': self.user_data, + 'uuid': '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}' + '-[0-9a-f]{4}-[0-9a-f]{12}', } - # TODO(gmann): Remove this hack once all tests using this common - # _post_server method are enabled with all extension. - # This is added to avoid all tests updates together. - post_req_template = 'server-post-req' - post_resp_template = 'server-post-resp' - if self.all_extensions and use_common_server_api_samples: - post_req_template = 'server-create-req' - post_resp_template = 'server-create-resp' orig_value = self.__class__._use_common_server_api_samples orig_sample_dir = self.__class__.sample_dir try: self.__class__._use_common_server_api_samples = ( use_common_server_api_samples) - response = self._do_post('servers', post_req_template, subs) - status = self._verify_response(post_resp_template, subs, + response = self._do_post('servers', 'server-create-req', subs) + status = self._verify_response('server-create-resp', subs, response, 202) return status finally: @@ -66,7 +65,6 @@ class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21): class ServersSampleJsonTest(ServersSampleBase): - sample_dir = 'servers' microversion = None def test_servers_post(self): @@ -86,6 +84,7 @@ class ServersSampleJsonTest(ServersSampleBase): subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}' subs['access_ip_v4'] = '1.2.3.4' subs['access_ip_v6'] = '80fe::' + subs['user_data'] = self.user_data # config drive can be a string for True or empty value for False subs['cdrive'] = '.*' self._verify_response('server-get-resp', subs, response, 200) @@ -110,6 +109,7 @@ class ServersSampleJsonTest(ServersSampleBase): subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}' subs['access_ip_v4'] = '1.2.3.4' subs['access_ip_v6'] = '80fe::' + subs['user_data'] = self.user_data # config drive can be a string for True or empty value for False subs['cdrive'] = '.*' self._verify_response('servers-details-resp', subs, response, 200) @@ -130,7 +130,6 @@ class ServersSampleJson216Test(ServersSampleJsonTest): class ServersSampleJson219Test(ServersSampleJsonTest): microversion = '2.19' - sample_dir = 'servers' scenarios = [('v2_19', {'api_major_version': 'v2.1'})] def test_servers_post(self): @@ -150,7 +149,6 @@ class ServersSampleJson219Test(ServersSampleJsonTest): class ServersUpdateSampleJsonTest(ServersSampleBase): - sample_dir = 'servers' def test_update_server(self): uuid = self._post_server() @@ -174,7 +172,6 @@ class ServerSortKeysJsonTests(ServersSampleBase): class ServersActionsJsonTest(ServersSampleBase): - sample_dir = 'servers' def _test_server_action(self, uuid, action, req_tpl, subs=None, resp_tpl=None, code=202): @@ -249,7 +246,6 @@ class ServersActionsJsonTest(ServersSampleBase): class ServersActionsJson219Test(ServersSampleBase): microversion = '2.19' - sample_dir = 'servers' scenarios = [('v2_19', {'api_major_version': 'v2.1'})] def test_server_rebuild(self): @@ -273,7 +269,6 @@ class ServersActionsJson219Test(ServersSampleBase): class ServerStartStopJsonTest(ServersSampleBase): - sample_dir = 'servers' def _test_server_action(self, uuid, action, req_tpl): response = self._do_post('servers/%s/action' % uuid, @@ -293,8 +288,6 @@ class ServerStartStopJsonTest(ServersSampleBase): class ServersSampleMultiStatusJsonTest(ServersSampleBase): - sample_dir = 'servers' - extra_extensions_to_load = ["os-access-ips"] def test_servers_list(self): uuid = self._post_server() @@ -304,7 +297,6 @@ class ServersSampleMultiStatusJsonTest(ServersSampleBase): class ServerTriggerCrashDumpJsonTest(ServersSampleBase): - sample_dir = 'servers' microversion = '2.17' scenarios = [('v2_17', {'api_major_version': 'v2.1'})] diff --git a/nova/tests/functional/api_sample_tests/test_services.py b/nova/tests/functional/api_sample_tests/test_services.py index 1d714b33d69a..d49aa177fc85 100644 --- a/nova/tests/functional/api_sample_tests/test_services.py +++ b/nova/tests/functional/api_sample_tests/test_services.py @@ -21,7 +21,7 @@ from nova.tests.unit.api.openstack.compute import test_services class ServicesJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-services" + sample_dir = "os-services" microversion = None def setUp(self): diff --git a/nova/tests/functional/api_sample_tests/test_shelve.py b/nova/tests/functional/api_sample_tests/test_shelve.py index 6a5ee1413ec2..cc7a94de3dc6 100644 --- a/nova/tests/functional/api_sample_tests/test_shelve.py +++ b/nova/tests/functional/api_sample_tests/test_shelve.py @@ -21,7 +21,7 @@ CONF = nova.conf.CONF class ShelveJsonTest(test_servers.ServersSampleBase): - extension_name = "os-shelve" + sample_dir = "os-shelve" def setUp(self): super(ShelveJsonTest, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py b/nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py index 521e172a1c08..ceee6158e700 100644 --- a/nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py +++ b/nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py @@ -22,7 +22,7 @@ import nova.tests.functional.api_samples_test_base as astb class SimpleTenantUsageSampleJsonTest(test_servers.ServersSampleBase): - extension_name = "os-simple-tenant-usage" + sample_dir = "os-simple-tenant-usage" def setUp(self): """setUp method for simple tenant usage.""" diff --git a/nova/tests/functional/api_sample_tests/test_suspend_server.py b/nova/tests/functional/api_sample_tests/test_suspend_server.py index e28066072b97..1c059b7a9833 100644 --- a/nova/tests/functional/api_sample_tests/test_suspend_server.py +++ b/nova/tests/functional/api_sample_tests/test_suspend_server.py @@ -16,7 +16,7 @@ from nova.tests.functional.api_sample_tests import test_servers class SuspendServerSamplesJsonTest(test_servers.ServersSampleBase): - extension_name = "os-suspend-server" + sample_dir = "os-suspend-server" def setUp(self): """setUp Method for SuspendServer api samples extension diff --git a/nova/tests/functional/api_sample_tests/test_tenant_networks.py b/nova/tests/functional/api_sample_tests/test_tenant_networks.py index 035fe3057c5e..612e575d5fd7 100644 --- a/nova/tests/functional/api_sample_tests/test_tenant_networks.py +++ b/nova/tests/functional/api_sample_tests/test_tenant_networks.py @@ -24,7 +24,7 @@ CONF = nova.conf.CONF class TenantNetworksJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True - extension_name = "os-tenant-networks" + sample_dir = "os-tenant-networks" def setUp(self): super(TenantNetworksJsonTests, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_used_limits.py b/nova/tests/functional/api_sample_tests/test_used_limits.py deleted file mode 100644 index e2b84a41cc16..000000000000 --- a/nova/tests/functional/api_sample_tests/test_used_limits.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# Copyright 2013 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import nova.conf -from nova.tests.functional.api_sample_tests import api_sample_base - -CONF = nova.conf.CONF - - -class UsedLimitsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): - ADMIN_API = True - extension_name = "os-used-limits" - extra_extensions_to_load = ["limits"] - - def setUp(self): - super(UsedLimitsSamplesJsonTest, self).setUp() - # NOTE(park): We have to separate the template files between V2 - # and V2.1 as the response are different. - self.template = 'usedlimits-get-resp' - - def test_get_used_limits(self): - # Get api sample to used limits. - response = self._do_get('limits') - self._verify_response(self.template, {}, response, 200) - - def test_get_used_limits_for_admin(self): - # TODO(sdague): if we split the admin tests out the whole - # class doesn't need admin api enabled. - tenant_id = 'openstack' - response = self._do_get('limits?tenant_id=%s' % tenant_id) - self._verify_response(self.template, {}, response, 200) diff --git a/nova/tests/functional/api_sample_tests/test_user_data.py b/nova/tests/functional/api_sample_tests/test_user_data.py deleted file mode 100644 index 3f9728662561..000000000000 --- a/nova/tests/functional/api_sample_tests/test_user_data.py +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# Copyright 2013 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import base64 - -from nova.tests.functional.api_sample_tests import api_sample_base -from nova.tests.unit.image import fake - - -class UserDataJsonTest(api_sample_base.ApiSampleTestBaseV21): - extension_name = "os-user-data" - - def test_user_data_post(self): - user_data_contents = '#!/bin/bash\n/bin/su\necho "I am in you!"\n' - user_data = base64.b64encode(user_data_contents) - subs = { - 'image_id': fake.get_valid_image_id(), - 'compute_endpoint': self._get_compute_endpoint(), - 'user_data': user_data - } - response = self._do_post('servers', 'userdata-post-req', subs) - - self._verify_response('userdata-post-resp', subs, response, 202) diff --git a/nova/tests/functional/api_sample_tests/test_virtual_interfaces.py b/nova/tests/functional/api_sample_tests/test_virtual_interfaces.py index a4b1858dd6e4..8091d8c9feaa 100644 --- a/nova/tests/functional/api_sample_tests/test_virtual_interfaces.py +++ b/nova/tests/functional/api_sample_tests/test_virtual_interfaces.py @@ -17,7 +17,7 @@ from nova.tests.functional.api_sample_tests import test_servers class VirtualInterfacesJsonTest(test_servers.ServersSampleBase): - extension_name = "os-virtual-interfaces" + sample_dir = "os-virtual-interfaces" def setUp(self): super(VirtualInterfacesJsonTest, self).setUp() diff --git a/nova/tests/functional/api_sample_tests/test_volumes.py b/nova/tests/functional/api_sample_tests/test_volumes.py index 79bedca18ba9..33aa61c634df 100644 --- a/nova/tests/functional/api_sample_tests/test_volumes.py +++ b/nova/tests/functional/api_sample_tests/test_volumes.py @@ -25,7 +25,7 @@ from nova.tests.unit import fake_instance class SnapshotsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): - extension_name = "os-volumes" + sample_dir = "os-volumes" create_subs = { 'snapshot_name': 'snap-001', @@ -130,7 +130,7 @@ def _stub_volume_create(stub_self, context, size, name, description, class VolumesSampleJsonTest(test_servers.ServersSampleBase): - extension_name = "os-volumes" + sample_dir = "os-volumes" def setUp(self): super(VolumesSampleJsonTest, self).setUp() @@ -193,7 +193,7 @@ class VolumesSampleJsonTest(test_servers.ServersSampleBase): class VolumeAttachmentsSample(test_servers.ServersSampleBase): - extension_name = "os-volumes" + sample_dir = "os-volumes" def _stub_db_bdms_get_all_by_instance(self, server_id): diff --git a/nova/tests/functional/api_samples_test_base.py b/nova/tests/functional/api_samples_test_base.py index 01322b9aad95..7232fb3111cb 100644 --- a/nova/tests/functional/api_samples_test_base.py +++ b/nova/tests/functional/api_samples_test_base.py @@ -63,8 +63,7 @@ def objectify(data): class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): - all_extensions = False - extension_name = None + all_extensions = True sample_dir = None microversion = None _use_common_server_api_samples = False @@ -102,10 +101,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): if cls._use_common_server_api_samples: parts.append('servers') else: - if cls.sample_dir: - parts.append(cls.sample_dir) - elif cls.extension_name: - parts.append(cls.extension_name) + parts.append(cls.sample_dir) if api_version: parts.append('v' + api_version) parts.append(name + ".json" + suffix) @@ -333,10 +329,10 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): template_data = response_data else: template_data = self._read_template(name) - if (self.generate_samples and not os.path.exists(self._get_sample( name, self.microversion))): + self._write_sample(name, response_data) sample_data = response_data else: