openstack/placement
Code Issues Proposed changes

Add aggregates extension to API samples test.

Browse Source 
Change-Id: I8f0f5b022795dc1d766e585cab8fe5f8445a3722
Signed-off-by: Matthew Treinish <treinish@linux.vnet.ibm.com>
This commit is contained in:
Matthew Treinish 2012-09-14 09:52:05 -04:00
parent 01fe63b9f8
commit 06c31bc652
54 changed files with 553 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/api_samples/os-aggregates/aggregate-add-host-post-req.json Normal file
View File

@ -0,0 +1,6 @@
{
"add_host":
{
"host": "581d29b9e3504d8a895caddb13839b15"
}
}

2
doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<add_host host="7c9e00dbca5e4fb88538b021c0f933a5" />

9
doc/api_samples/os-aggregates/aggregate-metadata-post-req.json Normal file
View File

@ -0,0 +1,9 @@
{
"set_metadata":
{
"metadata":
{
"key": "value"
}
}
}

6
doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<set_metadata>
<metadata>
<key>value</key>
</metadata>
</set_metadata>

7
doc/api_samples/os-aggregates/aggregate-post-req.json Normal file
View File

@ -0,0 +1,7 @@
{
"aggregate":
{
"name": "name",
"availability_zone": "nova"
}
}

2
doc/api_samples/os-aggregates/aggregate-post-req.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<aggregate name="name" availability_zone="nova" />

11
doc/api_samples/os-aggregates/aggregate-post-resp.json Normal file
View File

@ -0,0 +1,11 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "2012-10-01T18:50:27.781065",
"deleted": false,
"deleted_at": null,
"id": 1,
"name": "name",
"updated_at": null
}
}

10
doc/api_samples/os-aggregates/aggregate-post-resp.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2012-10-01 18:50:35.506667</created_at>
<updated_at>None</updated_at>
<deleted_at>None</deleted_at>
<id>1</id>
</aggregate>

6
doc/api_samples/os-aggregates/aggregate-remove-host-post-req.json Normal file
View File

@ -0,0 +1,6 @@
{
"remove_host":
{
"host": "581d29b9e3504d8a895caddb13839b15"
}
}

2
doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<remove_host host="7c9e00dbca5e4fb88538b021c0f933a5" />

7
doc/api_samples/os-aggregates/aggregate-update-post-req.json Normal file
View File

@ -0,0 +1,7 @@
{
"aggregate":
{
"name": "newname",
"availability_zone": "nova2"
}
}

2
doc/api_samples/os-aggregates/aggregate-update-post-req.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<aggregate name="newname" availability_zone="nova2" />

13
doc/api_samples/os-aggregates/aggregate-update-post-resp.json Normal file
View File

@ -0,0 +1,13 @@
{
"aggregate": {
"availability_zone": "nova2",
"created_at": "2012-10-01T18:50:27.781065",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {},
"name": "newname",
"updated_at": "2012-10-01T18:50:27.791392"
}
}

12
doc/api_samples/os-aggregates/aggregate-update-post-resp.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>newname</name>
<availability_zone>nova2</availability_zone>
<deleted>False</deleted>
<created_at>2012-10-01 18:50:35.506667</created_at>
<updated_at>2012-10-01 18:50:35.517397</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata/>
</aggregate>

15
doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json Normal file
View File

@ -0,0 +1,15 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "2012-10-01T18:50:27.511586",
"deleted": false,
"deleted_at": null,
"hosts": [
"581d29b9e3504d8a895caddb13839b15"
],
"id": 1,
"metadata": {},
"name": "name",
"updated_at": null
}
}

14
doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2012-10-01 18:50:35.236556</created_at>
<updated_at>None</updated_at>
<hosts>
<host>7c9e00dbca5e4fb88538b021c0f933a5</host>
</hosts>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata/>
</aggregate>

13
doc/api_samples/os-aggregates/aggregates-get-resp.json Normal file
View File

@ -0,0 +1,13 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "2012-10-01T18:50:27.048605",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {},
"name": "name",
"updated_at": null
}
}

12
doc/api_samples/os-aggregates/aggregates-get-resp.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2012-10-01 18:50:34.764838</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata/>
</aggregate>

