From 12e219797eb66697733dd32554778655af530e90 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 8 Dec 2014 08:31:35 -0500 Subject: [PATCH] Nuke XML support from Nova REST API - Phase 1 In I5a580fc323c3809790b4a68a9f8f8129ecdc2cf0 we switched off XML support. In this review we entirely remove all the testcases and supporting files. Change-Id: I83827d438753fd3899053dd6e09bc77c997c7406 --- .../aggregate-add-host-post-req.xml | 2 -- .../aggregate-metadata-post-req.xml | 6 ------ .../os-aggregates/aggregate-post-req.xml | 2 -- .../os-aggregates/aggregate-post-resp.xml | 10 ---------- .../aggregate-remove-host-post-req.xml | 2 -- .../aggregate-update-post-req.xml | 2 -- .../aggregate-update-post-resp.xml | 14 -------------- .../aggregates-add-host-post-resp.xml | 16 ---------------- .../os-aggregates/aggregates-get-resp.xml | 14 -------------- .../aggregates-list-get-resp.xml | 16 ---------------- .../aggregates-metadata-post-resp.xml | 15 --------------- .../aggregates-remove-host-post-resp.xml | 14 -------------- .../aggregate-add-host-post-req.xml.tpl | 2 -- .../aggregate-metadata-post-req.xml.tpl | 6 ------ .../os-aggregates/aggregate-post-req.xml.tpl | 2 -- .../os-aggregates/aggregate-post-resp.xml.tpl | 10 ---------- .../aggregate-remove-host-post-req.xml.tpl | 2 -- .../aggregate-update-post-req.xml.tpl | 2 -- .../aggregate-update-post-resp.xml.tpl | 14 -------------- .../aggregates-add-host-post-resp.xml.tpl | 16 ---------------- .../os-aggregates/aggregates-get-resp.xml.tpl | 14 -------------- .../aggregates-list-get-resp.xml.tpl | 16 ---------------- .../aggregates-metadata-post-resp.xml.tpl | 15 --------------- .../aggregates-remove-host-post-resp.xml.tpl | 14 -------------- .../os-aggregates/server-post-req.xml.tpl | 19 ------------------- .../os-aggregates/server-post-resp.xml.tpl | 6 ------ 26 files changed, 251 deletions(-) delete mode 100644 doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml delete mode 100644 doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml delete mode 100644 doc/api_samples/os-aggregates/aggregate-post-req.xml delete mode 100644 doc/api_samples/os-aggregates/aggregate-post-resp.xml delete mode 100644 doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml delete mode 100644 doc/api_samples/os-aggregates/aggregate-update-post-req.xml delete mode 100644 doc/api_samples/os-aggregates/aggregate-update-post-resp.xml delete mode 100644 doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml delete mode 100644 doc/api_samples/os-aggregates/aggregates-get-resp.xml delete mode 100644 doc/api_samples/os-aggregates/aggregates-list-get-resp.xml delete mode 100644 doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml delete mode 100644 doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregate-post-req.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregate-post-resp.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregates-get-resp.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/server-post-req.xml.tpl delete mode 100644 nova/tests/functional/api_samples/os-aggregates/server-post-resp.xml.tpl diff --git a/doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml b/doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml deleted file mode 100644 index 5f48f043d..000000000 --- a/doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml b/doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml deleted file mode 100644 index d9b935fd4..000000000 --- a/doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - value - - \ No newline at end of file diff --git a/doc/api_samples/os-aggregates/aggregate-post-req.xml b/doc/api_samples/os-aggregates/aggregate-post-req.xml deleted file mode 100644 index d25f5f848..000000000 --- a/doc/api_samples/os-aggregates/aggregate-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-aggregates/aggregate-post-resp.xml b/doc/api_samples/os-aggregates/aggregate-post-resp.xml deleted file mode 100644 index 544271bdc..000000000 --- a/doc/api_samples/os-aggregates/aggregate-post-resp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - name - nova - False - 2012-10-01 18:50:35.506667 - None - None - 1 - \ No newline at end of file diff --git a/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml b/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml deleted file mode 100644 index 87e5d64f9..000000000 --- a/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-aggregates/aggregate-update-post-req.xml b/doc/api_samples/os-aggregates/aggregate-update-post-req.xml deleted file mode 100644 index 1eb9c38fd..000000000 --- a/doc/api_samples/os-aggregates/aggregate-update-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml b/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml deleted file mode 100644 index 25227669b..000000000 --- a/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - newname - nova2 - False - 2012-12-04 12:04:30.245284 - 2012-12-04 12:04:30.357795 - - None - 1 - - nova2 - - \ No newline at end of file diff --git a/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml b/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml deleted file mode 100644 index ad11f3859..000000000 --- a/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - name - nova - False - 2012-12-04 12:04:27.574038 - None - - 392adba19dd449179804eaff16ff4a97 - - None - 1 - - nova - - \ No newline at end of file diff --git a/doc/api_samples/os-aggregates/aggregates-get-resp.xml b/doc/api_samples/os-aggregates/aggregates-get-resp.xml deleted file mode 100644 index 431e59cf4..000000000 --- a/doc/api_samples/os-aggregates/aggregates-get-resp.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - name - nova - False - 2012-11-16 06:22:25.587739 - None - - None - 1 - - nova - - diff --git a/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml b/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml deleted file mode 100644 index 8d92e1466..000000000 --- a/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - name - nova - False - 2012-11-16 06:22:25.935099 - None - - None - 1 - - nova - - - diff --git a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml deleted file mode 100644 index 5e2193d06..000000000 --- a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - name - nova - False - 2012-11-16 06:22:24.864471 - None - - None - 1 - - value - nova - - \ No newline at end of file diff --git a/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml b/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml deleted file mode 100644 index 33dce2838..000000000 --- a/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - name - nova - False - 2012-12-04 12:04:29.722109 - None - - None - 1 - - nova - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl deleted file mode 100644 index 4454134ef..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl deleted file mode 100644 index 72b1e742a..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - value - - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregate-post-req.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregate-post-req.xml.tpl deleted file mode 100644 index 4931476ae..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregate-post-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregate-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregate-post-resp.xml.tpl deleted file mode 100644 index 2a1bee586..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregate-post-resp.xml.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - name - nova - False - %(xmltime)s - None - None - %(aggregate_id)s - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl deleted file mode 100644 index bc2896835..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl deleted file mode 100644 index 04ce4fba5..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl deleted file mode 100644 index 1ff22bc0e..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - - newname - nova2 - False - %(xmltime)s - %(xmltime)s - - None - 1 - - nova2 - - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl deleted file mode 100644 index 7412dee66..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - - name - nova - False - %(xmltime)s - None - - %(compute_host)s - - None - 1 - - nova - - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregates-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregates-get-resp.xml.tpl deleted file mode 100644 index 7f44a231c..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregates-get-resp.xml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - - name - nova - False - %(xmltime)s - None - - None - 1 - - nova - - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl deleted file mode 100644 index 79af4a8d8..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - - - name - nova - False - %(xmltime)s - None - - None - 1 - - nova - - - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl deleted file mode 100644 index 01245a4db..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - name - nova - False - %(xmltime)s - None - - None - 1 - - value - nova - - diff --git a/nova/tests/functional/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl deleted file mode 100644 index 7f44a231c..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - - name - nova - False - %(xmltime)s - None - - None - 1 - - nova - - diff --git a/nova/tests/functional/api_samples/os-aggregates/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/server-post-req.xml.tpl deleted file mode 100644 index f92614984..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/server-post-req.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/nova/tests/functional/api_samples/os-aggregates/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-aggregates/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69b..000000000 --- a/nova/tests/functional/api_samples/os-aggregates/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -