diff options
Diffstat (limited to 'nova/tests/integrated')
31 files changed, 237 insertions, 314 deletions
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl index d1f78c08e..04083d063 100644 --- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl @@ -2,7 +2,7 @@ "flavors": [ { "OS-FLV-DISABLED:disabled": false, - "disk": 0, + "disk": 1, "id": "1", "links": [ { diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl index 8d992e42d..5d73195fa 100644 --- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <flavors xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False"> + <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False"> <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/> <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl index cf5fb232a..a47af7b18 100644 --- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl @@ -1,7 +1,7 @@ { "flavor": { "OS-FLV-DISABLED:disabled": false, - "disk": 0, + "disk": 1, "id": "%(flavor_id)s", "links": [ { diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl index c7bdd1ca8..13908e2ac 100644 --- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" OS-FLV-DISABLED:disabled="False"> +<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" OS-FLV-DISABLED:disabled="False"> <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/> <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl index 3422de9f5..b86db0a46 100644 --- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl @@ -1,7 +1,7 @@ { "flavor": { "OS-FLV-EXT-DATA:ephemeral": 0, - "disk": 0, + "disk": 1, "id": "%(flavor_id)s", "links": [ { diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl index dc143010a..da45536c3 100644 --- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" OS-FLV-EXT-DATA:ephemeral="0"> +<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" OS-FLV-EXT-DATA:ephemeral="0"> <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/> <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl index 2c79efeaf..a798262f3 100644 --- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl @@ -2,7 +2,7 @@ "flavors": [ { "OS-FLV-EXT-DATA:ephemeral": 0, - "disk": 0, + "disk": 1, "id": "1", "links": [ { diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl index 7108ebd79..5ba463188 100644 --- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <flavors xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0"> + <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0"> <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/> <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl index bbd681e66..b68bc3c97 100644 --- a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl @@ -2,7 +2,7 @@ "flavor": { "OS-FLV-DISABLED:disabled": false, "OS-FLV-EXT-DATA:ephemeral": 0, - "disk": 0, + "disk": 1, "id": "1", "links": [ { @@ -21,4 +21,4 @@ "swap": "", "vcpus": 1 } -}
\ No newline at end of file +} diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl index 920b82e53..53f870ec4 100644 --- a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="0" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False"> +<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="1" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False"> <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/> <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl b/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl index 86ff86fa1..723be2898 100644 --- a/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl @@ -1,6 +1,6 @@ { "flavor": { - "disk": 0, + "disk": 1, "id": "1", "links": [ { diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl b/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl index ca49884f3..5925c588d 100644 --- a/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" disk="0" id="1"> +<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" disk="1" id="1"> <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/> <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl b/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl index ab86d2a52..fb9a8ff1f 100644 --- a/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl +++ b/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl @@ -71,4 +71,4 @@ "name": "m1.xlarge" } ] -}
\ No newline at end of file +} diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl index 711207d2d..b5f1eea54 100644 --- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl @@ -1,7 +1,7 @@ { "flavors": [ { - "disk": 0, + "disk": 1, "id": "1", "links": [ { diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl index cdef74cce..8ee66226a 100644 --- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True"> + <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True"> <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/> <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl index 975f38661..2e991a4ce 100644 --- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl @@ -1,6 +1,6 @@ { "flavor": { - "disk": 0, + "disk": 1, "id": "%(flavor_id)s", "links": [ { diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl index f9a3ff178..ae18daba2 100644 --- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" os-flavor-access:is_public="True"> +<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" os-flavor-access:is_public="True"> <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/> <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl index a7f3a1993..241cf7c80 100644 --- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl @@ -1,6 +1,6 @@ { "flavor": { - "disk": 0, + "disk": 1, "id": "%(flavor_id)s", "links": [ { diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl index 4feec740c..d461b443e 100644 --- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0"> +<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0"> <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/> <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl index 5b27e1385..035c860c9 100644 --- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl @@ -1,7 +1,7 @@ { "flavors": [ { - "disk": 0, + "disk": 1, "id": "1", "links": [ { diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl index fb2ee09e0..ee937b974 100644 --- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0"> + <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0"> <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/> <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl index be9afe012..9b7e57c8a 100644 --- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl @@ -1,6 +1,6 @@ { "flavor": { - "disk": 0, + "disk": 1, "id": "%(flavor_id)s", "links": [ { diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl index 53afae086..9375b14b5 100644 --- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" swap=""> +<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" swap=""> <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/> <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl index c46a1695d..1367e75de 100644 --- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl @@ -1,7 +1,7 @@ { "flavors": [ { - "disk": 0, + "disk": 1, "id": "1", "links": [ { diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl index ced8e1779..7c9c589be 100644 --- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" swap=""> + <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" swap=""> <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/> <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/> </flavor> diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl index 68092f353..a12dd7157 100644 --- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl +++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl @@ -6,7 +6,7 @@ "flavor": "m1.tiny", "hours": 1.0, "instance_id": "%(uuid)s", - "local_gb": 0, + "local_gb": 1, "memory_mb": 512, "name": "new-server-test", "started_at": "%(timestamp)s", @@ -20,7 +20,7 @@ "stop": "%(timestamp)s", "tenant_id": "openstack", "total_hours": 1.0, - "total_local_gb_usage": 0.0, + "total_local_gb_usage": 1.0, "total_memory_mb_usage": 512.0, "total_vcpus_usage": 1.0 } diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl index a8a065fa1..4a6882307 100644 --- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl +++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <tenant_usage> <tenant_id>openstack</tenant_id> - <total_local_gb_usage>0.0</total_local_gb_usage> + <total_local_gb_usage>1.0</total_local_gb_usage> <total_vcpus_usage>1.0</total_vcpus_usage> <total_memory_mb_usage>512.0</total_memory_mb_usage> <total_hours>1.0</total_hours> @@ -13,7 +13,7 @@ <name>new-server-test</name> <hours>1.0</hours> <memory_mb>512</memory_mb> - <local_gb>0</local_gb> + <local_gb>1</local_gb> <vcpus>1</vcpus> <tenant_id>openstack</tenant_id> <flavor>m1.tiny</flavor> diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl index b33ccbfc2..082e6bc90 100644 --- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl +++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl @@ -5,7 +5,7 @@ "stop": "%(timestamp)s", "tenant_id": "openstack", "total_hours": 1.0, - "total_local_gb_usage": 0.0, + "total_local_gb_usage": 1.0, "total_memory_mb_usage": 512.0, "total_vcpus_usage": 1.0 } diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl index 536e79738..4a2833da8 100644 --- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl +++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl @@ -2,7 +2,7 @@ <tenant_usages> <tenant_usage> <tenant_id>openstack</tenant_id> - <total_local_gb_usage>0.0</total_local_gb_usage> + <total_local_gb_usage>1.0</total_local_gb_usage> <total_vcpus_usage>1.0</total_vcpus_usage> <total_memory_mb_usage>512.0</total_memory_mb_usage> <total_hours>1.0</total_hours> diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index e24f24189..9b678ddd3 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -52,12 +52,12 @@ from nova.tests.api.openstack.compute.contrib import test_fping from nova.tests.api.openstack.compute.contrib import test_networks from nova.tests.api.openstack.compute.contrib import test_services from nova.tests.api.openstack import fakes -from nova.tests.baremetal.db import base as bm_db_base from nova.tests import fake_instance_actions from nova.tests import fake_network from nova.tests.image import fake from nova.tests.integrated import integrated_helpers from nova.tests import utils as test_utils +from nova.tests.virt.baremetal.db import base as bm_db_base from nova import utils from nova.volume import cinder @@ -435,7 +435,7 @@ class VersionsSampleJsonTest(ApiSampleTestBase): def test_versions_get(self): response = self._do_get('', strip_version=True) subs = self._get_regexes() - return self._verify_response('versions-get-resp', subs, response, 200) + self._verify_response('versions-get-resp', subs, response, 200) class VersionsSampleXmlTest(VersionsSampleJsonTest): @@ -465,14 +465,14 @@ class ServersSampleJsonTest(ServersSampleBase): subs['id'] = uuid subs['hypervisor_hostname'] = r'[\w\.\-]+' subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}' - return self._verify_response('server-get-resp', subs, response, 200) + self._verify_response('server-get-resp', subs, response, 200) def test_servers_list(self): uuid = self._post_server() response = self._do_get('servers') subs = self._get_regexes() subs['id'] = uuid - return self._verify_response('servers-list-resp', subs, response, 200) + self._verify_response('servers-list-resp', subs, response, 200) def test_servers_details(self): uuid = self._post_server() @@ -482,8 +482,7 @@ class ServersSampleJsonTest(ServersSampleBase): subs['id'] = uuid subs['hypervisor_hostname'] = r'[\w\.\-]+' subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}' - return self._verify_response('servers-details-resp', subs, - response, 200) + self._verify_response('servers-details-resp', subs, response, 200) class ServersSampleXmlTest(ServersSampleJsonTest): @@ -515,7 +514,6 @@ class ServersMetadataJsonTest(ServersSampleBase): 'server-metadata-all-req', subs) self._verify_response('server-metadata-all-resp', subs, response, 200) - return uuid def generalize_subs(self, subs, vanilla_regexes): @@ -525,7 +523,7 @@ class ServersMetadataJsonTest(ServersSampleBase): def test_metadata_put_all(self): # Test setting all metadata for a server. subs = {'value': 'Foo Value'} - return self._create_and_set(subs) + self._create_and_set(subs) def test_metadata_post_all(self): # Test updating all metadata for a server. @@ -552,16 +550,14 @@ class ServersMetadataJsonTest(ServersSampleBase): response = self._do_put('servers/%s/metadata/foo' % uuid, 'server-metadata-req', subs) - return self._verify_response('server-metadata-resp', subs, - response, 200) + self._verify_response('server-metadata-resp', subs, response, 200) def test_metadata_get(self): # Test getting an individual metadata item for a server. subs = {'value': 'Foo Value'} uuid = self._create_and_set(subs) response = self._do_get('servers/%s/metadata/foo' % uuid) - return self._verify_response('server-metadata-resp', subs, - response, 200) + self._verify_response('server-metadata-resp', subs, response, 200) def test_metadata_delete(self): # Test deleting an individual metadata item for a server. @@ -582,15 +578,14 @@ class ServersIpsJsonTest(ServersSampleBase): uuid = self._post_server() response = self._do_get('servers/%s/ips' % uuid) subs = self._get_regexes() - return self._verify_response('server-ips-resp', subs, response, 200) + self._verify_response('server-ips-resp', subs, response, 200) def test_get_by_network(self): # Test getting a server's IP information by network id. uuid = self._post_server() response = self._do_get('servers/%s/ips/private' % uuid) subs = self._get_regexes() - return self._verify_response('server-ips-network-resp', subs, - response, 200) + self._verify_response('server-ips-network-resp', subs, response, 200) class ServersIpsXmlTest(ServersIpsJsonTest): @@ -603,8 +598,7 @@ class ExtensionsSampleJsonTest(ApiSampleTestBase): def test_extensions_get(self): response = self._do_get('extensions') subs = self._get_regexes() - return self._verify_response('extensions-get-resp', subs, - response, 200) + self._verify_response('extensions-get-resp', subs, response, 200) class ExtensionsSampleXmlTest(ExtensionsSampleJsonTest): @@ -616,12 +610,12 @@ class FlavorsSampleJsonTest(ApiSampleTestBase): def test_flavors_get(self): response = self._do_get('flavors/1') subs = self._get_regexes() - return self._verify_response('flavor-get-resp', subs, response, 200) + self._verify_response('flavor-get-resp', subs, response, 200) def test_flavors_list(self): response = self._do_get('flavors') subs = self._get_regexes() - return self._verify_response('flavors-list-resp', subs, response, 200) + self._verify_response('flavors-list-resp', subs, response, 200) class FlavorsSampleXmlTest(FlavorsSampleJsonTest): @@ -634,34 +628,33 @@ class HostsSampleJsonTest(ApiSampleTestBase): def test_host_startup(self): response = self._do_get('os-hosts/%s/startup' % self.compute.host) subs = self._get_regexes() - return self._verify_response('host-get-startup', subs, response, 200) + self._verify_response('host-get-startup', subs, response, 200) def test_host_reboot(self): response = self._do_get('os-hosts/%s/reboot' % self.compute.host) subs = self._get_regexes() - return self._verify_response('host-get-reboot', subs, response, 200) + self._verify_response('host-get-reboot', subs, response, 200) def test_host_shutdown(self): response = self._do_get('os-hosts/%s/shutdown' % self.compute.host) subs = self._get_regexes() - return self._verify_response('host-get-shutdown', subs, response, 200) + self._verify_response('host-get-shutdown', subs, response, 200) def test_host_maintenance(self): response = self._do_put('os-hosts/%s' % self.compute.host, 'host-put-maintenance-req', {}) subs = self._get_regexes() - return self._verify_response('host-put-maintenance-resp', subs, - response, 200) + self._verify_response('host-put-maintenance-resp', subs, response, 200) def test_host_get(self): response = self._do_get('os-hosts/%s' % self.compute.host) subs = self._get_regexes() - return self._verify_response('host-get-resp', subs, response, 200) + self._verify_response('host-get-resp', subs, response, 200) def test_hosts_list(self): response = self._do_get('os-hosts') subs = self._get_regexes() - return self._verify_response('hosts-list-resp', subs, response, 200) + self._verify_response('hosts-list-resp', subs, response, 200) class HostsSampleXmlTest(HostsSampleJsonTest): @@ -681,8 +674,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase): # Get api sample of images get list request. response = self._do_get('images') subs = self._get_regexes() - return self._verify_response('images-list-get-resp', subs, - response, 200) + self._verify_response('images-list-get-resp', subs, response, 200) def test_image_get(self): # Get api sample of one single image details request. @@ -690,14 +682,13 @@ class ImagesSampleJsonTest(ApiSampleTestBase): response = self._do_get('images/%s' % image_id) subs = self._get_regexes() subs['image_id'] = image_id - return self._verify_response('image-get-resp', subs, response, 200) + self._verify_response('image-get-resp', subs, response, 200) def test_images_details(self): # Get api sample of all images details request. response = self._do_get('images/detail') subs = self._get_regexes() - return self._verify_response('images-details-get-resp', subs, - response, 200) + self._verify_response('images-details-get-resp', subs, response, 200) def test_image_metadata_get(self): # Get api sample of an image metadata request. @@ -705,8 +696,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase): response = self._do_get('images/%s/metadata' % image_id) subs = self._get_regexes() subs['image_id'] = image_id - return self._verify_response('image-metadata-get-resp', subs, - response, 200) + self._verify_response('image-metadata-get-resp', subs, response, 200) def test_image_metadata_post(self): # Get api sample to update metadata of an image metadata request. @@ -715,8 +705,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase): 'images/%s/metadata' % image_id, 'image-metadata-post-req', {}) subs = self._get_regexes() - return self._verify_response('image-metadata-post-resp', subs, - response, 200) + self._verify_response('image-metadata-post-resp', subs, response, 200) def test_image_metadata_put(self): # Get api sample of image metadata put request. @@ -724,8 +713,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase): response = self._do_put('images/%s/metadata' % image_id, 'image-metadata-put-req', {}) subs = self._get_regexes() - return self._verify_response('image-metadata-put-resp', subs, - response, 200) + self._verify_response('image-metadata-put-resp', subs, response, 200) def test_image_meta_key_get(self): # Get api sample of an image metadata key request. @@ -733,7 +721,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase): key = "kernel_id" response = self._do_get('images/%s/metadata/%s' % (image_id, key)) subs = self._get_regexes() - return self._verify_response('image-meta-key-get', subs, response, 200) + self._verify_response('image-meta-key-get', subs, response, 200) def test_image_meta_key_put(self): # Get api sample of image metadata key put request. @@ -742,8 +730,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase): response = self._do_put('images/%s/metadata/%s' % (image_id, key), 'image-meta-key-put-req', {}) subs = self._get_regexes() - return self._verify_response('image-meta-key-put-resp', subs, - response, 200) + self._verify_response('image-meta-key-put-resp', subs, response, 200) class ImagesSampleXmlTest(ImagesSampleJsonTest): @@ -754,7 +741,7 @@ class LimitsSampleJsonTest(ApiSampleTestBase): def test_limits_get(self): response = self._do_get('limits') subs = self._get_regexes() - return self._verify_response('limit-get-resp', subs, response, 200) + self._verify_response('limit-get-resp', subs, response, 200) class LimitsSampleXmlTest(LimitsSampleJsonTest): @@ -800,8 +787,7 @@ class CoverageExtJsonTests(ApiSampleTestBase): response = self._do_post('os-coverage/action', 'coverage-stop-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('coverage-stop-post-resp', - subs, response, 200) + self._verify_response('coverage-stop-post-resp', subs, response, 200) def test_report_coverage(self): # Generate a coverage report. @@ -812,8 +798,7 @@ class CoverageExtJsonTests(ApiSampleTestBase): response = self._do_post('os-coverage/action', 'coverage-report-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('coverage-report-post-resp', - subs, response, 200) + self._verify_response('coverage-report-post-resp', subs, response, 200) def test_xml_report_coverage(self): subs = { @@ -823,8 +808,8 @@ class CoverageExtJsonTests(ApiSampleTestBase): response = self._do_post('os-coverage/action', 'coverage-xml-report-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('coverage-xml-report-post-resp', - subs, response, 200) + self._verify_response('coverage-xml-report-post-resp', + subs, response, 200) class CoverageExtXmlTests(CoverageExtJsonTests): @@ -840,7 +825,7 @@ class ServersActionsJsonTest(ServersSampleBase): subs) if resp_tpl: subs.update(self._get_regexes()) - return self._verify_response(resp_tpl, subs, response, code) + self._verify_response(resp_tpl, subs, response, code) else: self.assertEqual(response.status, code) self.assertEqual(response.read(), "") @@ -946,7 +931,7 @@ class UserDataJsonTest(ApiSampleTestBase): response = self._do_post('servers', 'userdata-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('userdata-post-resp', subs, response, 202) + self._verify_response('userdata-post-resp', subs, response, 202) class UserDataXmlTest(UserDataJsonTest): @@ -973,14 +958,14 @@ class FlavorsExtraDataJsonTest(ApiSampleTestBase): 'flavor_name': 'm1.tiny' } subs.update(self._get_regexes()) - return self._verify_response('flavors-extra-data-get-resp', subs, - response, 200) + self._verify_response('flavors-extra-data-get-resp', + subs, response, 200) def test_flavors_extra_data_list(self): response = self._do_get('flavors/detail') subs = self._get_regexes() - return self._verify_response('flavors-extra-data-list-resp', subs, - response, 200) + self._verify_response('flavors-extra-data-list-resp', + subs, response, 200) def test_flavors_extra_data_create(self): subs = { @@ -991,8 +976,8 @@ class FlavorsExtraDataJsonTest(ApiSampleTestBase): 'flavors-extra-data-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('flavors-extra-data-post-resp', - subs, response, 200) + self._verify_response('flavors-extra-data-post-resp', + subs, response, 200) class FlavorsExtraDataXmlTest(FlavorsExtraDataJsonTest): @@ -1019,14 +1004,12 @@ class FlavorRxtxJsonTest(ApiSampleTestBase): 'flavor_name': 'm1.tiny' } subs.update(self._get_regexes()) - return self._verify_response('flavor-rxtx-get-resp', subs, - response, 200) + self._verify_response('flavor-rxtx-get-resp', subs, response, 200) def test_flavors_rxtx_list(self): response = self._do_get('flavors/detail') subs = self._get_regexes() - return self._verify_response('flavor-rxtx-list-resp', subs, - response, 200) + self._verify_response('flavor-rxtx-list-resp', subs, response, 200) def test_flavors_rxtx_create(self): subs = { @@ -1037,8 +1020,7 @@ class FlavorRxtxJsonTest(ApiSampleTestBase): 'flavor-rxtx-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('flavor-rxtx-post-resp', - subs, response, 200) + self._verify_response('flavor-rxtx-post-resp', subs, response, 200) class FlavorRxtxXmlTest(FlavorRxtxJsonTest): @@ -1065,14 +1047,12 @@ class FlavorSwapJsonTest(ApiSampleTestBase): 'flavor_name': 'm1.tiny' } subs.update(self._get_regexes()) - return self._verify_response('flavor-swap-get-resp', subs, - response, 200) + self._verify_response('flavor-swap-get-resp', subs, response, 200) def test_flavor_swap_list(self): response = self._do_get('flavors/detail') subs = self._get_regexes() - return self._verify_response('flavor-swap-list-resp', subs, - response, 200) + self._verify_response('flavor-swap-list-resp', subs, response, 200) def test_flavor_swap_create(self): subs = { @@ -1083,8 +1063,7 @@ class FlavorSwapJsonTest(ApiSampleTestBase): 'flavor-swap-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('flavor-swap-post-resp', - subs, response, 200) + self._verify_response('flavor-swap-post-resp', subs, response, 200) class FlavorSwapXmlTest(FlavorSwapJsonTest): @@ -1110,8 +1089,8 @@ class SecurityGroupsSampleJsonTest(ServersSampleBase): subs = { 'group_name': 'test' } - return self._do_post('servers/%s/action' % uuid, - 'security-group-add-post-req', subs) + return self._do_post('servers/%s/action' % uuid, + 'security-group-add-post-req', subs) def test_security_group_create(self): response = self._create_security_group() @@ -1123,24 +1102,23 @@ class SecurityGroupsSampleJsonTest(ServersSampleBase): # Get api sample of security groups get list request. response = self._do_get('os-security-groups') subs = self._get_regexes() - return self._verify_response('security-groups-list-get-resp', - subs, response, 200) + self._verify_response('security-groups-list-get-resp', + subs, response, 200) def test_security_groups_get(self): # Get api sample of security groups get request. security_group_id = '1' response = self._do_get('os-security-groups/%s' % security_group_id) subs = self._get_regexes() - return self._verify_response('security-groups-get-resp', - subs, response, 200) + self._verify_response('security-groups-get-resp', subs, response, 200) def test_security_groups_list_server(self): # Get api sample of security groups for a specific server. uuid = self._post_server() response = self._do_get('servers/%s/os-security-groups' % uuid) subs = self._get_regexes() - return self._verify_response('server-security-groups-list-resp', - subs, response, 200) + self._verify_response('server-security-groups-list-resp', + subs, response, 200) def test_security_groups_add(self): self._create_security_group() @@ -1175,21 +1153,21 @@ class SecurityGroupDefaultRulesSampleJsonTest(ServersSampleBase): response = self._do_post('os-security-group-default-rules', 'security-group-default-rules-create-req', {}) - return self._verify_response( - 'security-group-default-rules-create-resp', {}, response, 200) + self._verify_response('security-group-default-rules-create-resp', + {}, response, 200) def test_security_group_default_rules_list(self): self.test_security_group_default_rules_create() response = self._do_get('os-security-group-default-rules') - return self._verify_response('security-group-default-rules-list-resp', - {}, response, 200) + self._verify_response('security-group-default-rules-list-resp', + {}, response, 200) def test_security_group_default_rules_show(self): self.test_security_group_default_rules_create() rule_id = '1' response = self._do_get('os-security-group-default-rules/%s' % rule_id) - return self._verify_response('security-group-default-rules-show-resp', - {}, response, 200) + self._verify_response('security-group-default-rules-show-resp', + {}, response, 200) class SecurityGroupDefaultRulesSampleXmlTest( @@ -1209,8 +1187,7 @@ class SchedulerHintsJsonTest(ApiSampleTestBase): response = self._do_post('servers', 'scheduler-hints-post-req', hints) subs = self._get_regexes() - return self._verify_response('scheduler-hints-post-resp', subs, - response, 202) + self._verify_response('scheduler-hints-post-resp', subs, response, 202) class SchedulerHintsXmlTest(SchedulerHintsJsonTest): @@ -1227,8 +1204,7 @@ class ConsoleOutputSampleJsonTest(ServersSampleBase): 'console-output-post-req', {'action': 'os-getConsoleOutput'}) subs = self._get_regexes() - return self._verify_response('console-output-post-resp', - subs, response, 200) + self._verify_response('console-output-post-resp', subs, response, 200) class ConsoleOutputSampleXmlTest(ConsoleOutputSampleJsonTest): @@ -1249,8 +1225,7 @@ class ExtendedServerAttributesJsonTest(ServersSampleBase): subs['id'] = uuid subs['instance_name'] = 'instance-\d{8}' subs['hypervisor_hostname'] = r'[\w\.\-]+' - return self._verify_response('server-get-resp', - subs, response, 200) + self._verify_response('server-get-resp', subs, response, 200) def test_detail(self): uuid = self._post_server() @@ -1261,8 +1236,7 @@ class ExtendedServerAttributesJsonTest(ServersSampleBase): subs['id'] = uuid subs['instance_name'] = 'instance-\d{8}' subs['hypervisor_hostname'] = r'[\w\.\-]+' - return self._verify_response('servers-detail-resp', - subs, response, 200) + self._verify_response('servers-detail-resp', subs, response, 200) class ExtendedServerAttributesXmlTest(ExtendedServerAttributesJsonTest): @@ -1307,8 +1281,8 @@ class FloatingIpsJsonTest(ApiSampleTestBase): response = self._do_get('os-floating-ips') subs = self._get_regexes() - return self._verify_response('floating-ips-list-empty-resp', - subs, response, 200) + self._verify_response('floating-ips-list-empty-resp', + subs, response, 200) def test_floating_ips_list(self): self._do_post('os-floating-ips', @@ -1320,8 +1294,8 @@ class FloatingIpsJsonTest(ApiSampleTestBase): response = self._do_get('os-floating-ips') subs = self._get_regexes() - return self._verify_response('floating-ips-list-resp', - subs, response, 200) + self._verify_response('floating-ips-list-resp', + subs, response, 200) def test_floating_ips_create_nopool(self): response = self._do_post('os-floating-ips', @@ -1336,8 +1310,7 @@ class FloatingIpsJsonTest(ApiSampleTestBase): 'floating-ips-create-req', {"pool": CONF.default_floating_pool}) subs = self._get_regexes() - self._verify_response('floating-ips-create-resp', - subs, response, 200) + self._verify_response('floating-ips-create-resp', subs, response, 200) def test_floating_ips_get(self): self.test_floating_ips_create() @@ -1345,8 +1318,7 @@ class FloatingIpsJsonTest(ApiSampleTestBase): # but it would be better if we could get this from the create response = self._do_get('os-floating-ips/%d' % 1) subs = self._get_regexes() - self._verify_response('floating-ips-create-resp', - subs, response, 200) + self._verify_response('floating-ips-create-resp', subs, response, 200) def test_floating_ips_delete(self): self.test_floating_ips_create() @@ -1407,14 +1379,14 @@ class FloatingIpsBulkJsonTest(ApiSampleTestBase): def test_floating_ips_bulk_list(self): response = self._do_get('os-floating-ips-bulk') subs = self._get_regexes() - return self._verify_response('floating-ips-bulk-list-resp', subs, - response, 200) + self._verify_response('floating-ips-bulk-list-resp', + subs, response, 200) def test_floating_ips_bulk_list_by_host(self): response = self._do_get('os-floating-ips-bulk/testHost') subs = self._get_regexes() - return self._verify_response('floating-ips-bulk-list-by-host-resp', - subs, response, 200) + self._verify_response('floating-ips-bulk-list-by-host-resp', + subs, response, 200) def test_floating_ips_bulk_create(self): response = self._do_post('os-floating-ips-bulk', @@ -1423,16 +1395,16 @@ class FloatingIpsBulkJsonTest(ApiSampleTestBase): "pool": CONF.default_floating_pool, "interface": CONF.public_interface}) subs = self._get_regexes() - return self._verify_response('floating-ips-bulk-create-resp', subs, - response, 200) + self._verify_response('floating-ips-bulk-create-resp', subs, + response, 200) def test_floating_ips_bulk_delete(self): response = self._do_put('os-floating-ips-bulk/delete', 'floating-ips-bulk-delete-req', {"ip_range": "192.168.1.0/24"}) subs = self._get_regexes() - return self._verify_response('floating-ips-bulk-delete-resp', subs, - response, 200) + self._verify_response('floating-ips-bulk-delete-resp', subs, + response, 200) class FloatingIpsBulkXmlTest(FloatingIpsBulkJsonTest): @@ -1482,7 +1454,7 @@ class KeyPairsSampleJsonTest(ApiSampleTestBase): response = self._do_get('os-keypairs') subs = self._get_regexes() subs['keypair_name'] = '(%s)' % key_name - return self._verify_response('keypairs-get-resp', subs, response, 200) + self._verify_response('keypairs-get-resp', subs, response, 200) class KeyPairsSampleXmlTest(KeyPairsSampleJsonTest): @@ -1601,8 +1573,7 @@ class CloudPipeSampleJsonTest(ApiSampleTestBase): subs = self._get_regexes() subs.update(project) subs['image_id'] = CONF.vpn_image_id - return self._verify_response('cloud-pipe-get-resp', subs, - response, 200) + self._verify_response('cloud-pipe-get-resp', subs, response, 200) class CloudPipeSampleXmlTest(CloudPipeSampleJsonTest): @@ -1710,7 +1681,7 @@ class AgentsJsonTest(ApiSampleTestBase): 'md5hash': 'add6bb58e139be103324d04d82d8f545', 'agent_id': 1 } - return self._verify_response('agents-get-resp', project, response, 200) + self._verify_response('agents-get-resp', project, response, 200) def test_agent_update(self): # Update an existing agent build. @@ -1721,8 +1692,7 @@ class AgentsJsonTest(ApiSampleTestBase): response = self._do_put('os-agents/%s' % agent_id, 'agent-update-put-req', subs) subs['agent_id'] = 1 - return self._verify_response('agent-update-put-resp', subs, - response, 200) + self._verify_response('agent-update-put-resp', subs, response, 200) def test_agent_delete(self): # Deletes an existing agent build. @@ -1811,8 +1781,7 @@ class FixedIpJsonTest(ApiSampleTestBase): 'hostname': 'openstack', 'host': 'host', 'address': '192.168.1.1'} - return self._verify_response('fixedips-get-resp', project, - response, 200) + self._verify_response('fixedips-get-resp', project, response, 200) class FixedIpXmlTest(FixedIpJsonTest): @@ -1829,22 +1798,20 @@ class AggregatesSampleJsonTest(ServersSampleBase): } response = self._do_post('os-aggregates', 'aggregate-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('aggregate-post-resp', subs, - response, 200) + return self._verify_response('aggregate-post-resp', + subs, response, 200) def test_list_aggregates(self): self.test_aggregate_create() response = self._do_get('os-aggregates') subs = self._get_regexes() - return self._verify_response('aggregates-list-get-resp', subs, - response, 200) + self._verify_response('aggregates-list-get-resp', subs, response, 200) def test_aggregate_get(self): agg_id = self.test_aggregate_create() response = self._do_get('os-aggregates/%s' % agg_id) subs = self._get_regexes() - return self._verify_response('aggregates-get-resp', subs, - response, 200) + self._verify_response('aggregates-get-resp', subs, response, 200) def test_add_metadata(self): agg_id = self.test_aggregate_create() @@ -1852,8 +1819,8 @@ class AggregatesSampleJsonTest(ServersSampleBase): 'aggregate-metadata-post-req', {'action': 'set_metadata'}) subs = self._get_regexes() - return self._verify_response('aggregates-metadata-post-resp', subs, - response, 200) + self._verify_response('aggregates-metadata-post-resp', subs, + response, 200) def test_add_host(self): aggregate_id = self.test_aggregate_create() @@ -1863,8 +1830,8 @@ class AggregatesSampleJsonTest(ServersSampleBase): response = self._do_post('os-aggregates/%s/action' % aggregate_id, 'aggregate-add-host-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('aggregates-add-host-post-resp', subs, - response, 200) + self._verify_response('aggregates-add-host-post-resp', subs, + response, 200) def test_remove_host(self): self.test_add_host() @@ -1874,16 +1841,16 @@ class AggregatesSampleJsonTest(ServersSampleBase): response = self._do_post('os-aggregates/1/action', 'aggregate-remove-host-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('aggregates-remove-host-post-resp', - subs, response, 200) + self._verify_response('aggregates-remove-host-post-resp', + subs, response, 200) def test_update_aggregate(self): aggregate_id = self.test_aggregate_create() response = self._do_put('os-aggregates/%s' % aggregate_id, 'aggregate-update-post-req', {}) subs = self._get_regexes() - return self._verify_response('aggregate-update-post-resp', - subs, response, 200) + self._verify_response('aggregate-update-post-resp', + subs, response, 200) class AggregatesSampleXmlTest(AggregatesSampleJsonTest): @@ -1898,14 +1865,12 @@ class CertificatesSamplesJsonTest(ApiSampleTestBase): response = self._do_post('os-certificates', 'certificate-create-req', {}) subs = self._get_regexes() - return self._verify_response('certificate-create-resp', subs, - response, 200) + self._verify_response('certificate-create-resp', subs, response, 200) def test_get_root_certificate(self): response = self._do_get('os-certificates/root') subs = self._get_regexes() - return self._verify_response('certificate-get-root-resp', subs, - response, 200) + self._verify_response('certificate-get-root-resp', subs, response, 200) class CertificatesSamplesXmlTest(CertificatesSamplesJsonTest): @@ -1920,8 +1885,7 @@ class UsedLimitsSamplesJsonTest(ApiSampleTestBase): # Get api sample to used limits. response = self._do_get('limits') subs = self._get_regexes() - return self._verify_response('usedlimits-get-resp', subs, - response, 200) + self._verify_response('usedlimits-get-resp', subs, response, 200) class UsedLimitsSamplesXmlTest(UsedLimitsSamplesJsonTest): @@ -1941,8 +1905,7 @@ class MultipleCreateJsonTest(ServersSampleBase): } response = self._do_post('servers', 'multiple-create-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('multiple-create-post-resp', subs, - response, 202) + self._verify_response('multiple-create-post-resp', subs, response, 202) def test_multiple_create_without_reservation_id(self): subs = { @@ -1954,8 +1917,8 @@ class MultipleCreateJsonTest(ServersSampleBase): response = self._do_post('servers', 'multiple-create-no-resv-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('multiple-create-no-resv-post-resp', subs, - response, 202) + self._verify_response('multiple-create-no-resv-post-resp', subs, + response, 202) class MultipleCreateXmlTest(MultipleCreateJsonTest): @@ -1988,8 +1951,7 @@ class ServicesJsonTest(ApiSampleTestBase): 'status': 'disabled', 'state': 'up'} subs.update(self._get_regexes()) - return self._verify_response('services-list-get-resp', - subs, response, 200) + self._verify_response('services-list-get-resp', subs, response, 200) def test_service_enable(self): """Enable an existing agent build.""" @@ -1999,8 +1961,7 @@ class ServicesJsonTest(ApiSampleTestBase): 'service-enable-put-req', subs) subs = {"host": "host1", "binary": "nova-compute"} - return self._verify_response('service-enable-put-resp', subs, - response, 200) + self._verify_response('service-enable-put-resp', subs, response, 200) def test_service_disable(self): """Disable an existing agent build.""" @@ -2010,8 +1971,7 @@ class ServicesJsonTest(ApiSampleTestBase): 'service-disable-put-req', subs) subs = {"host": "host1", "binary": "nova-compute"} - return self._verify_response('service-disable-put-resp', subs, - response, 200) + self._verify_response('service-disable-put-resp', subs, response, 200) class ServicesXmlTest(ServicesJsonTest): @@ -2043,8 +2003,7 @@ class SimpleTenantUsageSampleJsonTest(ServersSampleBase): response = self._do_get('os-simple-tenant-usage?%s' % ( urllib.urlencode(self.query))) subs = self._get_regexes() - self._verify_response('simple-tenant-usage-get', subs, - response, 200) + self._verify_response('simple-tenant-usage-get', subs, response, 200) def test_get_tenant_usage_details(self): # Get api sample to get specific tenant usage request. @@ -2068,8 +2027,8 @@ class ServerDiagnosticsSamplesJsonTest(ServersSampleBase): uuid = self._post_server() response = self._do_get('servers/%s/diagnostics' % uuid) subs = self._get_regexes() - return self._verify_response('server-diagnostics-get-resp', subs, - response, 200) + self._verify_response('server-diagnostics-get-resp', subs, + response, 200) class ServerDiagnosticsSamplesXmlTest(ServerDiagnosticsSamplesJsonTest): @@ -2088,8 +2047,8 @@ class AvailabilityZoneJsonTest(ServersSampleBase): } response = self._do_post('servers', 'availability-zone-post-req', subs) subs.update(self._get_regexes()) - return self._verify_response('availability-zone-post-resp', subs, - response, 202) + self._verify_response('availability-zone-post-resp', subs, + response, 202) class AvailabilityZoneXmlTest(AvailabilityZoneJsonTest): @@ -2243,8 +2202,7 @@ class ConsolesSampleJsonTests(ServersSampleBase): subs = self._get_regexes() subs["url"] = \ "((https?):((//)|(\\\\))+([\w\d:#@%/;$()~_?\+-=\\\.&](#!)?)*)" - return self._verify_response('get-vnc-console-post-resp', - subs, response, 200) + self._verify_response('get-vnc-console-post-resp', subs, response, 200) def test_get_spice_console(self): uuid = self._post_server() @@ -2254,8 +2212,8 @@ class ConsolesSampleJsonTests(ServersSampleBase): subs = self._get_regexes() subs["url"] = \ "((https?):((//)|(\\\\))+([\w\d:#@%/;$()~_?\+-=\\\.&](#!)?)*)" - return self._verify_response('get-spice-console-post-resp', subs, - response, 200) + self._verify_response('get-spice-console-post-resp', subs, + response, 200) class ConsolesSampleXmlTests(ConsolesSampleJsonTests): @@ -2299,21 +2257,20 @@ class QuotasSampleJsonTests(ApiSampleTestBase): def test_show_quotas(self): # Get api sample to show quotas. response = self._do_get('os-quota-sets/fake_tenant') - return self._verify_response('quotas-show-get-resp', {}, response, 200) + self._verify_response('quotas-show-get-resp', {}, response, 200) def test_show_quotas_defaults(self): # Get api sample to show quotas defaults. response = self._do_get('os-quota-sets/fake_tenant/defaults') - return self._verify_response('quotas-show-defaults-get-resp', - {}, response, 200) + self._verify_response('quotas-show-defaults-get-resp', + {}, response, 200) def test_update_quotas(self): # Get api sample to update quotas. response = self._do_put('os-quota-sets/fake_tenant', 'quotas-update-post-req', {}) - return self._verify_response('quotas-update-post-resp', {}, - response, 200) + self._verify_response('quotas-update-post-resp', {}, response, 200) class QuotasSampleXmlTests(QuotasSampleJsonTests): @@ -2331,7 +2288,7 @@ class ExtendedIpsSampleJsonTests(ServersSampleBase): subs['hostid'] = '[a-f0-9]+' subs['id'] = uuid subs['hypervisor_hostname'] = r'[\w\.\-]+' - return self._verify_response('server-get-resp', subs, response, 200) + self._verify_response('server-get-resp', subs, response, 200) def test_detail(self): uuid = self._post_server() @@ -2339,8 +2296,7 @@ class ExtendedIpsSampleJsonTests(ServersSampleBase): subs = self._get_regexes() subs['id'] = uuid subs['hostid'] = '[a-f0-9]+' - return self._verify_response('servers-detail-resp', subs, - response, 200) + self._verify_response('servers-detail-resp', subs, response, 200) class ExtendedIpsSampleXmlTests(ExtendedIpsSampleJsonTests): @@ -2360,8 +2316,7 @@ class ExtendedIpsMacSampleJsonTests(ServersSampleBase): subs['id'] = uuid subs['hypervisor_hostname'] = r'[\w\.\-]+' subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}' - return self._verify_response('server-get-resp', subs, - response, 200) + self._verify_response('server-get-resp', subs, response, 200) def test_detail(self): uuid = self._post_server() @@ -2371,8 +2326,7 @@ class ExtendedIpsMacSampleJsonTests(ServersSampleBase): subs['id'] = uuid subs['hostid'] = '[a-f0-9]+' subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}' - return self._verify_response('servers-detail-resp', subs, - response, 200) + self._verify_response('servers-detail-resp', subs, response, 200) class ExtendedIpsMacSampleXmlTests(ExtendedIpsMacSampleJsonTests): @@ -2388,7 +2342,7 @@ class ExtendedStatusSampleJsonTests(ServersSampleBase): response = self._do_get('servers/%s' % uuid) subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' - return self._verify_response('server-get-resp', subs, response, 200) + self._verify_response('server-get-resp', subs, response, 200) def test_detail(self): uuid = self._post_server() @@ -2396,8 +2350,7 @@ class ExtendedStatusSampleJsonTests(ServersSampleBase): subs = self._get_regexes() subs['id'] = uuid subs['hostid'] = '[a-f0-9]+' - return self._verify_response('servers-detail-resp', subs, - response, 200) + self._verify_response('servers-detail-resp', subs, response, 200) class ExtendedStatusSampleXmlTests(ExtendedStatusSampleJsonTests): @@ -2448,8 +2401,7 @@ class FlavorManageSampleJsonTests(ApiSampleTestBase): "flavor-create-post-req", subs) subs.update(self._get_regexes()) - return self._verify_response("flavor-create-post-resp", subs, - response, 200) + self._verify_response("flavor-create-post-resp", subs, response, 200) def test_create_flavor(self): # Get api sample to create a flavor. @@ -2487,7 +2439,7 @@ class ServerPasswordSampleJsonTests(ServersSampleBase): response = self._do_get('servers/%s/os-server-password' % uuid) subs = self._get_regexes() subs['encrypted_password'] = fake_ext_password().replace('+', '\\+') - return self._verify_response('get-password-resp', subs, response, 200) + self._verify_response('get-password-resp', subs, response, 200) def test_reset_password(self): uuid = self._post_server() @@ -2509,15 +2461,14 @@ class DiskConfigJsonTest(ServersSampleBase): subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' subs['id'] = uuid - return self._verify_response('list-servers-detail-get', subs, - response, 200) + self._verify_response('list-servers-detail-get', subs, response, 200) def test_get_server(self): uuid = self._post_server() response = self._do_get('servers/%s' % uuid) subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' - return self._verify_response('server-get-resp', subs, response, 200) + self._verify_response('server-get-resp', subs, response, 200) def test_update_server(self): uuid = self._post_server() @@ -2525,8 +2476,7 @@ class DiskConfigJsonTest(ServersSampleBase): 'server-update-put-req', {}) subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' - return self._verify_response('server-update-put-resp', - subs, response, 200) + self._verify_response('server-update-put-resp', subs, response, 200) def test_resize_server(self): self.flags(allow_resize_to_same_host=True) @@ -2548,20 +2498,20 @@ class DiskConfigJsonTest(ServersSampleBase): 'server-action-rebuild-req', subs) subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' - return self._verify_response('server-action-rebuild-resp', - subs, response, 202) + self._verify_response('server-action-rebuild-resp', + subs, response, 202) def test_get_image(self): image_id = fake.get_valid_image_id() response = self._do_get('images/%s' % image_id) subs = self._get_regexes() subs['image_id'] = image_id - return self._verify_response('image-get-resp', subs, response, 200) + self._verify_response('image-get-resp', subs, response, 200) def test_list_images(self): response = self._do_get('images/detail') subs = self._get_regexes() - return self._verify_response('image-list-resp', subs, response, 200) + self._verify_response('image-list-resp', subs, response, 200) class DiskConfigXmlTest(DiskConfigJsonTest): @@ -2589,7 +2539,7 @@ class OsNetworksJsonTests(ApiSampleTestBase): def test_list_networks(self): response = self._do_get('os-tenant-networks') subs = self._get_regexes() - return self._verify_response('networks-list-res', subs, response, 200) + self._verify_response('networks-list-res', subs, response, 200) def test_create_network(self): response = self._do_post('os-tenant-networks', "networks-post-req", {}) @@ -2720,15 +2670,13 @@ class FlavorDisabledSampleJsonTests(ApiSampleTestBase): response = self._do_get('flavors/%s' % flavor_id) subs = self._get_regexes() subs['flavor_id'] = flavor_id - return self._verify_response('flavor-show-get-resp', subs, - response, 200) + self._verify_response('flavor-show-get-resp', subs, response, 200) def test_detail_flavor(self): # Get api sample to show details of a flavor. response = self._do_get('flavors/detail') subs = self._get_regexes() - return self._verify_response('flavor-detail-get-resp', subs, - response, 200) + self._verify_response('flavor-detail-get-resp', subs, response, 200) class FlavorDisabledSampleXmlTests(FlavorDisabledSampleJsonTests): @@ -2744,16 +2692,16 @@ class QuotaClassesSampleJsonTests(ApiSampleTestBase): # Get api sample to show quota classes. response = self._do_get('os-quota-class-sets/%s' % self.set_id) subs = {'set_id': self.set_id} - return self._verify_response('quota-classes-show-get-resp', subs, - response, 200) + self._verify_response('quota-classes-show-get-resp', subs, + response, 200) def test_update_quota_classes(self): # Get api sample to update quota classes. response = self._do_put('os-quota-class-sets/%s' % self.set_id, 'quota-classes-update-post-req', {}) - return self._verify_response('quota-classes-update-post-resp', - {}, response, 200) + self._verify_response('quota-classes-update-post-resp', + {}, response, 200) class QuotaClassesSampleXmlTests(QuotaClassesSampleJsonTests): @@ -2800,18 +2748,17 @@ class CellsSampleJsonTest(ApiSampleTestBase): self._stub_cells(num_cells=0) response = self._do_get('os-cells') subs = self._get_regexes() - return self._verify_response('cells-list-empty-resp', subs, - response, 200) + self._verify_response('cells-list-empty-resp', subs, response, 200) def test_cells_list(self): response = self._do_get('os-cells') subs = self._get_regexes() - return self._verify_response('cells-list-resp', subs, response, 200) + self._verify_response('cells-list-resp', subs, response, 200) def test_cells_get(self): response = self._do_get('os-cells/cell3') subs = self._get_regexes() - return self._verify_response('cells-get-resp', subs, response, 200) + self._verify_response('cells-get-resp', subs, response, 200) class CellsSampleXmlTest(CellsSampleJsonTest): @@ -2839,8 +2786,8 @@ class BareMetalNodesJsonTest(ApiSampleTestBase, bm_db_base.BMDBTestCase): subs = {'node_id': '(?P<id>\d+)', 'interface_id': '\d+', 'address': address} - return self._verify_response("baremetal-node-create-with-address-resp", - subs, response, 200) + self._verify_response("baremetal-node-create-with-address-resp", + subs, response, 200) def test_create_node(self): self._create_node() @@ -2856,8 +2803,8 @@ class BareMetalNodesJsonTest(ApiSampleTestBase, bm_db_base.BMDBTestCase): 'interface_id': interface_id, 'address': 'aa:aa:aa:aa:aa:aa', } - return self._verify_response('baremetal-node-list-resp', subs, - response, 200) + self._verify_response('baremetal-node-list-resp', subs, + response, 200) def test_show_node(self): node_id = self._create_node() @@ -2867,8 +2814,7 @@ class BareMetalNodesJsonTest(ApiSampleTestBase, bm_db_base.BMDBTestCase): 'interface_id': interface_id, 'address': 'aa:aa:aa:aa:aa:aa', } - return self._verify_response('baremetal-node-show-resp', subs, - response, 200) + self._verify_response('baremetal-node-show-resp', subs, response, 200) def test_delete_node(self): node_id = self._create_node() @@ -2919,8 +2865,7 @@ class FloatingIPPoolsSampleJsonTests(ApiSampleTestBase): 'pool1': pool_list[0], 'pool2': pool_list[1] } - return self._verify_response('floatingippools-list-resp', subs, - response, 200) + self._verify_response('floatingippools-list-resp', subs, response, 200) class FloatingIPPoolsSampleXmlTests(FloatingIPPoolsSampleJsonTests): @@ -2960,15 +2905,15 @@ class InstanceUsageAuditLogJsonTest(ApiSampleTestBase): urllib.quote('2012-07-05 10:00:00')) subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' - return self._verify_response('inst-usage-audit-log-show-get-resp', - subs, response, 200) + self._verify_response('inst-usage-audit-log-show-get-resp', + subs, response, 200) def test_index_instance_usage_audit_log(self): response = self._do_get('os-instance_usage_audit_log') subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' - return self._verify_response('inst-usage-audit-log-index-get-resp', - subs, response, 200) + self._verify_response('inst-usage-audit-log-index-get-resp', + subs, response, 200) class InstanceUsageAuditLogXmlTest(InstanceUsageAuditLogJsonTest): @@ -2985,15 +2930,15 @@ class FlavorExtraSpecsSampleJsonTests(ApiSampleTestBase): } response = self._do_post('flavors/1/os-extra_specs', 'flavor-extra-specs-create-req', subs) - return self._verify_response('flavor-extra-specs-create-resp', - subs, response, 200) + self._verify_response('flavor-extra-specs-create-resp', + subs, response, 200) def test_flavor_extra_specs_get(self): subs = {'value1': 'value1'} self._flavor_extra_specs_create() response = self._do_get('flavors/1/os-extra_specs/key1') - return self._verify_response('flavor-extra-specs-get-resp', - subs, response, 200) + self._verify_response('flavor-extra-specs-get-resp', + subs, response, 200) def test_flavor_extra_specs_list(self): subs = {'value1': 'value1', @@ -3001,19 +2946,19 @@ class FlavorExtraSpecsSampleJsonTests(ApiSampleTestBase): } self._flavor_extra_specs_create() response = self._do_get('flavors/1/os-extra_specs') - return self._verify_response('flavor-extra-specs-list-resp', - subs, response, 200) + self._verify_response('flavor-extra-specs-list-resp', + subs, response, 200) def test_flavor_extra_specs_create(self): - return self._flavor_extra_specs_create() + self._flavor_extra_specs_create() def test_flavor_extra_specs_update(self): subs = {'value1': 'new_value1'} self._flavor_extra_specs_create() response = self._do_put('flavors/1/os-extra_specs/key1', 'flavor-extra-specs-update-req', subs) - return self._verify_response('flavor-extra-specs-update-resp', - subs, response, 200) + self._verify_response('flavor-extra-specs-update-resp', + subs, response, 200) def test_flavor_extra_specs_delete(self): self._flavor_extra_specs_create() @@ -3042,14 +2987,13 @@ class FpingSampleJsonTests(ServersSampleBase): self._post_server() response = self._do_get('os-fping') subs = self._get_regexes() - return self._verify_response('fping-get-resp', subs, response, 200) + self._verify_response('fping-get-resp', subs, response, 200) def test_get_fping_details(self): uuid = self._post_server() response = self._do_get('os-fping/%s' % (uuid)) subs = self._get_regexes() - return self._verify_response('fping-get-details-resp', subs, - response, 200) + self._verify_response('fping-get-details-resp', subs, response, 200) class FpingSampleXmlTests(FpingSampleJsonTests): @@ -3066,15 +3010,14 @@ class ExtendedAvailabilityZoneJsonTests(ServersSampleBase): response = self._do_get('servers/%s' % uuid) subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' - return self._verify_response('server-get-resp', subs, response, 200) + self._verify_response('server-get-resp', subs, response, 200) def test_detail(self): uuid = self._post_server() response = self._do_get('servers/detail') subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' - return self._verify_response('servers-detail-resp', subs, - response, 200) + self._verify_response('servers-detail-resp', subs, response, 200) class ExtendedAvailabilityZoneXmlTests(ExtendedAvailabilityZoneJsonTests): @@ -3105,8 +3048,7 @@ class EvacuateJsonTest(ServersSampleBase): response = self._do_post('servers/%s/action' % uuid, 'server-evacuate-req', req_subs) subs = self._get_regexes() - return self._verify_response('server-evacuate-resp', subs, - response, 200) + self._verify_response('server-evacuate-resp', subs, response, 200) class EvacuateXmlTest(EvacuateJsonTest): @@ -3149,8 +3091,8 @@ class FloatingIpDNSJsonTest(ApiSampleTestBase): subs = {'domain': self.domain, 'project': self.project, 'scope': self.scope} - return self._verify_response('floating-ip-dns-list-resp', subs, - response, 200) + self._verify_response('floating-ip-dns-list-resp', subs, + response, 200) def test_floating_ip_dns_create_or_update(self): self._create_or_update() @@ -3170,8 +3112,8 @@ class FloatingIpDNSJsonTest(ApiSampleTestBase): subs = {'domain': self.domain, 'ip': self.ip, 'name': self.name} - return self._verify_response('floating-ip-dns-entry-get-resp', subs, - response, 200) + self._verify_response('floating-ip-dns-entry-get-resp', subs, + response, 200) def test_floating_ip_dns_entry_delete(self): self._create_or_update_entry() @@ -3186,8 +3128,8 @@ class FloatingIpDNSJsonTest(ApiSampleTestBase): subs = {'domain': self.domain, 'ip': self.ip, 'name': self.name} - return self._verify_response('floating-ip-dns-entry-list-resp', subs, - response, 200) + self._verify_response('floating-ip-dns-entry-list-resp', subs, + response, 200) class FloatingIpDNSXmlTest(FloatingIpDNSJsonTest): @@ -3243,8 +3185,7 @@ class InstanceActionsSampleJsonTest(ApiSampleTestBase): subs['start_time'] = fake_action['start_time'] subs['result'] = '(Success)|(Error)' subs['event'] = '(schedule)|(compute_create)' - return self._verify_response('instance-action-get-resp', subs, - response, 200) + self._verify_response('instance-action-get-resp', subs, response, 200) def test_instance_actions_list(self): fake_uuid = fake_instance_actions.FAKE_UUID @@ -3254,8 +3195,8 @@ class InstanceActionsSampleJsonTest(ApiSampleTestBase): subs['integer_id'] = '[0-9]+' subs['request_id'] = ('req-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}' '-[0-9a-f]{4}-[0-9a-f]{12}') - return self._verify_response('instance-actions-list-resp', subs, - response, 200) + self._verify_response('instance-actions-list-resp', subs, + response, 200) class InstanceActionsSampleXmlTest(InstanceActionsSampleJsonTest): @@ -3272,14 +3213,13 @@ class ImageSizeSampleJsonTests(ApiSampleTestBase): response = self._do_get('images/%s' % image_id) subs = self._get_regexes() subs['image_id'] = image_id - return self._verify_response('image-get-resp', subs, response, 200) + self._verify_response('image-get-resp', subs, response, 200) def test_detail(self): # Get api sample of all images details request. response = self._do_get('images/detail') subs = self._get_regexes() - return self._verify_response('images-details-get-resp', subs, - response, 200) + self._verify_response('images-details-get-resp', subs, response, 200) class ImageSizeSampleXmlTests(ImageSizeSampleJsonTests): @@ -3303,8 +3243,8 @@ class ConfigDriveSampleJsonTest(ServersSampleBase): subs['hostid'] = '[a-f0-9]+' # config drive can be an uuid or empty value subs['cdrive'] = '(%s)?' % subs['uuid'] - return self._verify_response('server-config-drive-get-resp', subs, - response, 200) + self._verify_response('server-config-drive-get-resp', subs, + response, 200) def test_config_drive_detail(self): uuid = self._post_server() @@ -3313,8 +3253,8 @@ class ConfigDriveSampleJsonTest(ServersSampleBase): subs['hostid'] = '[a-f0-9]+' # config drive can be an uuid or empty value subs['cdrive'] = '(%s)?' % subs['uuid'] - return self._verify_response('servers-config-drive-details-resp', - subs, response, 200) + self._verify_response('servers-config-drive-details-resp', + subs, response, 200) class ConfigDriveSampleXmlTest(ConfigDriveSampleJsonTest): @@ -3341,8 +3281,8 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase): response = self._do_post('flavors/10/action', 'flavor-access-add-tenant-req', subs) - return self._verify_response('flavor-access-add-tenant-resp', - subs, response, 200) + self._verify_response('flavor-access-add-tenant-resp', + subs, response, 200) def _create_flavor(self): subs = { @@ -3353,8 +3293,7 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase): "flavor-access-create-req", subs) subs.update(self._get_regexes()) - return self._verify_response("flavor-access-create-resp", - subs, response, 200) + self._verify_response("flavor-access-create-resp", subs, response, 200) def test_flavor_access_create(self): self._create_flavor() @@ -3362,8 +3301,7 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase): def test_flavor_access_detail(self): response = self._do_get('flavors/detail') subs = self._get_regexes() - return self._verify_response('flavor-access-detail-resp', - subs, response, 200) + self._verify_response('flavor-access-detail-resp', subs, response, 200) def test_flavor_access_list(self): self._create_flavor() @@ -3374,8 +3312,7 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase): 'flavor_id': flavor_id, 'tenant_id': 'fake_tenant', } - return self._verify_response('flavor-access-list-resp', - subs, response, 200) + self._verify_response('flavor-access-list-resp', subs, response, 200) def test_flavor_access_show(self): flavor_id = 1 @@ -3384,8 +3321,7 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase): 'flavor_id': flavor_id } subs.update(self._get_regexes()) - return self._verify_response('flavor-access-show-resp', - subs, response, 200) + self._verify_response('flavor-access-show-resp', subs, response, 200) def test_flavor_access_add_tenant(self): self._create_flavor() @@ -3400,8 +3336,8 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase): response = self._do_post('flavors/10/action', "flavor-access-remove-tenant-req", subs) - return self._verify_response('flavor-access-remove-tenant-resp', - {}, response, 200) + self._verify_response('flavor-access-remove-tenant-resp', + {}, response, 200) class FlavorAccessSampleXmlTests(FlavorAccessSampleJsonTests): @@ -3414,18 +3350,15 @@ class HypervisorsSampleJsonTests(ApiSampleTestBase): def test_hypervisors_list(self): response = self._do_get('os-hypervisors') - return self._verify_response('hypervisors-list-resp', - {}, response, 200) + self._verify_response('hypervisors-list-resp', {}, response, 200) def test_hypervisors_search(self): response = self._do_get('os-hypervisors/fake/search') - return self._verify_response('hypervisors-search-resp', - {}, response, 200) + self._verify_response('hypervisors-search-resp', {}, response, 200) def test_hypervisors_servers(self): response = self._do_get('os-hypervisors/fake/servers') - return self._verify_response('hypervisors-servers-resp', - {}, response, 200) + self._verify_response('hypervisors-servers-resp', {}, response, 200) def test_hypervisors_show(self): hypervisor_id = 1 @@ -3434,13 +3367,11 @@ class HypervisorsSampleJsonTests(ApiSampleTestBase): } response = self._do_get('os-hypervisors/%s' % hypervisor_id) subs.update(self._get_regexes()) - return self._verify_response('hypervisors-show-resp', - subs, response, 200) + self._verify_response('hypervisors-show-resp', subs, response, 200) def test_hypervisors_statistics(self): response = self._do_get('os-hypervisors/statistics') - return self._verify_response('hypervisors-statistics-resp', - {}, response, 200) + self._verify_response('hypervisors-statistics-resp', {}, response, 200) def test_hypervisors_uptime(self): def fake_get_host_uptime(self, context, hyp): @@ -3454,8 +3385,7 @@ class HypervisorsSampleJsonTests(ApiSampleTestBase): subs = { 'hypervisor_id': hypervisor_id, } - return self._verify_response('hypervisors-uptime-resp', - subs, response, 200) + self._verify_response('hypervisors-uptime-resp', subs, response, 200) class HypervisorsSampleXmlTests(HypervisorsSampleJsonTests): @@ -3659,8 +3589,8 @@ class SnapshotsSampleJsonTests(ApiSampleTestBase): def test_snapshots_create(self): response = self._create_snapshot() self.create_subs.update(self._get_regexes()) - return self._verify_response("snapshot-create-resp", - self.create_subs, response, 200) + self._verify_response("snapshot-create-resp", + self.create_subs, response, 200) def test_snapshots_delete(self): self.stubs.Set(cinder.API, "delete_snapshot", @@ -3673,14 +3603,12 @@ class SnapshotsSampleJsonTests(ApiSampleTestBase): def test_snapshots_detail(self): response = self._do_get('os-snapshots/detail') subs = self._get_regexes() - return self._verify_response('snapshots-detail-resp', subs, - response, 200) + self._verify_response('snapshots-detail-resp', subs, response, 200) def test_snapshots_list(self): response = self._do_get('os-snapshots') subs = self._get_regexes() - return self._verify_response('snapshots-list-resp', - subs, response, 200) + self._verify_response('snapshots-list-resp', subs, response, 200) def test_snapshots_show(self): response = self._do_get('os-snapshots/100') @@ -3689,8 +3617,7 @@ class SnapshotsSampleJsonTests(ApiSampleTestBase): 'description': 'Default description' } subs.update(self._get_regexes()) - return self._verify_response('snapshots-show-resp', subs, - response, 200) + self._verify_response('snapshots-show-resp', subs, response, 200) class SnapshotsSampleXmlTests(SnapshotsSampleJsonTests): @@ -3848,8 +3775,7 @@ class VolumesSampleJsonTest(ServersSampleBase): subs_req) subs = self._get_regexes() subs.update(subs_req) - return self._verify_response('os-volumes-post-resp', subs, - response, 200) + self._verify_response('os-volumes-post-resp', subs, response, 200) def test_volumes_show(self): subs = { @@ -3859,8 +3785,7 @@ class VolumesSampleJsonTest(ServersSampleBase): vol_id = self._get_volume_id() response = self._do_get('os-volumes/%s' % vol_id) subs.update(self._get_regexes()) - return self._verify_response('os-volumes-get-resp', subs, - response, 200) + self._verify_response('os-volumes-get-resp', subs, response, 200) def test_volumes_index(self): subs = { @@ -3869,8 +3794,7 @@ class VolumesSampleJsonTest(ServersSampleBase): } response = self._do_get('os-volumes') subs.update(self._get_regexes()) - return self._verify_response('os-volumes-index-resp', subs, - response, 200) + self._verify_response('os-volumes-index-resp', subs, response, 200) def test_volumes_detail(self): # For now, index and detail are the same. @@ -3881,11 +3805,10 @@ class VolumesSampleJsonTest(ServersSampleBase): } response = self._do_get('os-volumes/detail') subs.update(self._get_regexes()) - return self._verify_response('os-volumes-detail-resp', subs, - response, 200) + self._verify_response('os-volumes-detail-resp', subs, response, 200) def test_volumes_create(self): - return self._post_volume() + self._post_volume() def test_volumes_delete(self): self._post_volume() diff --git a/nova/tests/integrated/test_multiprocess_api.py b/nova/tests/integrated/test_multiprocess_api.py index c85a43a0c..2610cdcb7 100644 --- a/nova/tests/integrated/test_multiprocess_api.py +++ b/nova/tests/integrated/test_multiprocess_api.py @@ -54,8 +54,8 @@ class MultiprocessWSGITest(integrated_helpers._IntegratedTestBase): # os._exit() which doesn't have this problem. status = 0 try: - launcher = service.ProcessLauncher() - launcher.launch_server(self.osapi, workers=self.osapi.workers) + launcher = service.process_launcher() + launcher.launch_service(self.osapi, workers=self.osapi.workers) launcher.wait() except SystemExit as exc: status = exc.code |