15
doc/api_samples/os-aggregates/aggregates-list-get-resp.json Normal file
View File

@ -0,0 +1,15 @@
{
"aggregates": [
{
"availability_zone": "nova",
"created_at": "2012-10-01T18:50:27.252869",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {},
"name": "name",
"updated_at": null
}
]
}

14
doc/api_samples/os-aggregates/aggregates-list-get-resp.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregates>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2012-10-01 18:50:34.970677</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata/>
</aggregate>
</aggregates>

15
doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json Normal file
View File

@ -0,0 +1,15 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "2012-10-01T18:50:26.604176",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"key": "value"
},
"name": "name",
"updated_at": null
}
}

14
doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2012-10-01 18:50:34.313003</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata>
<key>value</key>
</metadata>
</aggregate>

13
doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json Normal file
View File

@ -0,0 +1,13 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "2012-10-01T18:50:27.511586",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {},
"name": "name",
"updated_at": null
}
}

12
doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2012-10-01 18:50:35.236556</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata/>
</aggregate>

16
doc/api_samples/os-aggregates/server-post-req.json Normal file
View File

@ -0,0 +1,16 @@
{
"server" : {
"name" : "new-server-test",
"imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
"flavorRef" : "http://openstack.example.com/openstack/flavors/1",
"metadata" : {
"My Server Name" : "Apache1"
},
"personality" : [
{
"path" : "/etc/banner.txt",
"contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
}
]
}
}

16
doc/api_samples/os-aggregates/server-post-resp.json Normal file
View File

@ -0,0 +1,16 @@
{
"server": {
"adminPass": "kWaKB9zfiMsq",
"id": "d261e7aa-50ea-45bb-827c-61bd94deb012",
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/d261e7aa-50ea-45bb-827c-61bd94deb012",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/d261e7aa-50ea-45bb-827c-61bd94deb012",
"rel": "bookmark"
}
]
}
}

6
nova/tests/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl Normal file
View File

@ -0,0 +1,6 @@
{
"add_host":
{
"host": "%(host_name)s"
}
}

2
nova/tests/integrated/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<add_host host="%(host_name)s" />

9
nova/tests/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl Normal file
View File

@ -0,0 +1,9 @@
{
"set_metadata":
{
"metadata":
{
"key": "value"
}
}
}

6
nova/tests/integrated/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<set_metadata>
<metadata>
<key>value</key>
</metadata>
</set_metadata>

7
nova/tests/integrated/api_samples/os-aggregates/aggregate-post-req.json.tpl Normal file
View File

@ -0,0 +1,7 @@
{
"aggregate":
{
"name": "name",
"availability_zone": "nova"
}
}

2
nova/tests/integrated/api_samples/os-aggregates/aggregate-post-req.xml.tpl Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<aggregate name="name" availability_zone="nova" />

11
nova/tests/integrated/api_samples/os-aggregates/aggregate-post-resp.json.tpl Normal file
View File

@ -0,0 +1,11 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "%(timestamp)s",
"deleted": false,
"deleted_at": null,
"id": %(aggregate_id)s,
"name": "name",
"updated_at": null
}
}

10
nova/tests/integrated/api_samples/os-aggregates/aggregate-post-resp.xml.tpl Normal file
View File

@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>%(timestamp)s</created_at>
<updated_at>None</updated_at>
<deleted_at>None</deleted_at>
<id>%(aggregate_id)s</id>
</aggregate>

6
nova/tests/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl Normal file
View File

@ -0,0 +1,6 @@
{
"remove_host":
{
"host": "%(host_name)s"
}
}

2
nova/tests/integrated/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<remove_host host="%(host_name)s" />

7
nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-req.json.tpl Normal file
View File

@ -0,0 +1,7 @@
{
"aggregate":
{
"name": "newname",
"availability_zone": "nova2"
}
}

2
nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<aggregate name="newname" availability_zone="nova2" />

13
nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl Normal file
View File

@ -0,0 +1,13 @@
{
"aggregate": {
"availability_zone": "nova2",
"created_at": "%(timestamp)s",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {},
"name": "newname",
"updated_at": "%(timestamp)s"
}
}

12
nova/tests/integrated/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl Normal file
View File

