openstack/nova
Code Issues Proposed changes

Merge "Fix V3 API flavor returning empty string for attributes"

Browse Source
This commit is contained in:
Jenkins 2013-10-07 18:48:29 +00:00 committed by Gerrit Code Review
commit a49083d79f
44 changed files with 185 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json
View File

@ -2,7 +2,7 @@
"flavor": { "flavor": {
"disabled": false, "disabled": false,
"disk": 10, "disk": 10,
"ephemeral": "", "ephemeral": 0,
"id": "10", "id": "10",
"links": [ "links": [
{ {
@ -16,7 +16,7 @@
], ],
"name": "test_flavor", "name": "test_flavor",
"ram": 1024, "ram": 1024,
"swap": "", "swap": 0,
"vcpus": 2 "vcpus": 2
} }
} }

2
doc/v3/api_samples/flavor-manage/flavor-create-post-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?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="test_flavor" ram="1024" ephemeral="" disabled="False" vcpus="2" swap="" disk="10" id="10"> <flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="test_flavor" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="10">
<atom:link href="http://openstack.example.com/v3/flavors/10" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/10" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/10" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/10" rel="bookmark"/>
</flavor> </flavor>

4
doc/v3/api_samples/flavors/flavor-get-resp.json
View File

@ -2,7 +2,7 @@
"flavor": { "flavor": {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -16,7 +16,7 @@
], ],
"name": "m1.tiny", "name": "m1.tiny",
"ram": 512, "ram": 512,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
} }
} }

2
doc/v3/api_samples/flavors/flavor-get-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?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" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" 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" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1">
<atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
</flavor> </flavor>

20
doc/v3/api_samples/flavors/flavors-detail-resp.json
View File

@ -3,7 +3,7 @@
{ {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -17,13 +17,13 @@
], ],
"name": "m1.tiny", "name": "m1.tiny",
"ram": 512, "ram": 512,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 20, "disk": 20,
"ephemeral": "", "ephemeral": 0,
"id": "2", "id": "2",
"links": [ "links": [
{ {
@ -37,13 +37,13 @@
], ],
"name": "m1.small", "name": "m1.small",
"ram": 2048, "ram": 2048,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 40, "disk": 40,
"ephemeral": "", "ephemeral": 0,
"id": "3", "id": "3",
"links": [ "links": [
{ {
@ -57,13 +57,13 @@
], ],
"name": "m1.medium", "name": "m1.medium",
"ram": 4096, "ram": 4096,
"swap": "", "swap": 0,
"vcpus": 2 "vcpus": 2
}, },
{ {
"disabled": false, "disabled": false,
"disk": 80, "disk": 80,
"ephemeral": "", "ephemeral": 0,
"id": "4", "id": "4",
"links": [ "links": [
{ {
@ -77,13 +77,13 @@
], ],
"name": "m1.large", "name": "m1.large",
"ram": 8192, "ram": 8192,
"swap": "", "swap": 0,
"vcpus": 4 "vcpus": 4
}, },
{ {
"disabled": false, "disabled": false,
"disk": 160, "disk": 160,
"ephemeral": "", "ephemeral": 0,
"id": "5", "id": "5",
"links": [ "links": [
{ {
@ -97,7 +97,7 @@
], ],
"name": "m1.xlarge", "name": "m1.xlarge",
"ram": 16384, "ram": 16384,
"swap": "", "swap": 0,
"vcpus": 8 "vcpus": 8
} }
] ]

10
doc/v3/api_samples/flavors/flavors-detail-resp.xml
View File

@ -1,22 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?> <?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"> <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<flavor name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1"> <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1">
<atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2"> <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2">
<atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3"> <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3">
<atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4"> <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4">
<atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5"> <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5">
<atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
</flavor> </flavor>

4
doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.json
View File

@ -2,7 +2,7 @@
"flavor": { "flavor": {
"disabled": false, "disabled": false,
"disk": 10, "disk": 10,
"ephemeral": "", "ephemeral": 0,
"id": "10", "id": "10",
"links": [ "links": [
{ {
@ -17,7 +17,7 @@
"name": "test_flavor", "name": "test_flavor",
"os-flavor-access:is_public": false, "os-flavor-access:is_public": false,
"ram": 1024, "ram": 1024,
"swap": "", "swap": 0,
"vcpus": 2 "vcpus": 2
} }
} }

2
doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="test_flavor" ram="1024" ephemeral="" disabled="False" vcpus="2" swap="" disk="10" id="10" os-flavor-access:is_public="False"> <flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="test_flavor" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="10" os-flavor-access:is_public="False">
<atom:link href="http://openstack.example.com/v3/flavors/10" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/10" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/10" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/10" rel="bookmark"/>
</flavor> </flavor>

20
doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json
View File

@ -3,7 +3,7 @@
{ {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -18,13 +18,13 @@
"name": "m1.tiny", "name": "m1.tiny",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 512, "ram": 512,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 20, "disk": 20,
"ephemeral": "", "ephemeral": 0,
"id": "2", "id": "2",
"links": [ "links": [
{ {
@ -39,13 +39,13 @@
"name": "m1.small", "name": "m1.small",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 2048, "ram": 2048,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 40, "disk": 40,
"ephemeral": "", "ephemeral": 0,
"id": "3", "id": "3",
"links": [ "links": [
{ {
@ -60,13 +60,13 @@
"name": "m1.medium", "name": "m1.medium",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 4096, "ram": 4096,
"swap": "", "swap": 0,
"vcpus": 2 "vcpus": 2
}, },
{ {
"disabled": false, "disabled": false,
"disk": 80, "disk": 80,
"ephemeral": "", "ephemeral": 0,
"id": "4", "id": "4",
"links": [ "links": [
{ {
@ -81,13 +81,13 @@
"name": "m1.large", "name": "m1.large",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 8192, "ram": 8192,
"swap": "", "swap": 0,
"vcpus": 4 "vcpus": 4
}, },
{ {
"disabled": false, "disabled": false,
"disk": 160, "disk": 160,
"ephemeral": "", "ephemeral": 0,
"id": "5", "id": "5",
"links": [ "links": [
{ {
@ -102,7 +102,7 @@
"name": "m1.xlarge", "name": "m1.xlarge",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 16384, "ram": 16384,
"swap": "", "swap": 0,
"vcpus": 8 "vcpus": 8
} }
] ]

10
doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml
View File

@ -1,22 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> <flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<flavor name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" os-flavor-access:is_public="True"> <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" os-flavor-access:is_public="True">
<atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2" os-flavor-access:is_public="True"> <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" os-flavor-access:is_public="True">
<atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3" os-flavor-access:is_public="True"> <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" os-flavor-access:is_public="True">
<atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4" os-flavor-access:is_public="True"> <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" os-flavor-access:is_public="True">
<atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5" os-flavor-access:is_public="True"> <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" os-flavor-access:is_public="True">
<atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
</flavor> </flavor>

4
doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.json
View File

@ -2,7 +2,7 @@
"flavor": { "flavor": {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -17,7 +17,7 @@
"name": "m1.tiny", "name": "m1.tiny",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 512, "ram": 512,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
} }
} }

2
doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" os-flavor-access:is_public="True"> <flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" os-flavor-access:is_public="True">
<atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
</flavor> </flavor>

4
doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
View File

@ -2,7 +2,7 @@
"flavor": { "flavor": {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -17,7 +17,7 @@
"name": "m1.tiny", "name": "m1.tiny",
"ram": 512, "ram": 512,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
} }
} }

2
doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?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" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" rxtx_factor="1.0"> <flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
</flavor> </flavor>

20
doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
View File

@ -3,7 +3,7 @@
{ {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -18,13 +18,13 @@
"name": "m1.tiny", "name": "m1.tiny",
"ram": 512, "ram": 512,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 20, "disk": 20,
"ephemeral": "", "ephemeral": 0,
"id": "2", "id": "2",
"links": [ "links": [
{ {
@ -39,13 +39,13 @@
"name": "m1.small", "name": "m1.small",
"ram": 2048, "ram": 2048,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 40, "disk": 40,
"ephemeral": "", "ephemeral": 0,
"id": "3", "id": "3",
"links": [ "links": [
{ {
@ -60,13 +60,13 @@
"name": "m1.medium", "name": "m1.medium",
"ram": 4096, "ram": 4096,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 2 "vcpus": 2
}, },
{ {
"disabled": false, "disabled": false,
"disk": 80, "disk": 80,
"ephemeral": "", "ephemeral": 0,
"id": "4", "id": "4",
"links": [ "links": [
{ {
@ -81,13 +81,13 @@
"name": "m1.large", "name": "m1.large",
"ram": 8192, "ram": 8192,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 4 "vcpus": 4
}, },
{ {
"disabled": false, "disabled": false,
"disk": 160, "disk": 160,
"ephemeral": "", "ephemeral": 0,
"id": "5", "id": "5",
"links": [ "links": [
{ {
@ -102,7 +102,7 @@
"name": "m1.xlarge", "name": "m1.xlarge",
"ram": 16384, "ram": 16384,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 8 "vcpus": 8
} }
] ]

10
doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
View File

@ -1,22 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?> <?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"> <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<flavor name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" rxtx_factor="1.0"> <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2" rxtx_factor="1.0"> <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3" rxtx_factor="1.0"> <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4" rxtx_factor="1.0"> <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5" rxtx_factor="1.0"> <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
</flavor> </flavor>

4
doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json
View File

@ -2,7 +2,7 @@
"flavor": { "flavor": {
"disabled": false, "disabled": false,
"disk": 10, "disk": 10,
"ephemeral": "", "ephemeral": 0,
"id": "100", "id": "100",
"links": [ "links": [
{ {
@ -17,7 +17,7 @@
"name": "flavortest", "name": "flavortest",
"ram": 1024, "ram": 1024,
"rxtx_factor": 2.0, "rxtx_factor": 2.0,
"swap": "", "swap": 0,
"vcpus": 2 "vcpus": 2
} }
} }

2
doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?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="flavortest" ram="1024" ephemeral="" disabled="False" vcpus="2" swap="" disk="10" id="100" rxtx_factor="2.0"> <flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="flavortest" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="100" rxtx_factor="2.0">
<atom:link href="http://openstack.example.com/v3/flavors/100" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/100" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/100" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/100" rel="bookmark"/>
</flavor> </flavor>

7
nova/api/openstack/compute/plugins/v3/flavors.py
View File

@ -34,10 +34,9 @@ def make_flavor(elem, detailed=False):
if detailed: if detailed:
elem.set('ram') elem.set('ram')
elem.set('disk') elem.set('disk')
elem.set('vcpus', xmlutil.EmptyStringSelector('vcpus')) elem.set('vcpus')
# NOTE(vish): this was originally added without a namespace elem.set('swap')
elem.set('swap', xmlutil.EmptyStringSelector('swap')) elem.set('ephemeral')
elem.set('ephemeral', xmlutil.EmptyStringSelector('ephemeral'))
elem.set('disabled') elem.set('disabled')
xmlutil.make_links(elem, 'links') xmlutil.make_links(elem, 'links')

7
nova/api/openstack/compute/views/flavors.py
View File

@ -76,8 +76,9 @@ class V3ViewBuilder(ViewBuilder):
def show(self, request, flavor): def show(self, request, flavor):
flavor_dict = super(V3ViewBuilder, self).show(request, flavor) flavor_dict = super(V3ViewBuilder, self).show(request, flavor)
flavor_dict['flavor'].update({ flavor_dict['flavor'].update({
"swap": flavor.get("swap") or "", "swap": flavor["swap"],
"ephemeral": flavor.get("ephemeral_gb") or "", "ephemeral": flavor["ephemeral_gb"],
"disabled": flavor.get("disabled", False) "disabled": flavor["disabled"],
"vcpus": flavor["vcpus"],
}) })
return flavor_dict return flavor_dict

8
nova/tests/api/openstack/compute/plugins/v3/test_flavor_rxtx.py
View File

@ -27,6 +27,10 @@ FAKE_FLAVORS = {
"memory_mb": '256', "memory_mb": '256',
"root_gb": '10', "root_gb": '10',
"rxtx_factor": '1.0', "rxtx_factor": '1.0',
"swap": 0,
"ephemeral_gb": 0,
"vcpus": 1,
"disabled": False,
}, },
'flavor 2': { 'flavor 2': {
"flavorid": '2', "flavorid": '2',
@ -34,6 +38,10 @@ FAKE_FLAVORS = {
"memory_mb": '512', "memory_mb": '512',
"root_gb": '10', "root_gb": '10',
"rxtx_factor": None, "rxtx_factor": None,
"swap": 0,
"vcpus": 1,
"ephemeral_gb": 0,
"disabled": False,
}, },
} }

42
nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
View File

@ -42,8 +42,9 @@ FAKE_FLAVORS = {
"name": 'flavor 1', "name": 'flavor 1',
"memory_mb": '256', "memory_mb": '256',
"root_gb": '10', "root_gb": '10',
"swap": '512', "swap": 0,
"ephemeral_gb": '1', "ephemeral_gb": 0,
"vcpus": 0,
"disabled": False, "disabled": False,
}, },
'flavor 2': { 'flavor 2': {
@ -51,8 +52,9 @@ FAKE_FLAVORS = {
"name": 'flavor 2', "name": 'flavor 2',
"memory_mb": '512', "memory_mb": '512',
"root_gb": '20', "root_gb": '20',
"swap": '1024', "swap": 1024,
"ephemeral_gb": '10', "ephemeral_gb": 10,
"vcpus": 0,
"disabled": True, "disabled": True,
}, },
} }
@ -133,9 +135,9 @@ class FlavorsTest(test.TestCase):
"name": "flavor 1", "name": "flavor 1",
"ram": "256", "ram": "256",
"disk": "10", "disk": "10",
"vcpus": "", "vcpus": 0,
"swap": '512', "swap": 0,
"ephemeral": "1", "ephemeral": 0,
"disabled": False, "disabled": False,
"links": [ "links": [
{ {
@ -162,9 +164,9 @@ class FlavorsTest(test.TestCase):
"name": "flavor 1", "name": "flavor 1",
"ram": "256", "ram": "256",
"disk": "10", "disk": "10",
"vcpus": "", "vcpus": 0,
"swap": '512', "swap": 0,
"ephemeral": "1", "ephemeral": 0,
"disabled": False, "disabled": False,
"links": [ "links": [
{ {
@ -331,9 +333,9 @@ class FlavorsTest(test.TestCase):
"name": "flavor 1", "name": "flavor 1",
"ram": "256", "ram": "256",
"disk": "10", "disk": "10",
"vcpus": "", "vcpus": 0,
"swap": '512', "swap": 0,
"ephemeral": "1", "ephemeral": 0,
"disabled": False, "disabled": False,
"links": [ "links": [
{ {
@ -351,9 +353,9 @@ class FlavorsTest(test.TestCase):
"name": "flavor 2", "name": "flavor 2",
"ram": "512", "ram": "512",
"disk": "20", "disk": "20",
"vcpus": "", "vcpus": 0,
"swap": '1024', "swap": 1024,
"ephemeral": "10", "ephemeral": 10,
"disabled": True, "disabled": True,
"links": [ "links": [
{ {
@ -453,9 +455,9 @@ class FlavorsTest(test.TestCase):
"name": "flavor 2", "name": "flavor 2",
"ram": "512", "ram": "512",
"disk": "20", "disk": "20",
"vcpus": "", "vcpus": 0,
"swap": '1024', "swap": 1024,
"ephemeral": "10", "ephemeral": 10,
"disabled": True, "disabled": True,
"links": [ "links": [
{ {
@ -539,7 +541,7 @@ class FlavorsXMLSerializationTest(test.TestCase):
"name": "asdf", "name": "asdf",
"ram": "256", "ram": "256",
"disk": "10", "disk": "10",
"vcpus": "", "vcpus": 0,
"swap": "512", "swap": "512",
"ephemeral": "512", "ephemeral": "512",
"disabled": False, "disabled": False,

4
nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl
View File

@ -16,7 +16,7 @@
"ram": 1024, "ram": 1024,
"vcpus": 2, "vcpus": 2,
"disabled": false, "disabled": false,
"ephemeral": "", "ephemeral": 0,
"swap": "" "swap": 0
} }
} }

2
nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.xml.tpl
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?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="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" disabled="False" ephemeral="" swap=""> <flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" disabled="False" ephemeral="0" swap="0">
<atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/> <atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/>
<atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/> <atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/>
</flavor> </flavor>

4
nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl
View File

@ -16,7 +16,7 @@
"ram": 512, "ram": 512,
"vcpus": 1, "vcpus": 1,
"disabled": false, "disabled": false,
"ephemeral": "", "ephemeral": 0,
"swap": "" "swap": 0
} }
} }

2
nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.xml.tpl
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?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="1" id="1" disabled="False" ephemeral="" swap=""> <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" disabled="False" ephemeral="0" swap="0">
<atom:link href="%(host)s/v3/flavors/1" rel="self"/> <atom:link href="%(host)s/v3/flavors/1" rel="self"/>
<atom:link href="%(host)s/flavors/1" rel="bookmark"/> <atom:link href="%(host)s/flavors/1" rel="bookmark"/>
</flavor> </flavor>

20
nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl
View File

@ -3,7 +3,7 @@
{ {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -17,13 +17,13 @@
], ],
"name": "m1.tiny", "name": "m1.tiny",
"ram": 512, "ram": 512,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 20, "disk": 20,
"ephemeral": "", "ephemeral": 0,
"id": "2", "id": "2",
"links": [ "links": [
{ {
@ -37,13 +37,13 @@
], ],
"name": "m1.small", "name": "m1.small",
"ram": 2048, "ram": 2048,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 40, "disk": 40,
"ephemeral": "", "ephemeral": 0,
"id": "3", "id": "3",
"links": [ "links": [
{ {
@ -57,13 +57,13 @@
], ],
"name": "m1.medium", "name": "m1.medium",
"ram": 4096, "ram": 4096,
"swap": "", "swap": 0,
"vcpus": 2 "vcpus": 2
}, },
{ {
"disabled": false, "disabled": false,
"disk": 80, "disk": 80,
"ephemeral": "", "ephemeral": 0,
"id": "4", "id": "4",
"links": [ "links": [
{ {
@ -77,13 +77,13 @@
], ],
"name": "m1.large", "name": "m1.large",
"ram": 8192, "ram": 8192,
"swap": "", "swap": 0,
"vcpus": 4 "vcpus": 4
}, },
{ {
"disabled": false, "disabled": false,
"disk": 160, "disk": 160,
"ephemeral": "", "ephemeral": 0,
"id": "5", "id": "5",
"links": [ "links": [
{ {
@ -97,7 +97,7 @@
], ],
"name": "m1.xlarge", "name": "m1.xlarge",
"ram": 16384, "ram": 16384,
"swap": "", "swap": 0,
"vcpus": 8 "vcpus": 8
} }
] ]

10
nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.xml.tpl
View File

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<flavor name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1"> <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1">
<atom:link href="%(host)s/v3/flavors/1" rel="self"/> <atom:link href="%(host)s/v3/flavors/1" rel="self"/>
<atom:link href="%(host)s/flavors/1" rel="bookmark"/> <atom:link href="%(host)s/flavors/1" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2"> <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2">
<atom:link href="%(host)s/v3/flavors/2" rel="self"/> <atom:link href="%(host)s/v3/flavors/2" rel="self"/>
<atom:link href="%(host)s/flavors/2" rel="bookmark"/> <atom:link href="%(host)s/flavors/2" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3"> <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3">
<atom:link href="%(host)s/v3/flavors/3" rel="self"/> <atom:link href="%(host)s/v3/flavors/3" rel="self"/>
<atom:link href="%(host)s/flavors/3" rel="bookmark"/> <atom:link href="%(host)s/flavors/3" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4"> <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4">
<atom:link href="%(host)s/v3/flavors/4" rel="self"/> <atom:link href="%(host)s/v3/flavors/4" rel="self"/>
<atom:link href="%(host)s/flavors/4" rel="bookmark"/> <atom:link href="%(host)s/flavors/4" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5"> <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5">
<atom:link href="%(host)s/v3/flavors/5" rel="self"/> <atom:link href="%(host)s/v3/flavors/5" rel="self"/>
<atom:link href="%(host)s/flavors/5" rel="bookmark"/> <atom:link href="%(host)s/flavors/5" rel="bookmark"/>
</flavor> </flavor>

4
nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl
View File

@ -17,7 +17,7 @@
"ram": 1024, "ram": 1024,
"vcpus": 2, "vcpus": 2,
"disabled": false, "disabled": false,
"ephemeral": "", "ephemeral": 0,
"swap": "" "swap": 0
} }
} }

2
nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" os-flavor-access:is_public="False" disabled="False" ephemeral="" swap=""> <flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" os-flavor-access:is_public="False" disabled="False" ephemeral="0" swap="0">
<atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/> <atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/>
<atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/> <atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/>
</flavor> </flavor>

20
nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
View File

@ -3,7 +3,7 @@
{ {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -18,13 +18,13 @@
"name": "m1.tiny", "name": "m1.tiny",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 512, "ram": 512,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 20, "disk": 20,
"ephemeral": "", "ephemeral": 0,
"id": "2", "id": "2",
"links": [ "links": [
{ {
@ -39,13 +39,13 @@
"name": "m1.small", "name": "m1.small",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 2048, "ram": 2048,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 40, "disk": 40,
"ephemeral": "", "ephemeral": 0,
"id": "3", "id": "3",
"links": [ "links": [
{ {
@ -60,13 +60,13 @@
"name": "m1.medium", "name": "m1.medium",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 4096, "ram": 4096,
"swap": "", "swap": 0,
"vcpus": 2 "vcpus": 2
}, },
{ {
"disabled": false, "disabled": false,
"disk": 80, "disk": 80,
"ephemeral": "", "ephemeral": 0,
"id": "4", "id": "4",
"links": [ "links": [
{ {
@ -81,13 +81,13 @@
"name": "m1.large", "name": "m1.large",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 8192, "ram": 8192,
"swap": "", "swap": 0,
"vcpus": 4 "vcpus": 4
}, },
{ {
"disabled": false, "disabled": false,
"disk": 160, "disk": 160,
"ephemeral": "", "ephemeral": 0,
"id": "5", "id": "5",
"links": [ "links": [
{ {
@ -102,7 +102,7 @@
"name": "m1.xlarge", "name": "m1.xlarge",
"os-flavor-access:is_public": true, "os-flavor-access:is_public": true,
"ram": 16384, "ram": 16384,
"swap": "", "swap": 0,
"vcpus": 8 "vcpus": 8
} }
] ]

10
nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
View File

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> <flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<flavor name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" os-flavor-access:is_public="True"> <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" os-flavor-access:is_public="True">
<atom:link href="%(host)s/v3/flavors/1" rel="self"/> <atom:link href="%(host)s/v3/flavors/1" rel="self"/>
<atom:link href="%(host)s/flavors/1" rel="bookmark"/> <atom:link href="%(host)s/flavors/1" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2" os-flavor-access:is_public="True"> <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" os-flavor-access:is_public="True">
<atom:link href="%(host)s/v3/flavors/2" rel="self"/> <atom:link href="%(host)s/v3/flavors/2" rel="self"/>
<atom:link href="%(host)s/flavors/2" rel="bookmark"/> <atom:link href="%(host)s/flavors/2" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3" os-flavor-access:is_public="True"> <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" os-flavor-access:is_public="True">
<atom:link href="%(host)s/v3/flavors/3" rel="self"/> <atom:link href="%(host)s/v3/flavors/3" rel="self"/>
<atom:link href="%(host)s/flavors/3" rel="bookmark"/> <atom:link href="%(host)s/flavors/3" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4" os-flavor-access:is_public="True"> <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" os-flavor-access:is_public="True">
<atom:link href="%(host)s/v3/flavors/4" rel="self"/> <atom:link href="%(host)s/v3/flavors/4" rel="self"/>
<atom:link href="%(host)s/flavors/4" rel="bookmark"/> <atom:link href="%(host)s/flavors/4" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5" os-flavor-access:is_public="True"> <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" os-flavor-access:is_public="True">
<atom:link href="%(host)s/v3/flavors/5" rel="self"/> <atom:link href="%(host)s/v3/flavors/5" rel="self"/>
<atom:link href="%(host)s/flavors/5" rel="bookmark"/> <atom:link href="%(host)s/flavors/5" rel="bookmark"/>
</flavor> </flavor>

4
nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
View File

@ -17,7 +17,7 @@
"ram": 512, "ram": 512,
"vcpus": 1, "vcpus": 1,
"disabled": false, "disabled": false,
"ephemeral": "", "ephemeral": 0,
"swap": "" "swap": 0
} }
} }

2
nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" 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" disabled="False" ephemeral="" swap="" os-flavor-access:is_public="True"> <flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" 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" disabled="False" ephemeral="0" swap="0" os-flavor-access:is_public="True">
<atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/> <atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/>
<atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/> <atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/>
</flavor> </flavor>

4
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-get-resp.json.tpl
View File

@ -16,8 +16,8 @@
"ram": 512, "ram": 512,
"vcpus": 1, "vcpus": 1,
"disabled": false, "disabled": false,
"ephemeral": "", "ephemeral": 0,
"swap": "", "swap": 0,
"rxtx_factor": 1.0 "rxtx_factor": 1.0
} }
} }

2
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-get-resp.xml.tpl
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?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="1" id="1" disabled="False" ephemeral="" swap="" rxtx_factor="1.0"> <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" disabled="False" ephemeral="0" swap="0" rxtx_factor="1.0">
<atom:link href="%(host)s/v3/flavors/1" rel="self"/> <atom:link href="%(host)s/v3/flavors/1" rel="self"/>
<atom:link href="%(host)s/flavors/1" rel="bookmark"/> <atom:link href="%(host)s/flavors/1" rel="bookmark"/>
</flavor> </flavor>

4
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
View File

@ -2,7 +2,7 @@
"flavor": { "flavor": {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -17,7 +17,7 @@
"name": "m1.tiny", "name": "m1.tiny",
"ram": 512, "ram": 512,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
} }
} }

2
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?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" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" rxtx_factor="1.0"> <flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
</flavor> </flavor>

20
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
View File

@ -3,7 +3,7 @@
{ {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -18,13 +18,13 @@
"name": "m1.tiny", "name": "m1.tiny",
"ram": 512, "ram": 512,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 20, "disk": 20,
"ephemeral": "", "ephemeral": 0,
"id": "2", "id": "2",
"links": [ "links": [
{ {
@ -39,13 +39,13 @@
"name": "m1.small", "name": "m1.small",
"ram": 2048, "ram": 2048,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 1 "vcpus": 1
}, },
{ {
"disabled": false, "disabled": false,
"disk": 40, "disk": 40,
"ephemeral": "", "ephemeral": 0,
"id": "3", "id": "3",
"links": [ "links": [
{ {
@ -60,13 +60,13 @@
"name": "m1.medium", "name": "m1.medium",
"ram": 4096, "ram": 4096,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 2 "vcpus": 2
}, },
{ {
"disabled": false, "disabled": false,
"disk": 80, "disk": 80,
"ephemeral": "", "ephemeral": 0,
"id": "4", "id": "4",
"links": [ "links": [
{ {
@ -81,13 +81,13 @@
"name": "m1.large", "name": "m1.large",
"ram": 8192, "ram": 8192,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 4 "vcpus": 4
}, },
{ {
"disabled": false, "disabled": false,
"disk": 160, "disk": 160,
"ephemeral": "", "ephemeral": 0,
"id": "5", "id": "5",
"links": [ "links": [
{ {
@ -102,7 +102,7 @@
"name": "m1.xlarge", "name": "m1.xlarge",
"ram": 16384, "ram": 16384,
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"swap": "", "swap": 0,
"vcpus": 8 "vcpus": 8
} }
] ]

10
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
View File

@ -1,22 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?> <?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"> <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<flavor name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" rxtx_factor="1.0"> <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2" rxtx_factor="1.0"> <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3" rxtx_factor="1.0"> <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4" rxtx_factor="1.0"> <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5" rxtx_factor="1.0"> <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" rxtx_factor="1.0">
<atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/> <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
<atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/> <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
</flavor> </flavor>

4
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl
View File

@ -17,7 +17,7 @@
"rxtx_factor": 2.0, "rxtx_factor": 2.0,
"vcpus": 2, "vcpus": 2,
"disabled": false, "disabled": false,
"ephemeral": "", "ephemeral": 0,
"swap": "" "swap": 0
} }
} }

2
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?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="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" disabled="False" ephemeral="" swap="" rxtx_factor="2.0"> <flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" disabled="False" ephemeral="0" swap="0" rxtx_factor="2.0">
<atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/> <atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/>
<atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/> <atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/>
</flavor> </flavor>

20
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavors-detail-resp.json.tpl
View File

@ -3,7 +3,7 @@
{ {
"disabled": false, "disabled": false,
"disk": 1, "disk": 1,
"ephemeral": "", "ephemeral": 0,
"id": "1", "id": "1",
"links": [ "links": [
{ {
@ -17,14 +17,14 @@
], ],
"name": "m1.tiny", "name": "m1.tiny",
"ram": 512, "ram": 512,
"swap": "", "swap": 0,
"vcpus": 1, "vcpus": 1,
"rxtx_factor": 1.0 "rxtx_factor": 1.0
}, },
{ {
"disabled": false, "disabled": false,
"disk": 20, "disk": 20,
"ephemeral": "", "ephemeral": 0,
"id": "2", "id": "2",
"links": [ "links": [
{ {
@ -38,14 +38,14 @@
], ],
"name": "m1.small", "name": "m1.small",
"ram": 2048, "ram": 2048,
"swap": "", "swap": 0,
"vcpus": 1, "vcpus": 1,
"rxtx_factor": 1.0 "rxtx_factor": 1.0
}, },
{ {
"disabled": false, "disabled": false,
"disk": 40, "disk": 40,
"ephemeral": "", "ephemeral": 0,
"id": "3", "id": "3",
"links": [ "links": [
{ {
@ -59,14 +59,14 @@
], ],
"name": "m1.medium", "name": "m1.medium",
"ram": 4096, "ram": 4096,
"swap": "", "swap": 0,
"vcpus": 2, "vcpus": 2,
"rxtx_factor": 1.0 "rxtx_factor": 1.0
}, },
{ {
"disabled": false, "disabled": false,
"disk": 80, "disk": 80,
"ephemeral": "", "ephemeral": 0,
"id": "4", "id": "4",
"links": [ "links": [
{ {
@ -80,14 +80,14 @@
], ],
"name": "m1.large", "name": "m1.large",
"ram": 8192, "ram": 8192,
"swap": "", "swap": 0,
"vcpus": 4, "vcpus": 4,
"rxtx_factor": 1.0 "rxtx_factor": 1.0
}, },
{ {
"disabled": false, "disabled": false,
"disk": 160, "disk": 160,
"ephemeral": "", "ephemeral": 0,
"id": "5", "id": "5",
"links": [ "links": [
{ {
@ -101,7 +101,7 @@
], ],
"name": "m1.xlarge", "name": "m1.xlarge",
"ram": 16384, "ram": 16384,
"swap": "", "swap": 0,
"vcpus": 8, "vcpus": 8,
"rxtx_factor": 1.0 "rxtx_factor": 1.0
} }

10
nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavors-detail-resp.xml.tpl
View File

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<flavor name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" rxtx_factor="1.0"> <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
<atom:link href="%(host)s/v3/flavors/1" rel="self"/> <atom:link href="%(host)s/v3/flavors/1" rel="self"/>
<atom:link href="%(host)s/flavors/1" rel="bookmark"/> <atom:link href="%(host)s/flavors/1" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2" rxtx_factor="1.0"> <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" rxtx_factor="1.0">
<atom:link href="%(host)s/v3/flavors/2" rel="self"/> <atom:link href="%(host)s/v3/flavors/2" rel="self"/>
<atom:link href="%(host)s/flavors/2" rel="bookmark"/> <atom:link href="%(host)s/flavors/2" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3" rxtx_factor="1.0"> <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" rxtx_factor="1.0">
<atom:link href="%(host)s/v3/flavors/3" rel="self"/> <atom:link href="%(host)s/v3/flavors/3" rel="self"/>
<atom:link href="%(host)s/flavors/3" rel="bookmark"/> <atom:link href="%(host)s/flavors/3" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4" rxtx_factor="1.0"> <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" rxtx_factor="1.0">
<atom:link href="%(host)s/v3/flavors/4" rel="self"/> <atom:link href="%(host)s/v3/flavors/4" rel="self"/>
<atom:link href="%(host)s/flavors/4" rel="bookmark"/> <atom:link href="%(host)s/flavors/4" rel="bookmark"/>
</flavor> </flavor>
<flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5" rxtx_factor="1.0"> <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" rxtx_factor="1.0">
<atom:link href="%(host)s/v3/flavors/5" rel="self"/> <atom:link href="%(host)s/v3/flavors/5" rel="self"/>
<atom:link href="%(host)s/flavors/5" rel="bookmark"/> <atom:link href="%(host)s/flavors/5" rel="bookmark"/>
</flavor> </flavor>