openstack/placement
Code Issues Proposed changes

Remove v3 xml API sample tests

Browse Source 
This is a step toward removing XML support from the v3 compute API.
First, we need to remove all of the tests that would fail once we start
ripping out the real code.

Part of blueprint remove-v3-xml-api

Change-Id: Ie2c280d5ea1e6b8756535deb05982a92561552db
This commit is contained in:
Russell Bryant
2014-01-28 17:01:44 -05:00
parent 25b2ede2fa
commit 592185c242
25 changed files with 0 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

@@ -1,10 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2013-08-18 12:17:56.757058</created_at>
<updated_at>None</updated_at>
<deleted_at>None</deleted_at>
<id>1</id>
</aggregate>

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

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

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

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

14
doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.xml
View File

@@ -1,14 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>newname</name>
<availability_zone>nova2</availability_zone>
<deleted>False</deleted>
<created_at>2013-08-18 12:17:57.655769</created_at>
<updated_at>2013-08-18 12:17:57.683956</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata>
<availability_zone>nova2</availability_zone>
</metadata>
</aggregate>

16
doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.xml
View File

@@ -1,16 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2013-08-18 12:17:57.255783</created_at>
<updated_at>None</updated_at>
<hosts>
<host>bdb794e5cdd3447c9132ddd8e5cc3d0b</host>
</hosts>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata>
<availability_zone>nova</availability_zone>
</metadata>
</aggregate>

14
doc/v3/api_samples/os-aggregates/aggregates-get-resp.xml
View File

@@ -1,14 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2013-08-18 12:17:56.757058</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata>
<availability_zone>nova</availability_zone>
</metadata>
</aggregate>

16
doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.xml
View File

@@ -1,16 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregates>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2013-08-18 12:17:57.241412</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata>
<availability_zone>nova</availability_zone>
</metadata>
</aggregate>
</aggregates>

15
doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.xml
View File

@@ -1,15 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2013-08-18 12:17:56.891817</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata>
<key>value</key>
<availability_zone>nova</availability_zone>
</metadata>
</aggregate>

14
doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml
View File

@@ -1,14 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<aggregate>
<name>name</name>
<availability_zone>nova</availability_zone>
<deleted>False</deleted>
<created_at>2013-08-18 12:17:57.255783</created_at>
<updated_at>None</updated_at>
<hosts/>
<deleted_at>None</deleted_at>
<id>1</id>
<metadata>
<availability_zone>nova</availability_zone>
</metadata>
</aggregate>

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

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

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

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

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

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

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

@@ -1,10 +0,0 @@
<?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>

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

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

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

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

14
nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl
View File

@@ -1,14 +0,0 @@
<?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>
<availability_zone>nova2</availability_zone>
</metadata>
</aggregate>

16
nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl
View File

@@ -1,16 +0,0 @@
<?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>
<availability_zone>nova</availability_zone>
</metadata>
</aggregate>

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

@@ -1,14 +0,0 @@
<?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>
<availability_zone>nova</availability_zone>
</metadata>
</aggregate>

16
nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl
View File

@@ -1,16 +0,0 @@
<?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>
<availability_zone>nova</availability_zone>
</metadata>
</aggregate>
</aggregates>

15
nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl
View File

@@ -1,15 +0,0 @@
<?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>
<availability_zone>nova</availability_zone>
</metadata>
</aggregate>

14
nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl
View File

@@ -1,14 +0,0 @@
<?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>
<availability_zone>nova</availability_zone>
</metadata>
</aggregate>

4
nova/tests/integrated/v3/test_aggregates.py
View File

@@ -79,7 +79,3 @@ class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV3):
subs = self._get_regexes()
self._verify_response('aggregate-update-post-resp',
subs, response, 200)
class AggregatesSampleXmlTest(AggregatesSampleJsonTest):
ctype = 'xml'