@ -0,0 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>newname</name>
<availability_zone>nova2</availability_zone>
<deleted>False</deleted>
<created_at>%(timestamp)s</created_at>
<updated_at>%(timestamp)s</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata/>
</aggregate>

15
nova/tests/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl Normal file
View File

@ -0,0 +1,15 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "%(timestamp)s",
"deleted": false,
"deleted_at": null,
"hosts": [
"%(compute_host)s"
],
"id": 1,
"metadata": {},
"name": "name",
"updated_at": null
}
}

14
nova/tests/integrated/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl Normal file
View File

@ -0,0 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>%(timestamp)s</created_at>
<updated_at>None</updated_at>
<hosts>
<host>%(compute_host)s</host>
</hosts>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata/>
</aggregate>

13
nova/tests/integrated/api_samples/os-aggregates/aggregates-get-resp.json.tpl Normal file
View File

@ -0,0 +1,13 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "%(timestamp)s",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {},
"name": "name",
"updated_at": null
}
}

12
nova/tests/integrated/api_samples/os-aggregates/aggregates-get-resp.xml.tpl Normal file
View File

@ -0,0 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>%(timestamp)s</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata/>
</aggregate>

15
nova/tests/integrated/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl Normal file
View File

@ -0,0 +1,15 @@
{
"aggregates": [
{
"availability_zone": "nova",
"created_at": "%(timestamp)s",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {},
"name": "name",
"updated_at": null
}
]
}

14
nova/tests/integrated/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl Normal file
View File

@ -0,0 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregates>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>%(timestamp)s</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata/>
</aggregate>
</aggregates>

15
nova/tests/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl Normal file
View File

@ -0,0 +1,15 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "%(timestamp)s",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {
"key": "value"
},
"name": "name",
"updated_at": null
}
}

14
nova/tests/integrated/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl Normal file
View File

@ -0,0 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>%(timestamp)s</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata>
<key>value</key>
</metadata>
</aggregate>

13
nova/tests/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl Normal file
View File

@ -0,0 +1,13 @@
{
"aggregate": {
"availability_zone": "nova",
"created_at": "%(timestamp)s",
"deleted": false,
"deleted_at": null,
"hosts": [],
"id": 1,
"metadata": {},
"name": "name",
"updated_at": null
}
}

12
nova/tests/integrated/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl Normal file
View File

@ -0,0 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>%(timestamp)s</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata/>
</aggregate>

16
nova/tests/integrated/api_samples/os-aggregates/server-post-req.json.tpl Normal file
View File

@ -0,0 +1,16 @@
{
"server" : {
"name" : "new-server-test",
"imageRef" : "%(host)s/openstack/images/%(image_id)s",
"flavorRef" : "%(host)s/openstack/flavors/1",
"metadata" : {
"My Server Name" : "Apache1"
},
"personality" : [
{
"path" : "/etc/banner.txt",
"contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
}
]
}
}

19
nova/tests/integrated/api_samples/os-aggregates/server-post-req.xml.tpl Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="%(host)s/openstack/images/%(image_id)s" flavorRef="%(host)s/openstack/flavors/1" name="new-server-test">
<metadata>
<meta key="My Server Name">Apache1</meta>
</metadata>
<personality>
<file path="/etc/banner.txt">
ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
</file>
</personality>
</server>

16
nova/tests/integrated/api_samples/os-aggregates/server-post-resp.json.tpl Normal file
View File

@ -0,0 +1,16 @@
{
"server": {
"adminPass": "%(password)s",
"id": "%(id)s",
"links": [
{
"href": "%(host)s/v2/openstack/servers/%(uuid)s",
"rel": "self"
},
{
"href": "%(host)s/openstack/servers/%(uuid)s",
"rel": "bookmark"
}
]
}
}

6
nova/tests/integrated/api_samples/os-aggregates/server-post-resp.xml.tpl Normal file
View File

@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="%(id)s" adminPass="%(password)s">
<metadata/>
<atom:link href="%(host)s/v2/openstack/servers/%(uuid)s" rel="self"/>
<atom:link href="%(host)s/openstack/servers/%(uuid)s" rel="bookmark"/>
</server>