diff --git a/doc/api_samples/NMN/multinic-add-fixed-ip-req.xml b/doc/api_samples/NMN/multinic-add-fixed-ip-req.xml deleted file mode 100644 index 4c72212a74..0000000000 --- a/doc/api_samples/NMN/multinic-add-fixed-ip-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 1 - diff --git a/doc/api_samples/NMN/multinic-remove-fixed-ip-req.xml b/doc/api_samples/NMN/multinic-remove-fixed-ip-req.xml deleted file mode 100644 index 4e6ccdd87c..0000000000 --- a/doc/api_samples/NMN/multinic-remove-fixed-ip-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - -
10.0.0.2
- diff --git a/doc/api_samples/NMN/server-post-req.xml b/doc/api_samples/NMN/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/NMN/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/NMN/server-post-resp.xml b/doc/api_samples/NMN/server-post-resp.xml deleted file mode 100644 index 7f84ac03df..0000000000 --- a/doc/api_samples/NMN/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/image-get-resp.xml b/doc/api_samples/OS-DCF/image-get-resp.xml deleted file mode 100644 index 448fd33837..0000000000 --- a/doc/api_samples/OS-DCF/image-get-resp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - nokernel - True - nokernel - x86_64 - - - - - diff --git a/doc/api_samples/OS-DCF/image-list-resp.xml b/doc/api_samples/OS-DCF/image-list-resp.xml deleted file mode 100644 index eadb6c01bf..0000000000 --- a/doc/api_samples/OS-DCF/image-list-resp.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - nokernel - True - nokernel - x86_64 - - - - - - - - nokernel - nokernel - x86_64 - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - False - nokernel - x86_64 - - - - - - - - 155d900f-4e14-4e4c-a73d-069cbf4541e6 - None - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - nokernel - - - - - - diff --git a/doc/api_samples/OS-DCF/list-servers-detail-get.xml b/doc/api_samples/OS-DCF/list-servers-detail-get.xml deleted file mode 100644 index 1675b511bf..0000000000 --- a/doc/api_samples/OS-DCF/list-servers-detail-get.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-action-rebuild-req.xml b/doc/api_samples/OS-DCF/server-action-rebuild-req.xml deleted file mode 100644 index 1c0fcaa5c4..0000000000 --- a/doc/api_samples/OS-DCF/server-action-rebuild-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-action-rebuild-resp.xml b/doc/api_samples/OS-DCF/server-action-rebuild-resp.xml deleted file mode 100644 index 1d7b3267c6..0000000000 --- a/doc/api_samples/OS-DCF/server-action-rebuild-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-get-resp.xml b/doc/api_samples/OS-DCF/server-get-resp.xml deleted file mode 100644 index 3acba49eb5..0000000000 --- a/doc/api_samples/OS-DCF/server-get-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-post-req.xml b/doc/api_samples/OS-DCF/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/OS-DCF/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-post-resp.xml b/doc/api_samples/OS-DCF/server-post-resp.xml deleted file mode 100644 index c9439943c3..0000000000 --- a/doc/api_samples/OS-DCF/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-resize-post-req.xml b/doc/api_samples/OS-DCF/server-resize-post-req.xml deleted file mode 100644 index f0a299bca4..0000000000 --- a/doc/api_samples/OS-DCF/server-resize-post-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-update-put-req.xml b/doc/api_samples/OS-DCF/server-update-put-req.xml deleted file mode 100644 index f48d8e73dc..0000000000 --- a/doc/api_samples/OS-DCF/server-update-put-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-update-put-resp.xml b/doc/api_samples/OS-DCF/server-update-put-resp.xml deleted file mode 100644 index cd5ff55616..0000000000 --- a/doc/api_samples/OS-DCF/server-update-put-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-AZ/server-get-resp.xml b/doc/api_samples/OS-EXT-AZ/server-get-resp.xml deleted file mode 100644 index 5025af4e81..0000000000 --- a/doc/api_samples/OS-EXT-AZ/server-get-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/doc/api_samples/OS-EXT-AZ/server-post-req.xml b/doc/api_samples/OS-EXT-AZ/server-post-req.xml deleted file mode 100644 index 68f0933c77..0000000000 --- a/doc/api_samples/OS-EXT-AZ/server-post-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/api_samples/OS-EXT-AZ/server-post-resp.xml b/doc/api_samples/OS-EXT-AZ/server-post-resp.xml deleted file mode 100644 index d8b1f0837a..0000000000 --- a/doc/api_samples/OS-EXT-AZ/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml b/doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml deleted file mode 100644 index 4cdf793346..0000000000 --- a/doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml b/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml deleted file mode 100644 index c713e3a207..0000000000 --- a/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - nokernel - True - nokernel - x86_64 - - - - - diff --git a/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml b/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml deleted file mode 100644 index bb3dcbaa87..0000000000 --- a/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - nokernel - True - nokernel - x86_64 - - - - - - - - nokernel - nokernel - x86_64 - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - False - nokernel - x86_64 - - - - - - - - 155d900f-4e14-4e4c-a73d-069cbf4541e6 - None - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - nokernel - - - - - - diff --git a/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml b/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml deleted file mode 100644 index 273ae36e7d..0000000000 --- a/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/doc/api_samples/OS-EXT-IPS-MAC/server-post-req.xml b/doc/api_samples/OS-EXT-IPS-MAC/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/OS-EXT-IPS-MAC/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml b/doc/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml deleted file mode 100644 index b268ba0d39..0000000000 --- a/doc/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml b/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml deleted file mode 100644 index c2f958a148..0000000000 --- a/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/doc/api_samples/OS-EXT-IPS/server-get-resp.xml b/doc/api_samples/OS-EXT-IPS/server-get-resp.xml deleted file mode 100644 index 84619ffec7..0000000000 --- a/doc/api_samples/OS-EXT-IPS/server-get-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-IPS/server-post-req.xml b/doc/api_samples/OS-EXT-IPS/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/OS-EXT-IPS/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-IPS/server-post-resp.xml b/doc/api_samples/OS-EXT-IPS/server-post-resp.xml deleted file mode 100644 index b268ba0d39..0000000000 --- a/doc/api_samples/OS-EXT-IPS/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-IPS/servers-detail-resp.xml b/doc/api_samples/OS-EXT-IPS/servers-detail-resp.xml deleted file mode 100644 index 93a3ff2e91..0000000000 --- a/doc/api_samples/OS-EXT-IPS/servers-detail-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml deleted file mode 100644 index 4b42c3586b..0000000000 --- a/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml b/doc/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml b/doc/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml deleted file mode 100644 index 1c7833c3cb..0000000000 --- a/doc/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml deleted file mode 100644 index 8179a3bf94..0000000000 --- a/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-STS/server-get-resp.xml b/doc/api_samples/OS-EXT-STS/server-get-resp.xml deleted file mode 100644 index 53363a2240..0000000000 --- a/doc/api_samples/OS-EXT-STS/server-get-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-STS/server-post-req.xml b/doc/api_samples/OS-EXT-STS/server-post-req.xml deleted file mode 100644 index 077dd7618c..0000000000 --- a/doc/api_samples/OS-EXT-STS/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/doc/api_samples/OS-EXT-STS/server-post-resp.xml b/doc/api_samples/OS-EXT-STS/server-post-resp.xml deleted file mode 100644 index 68f0933c77..0000000000 --- a/doc/api_samples/OS-EXT-STS/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/api_samples/OS-EXT-STS/servers-detail-resp.xml b/doc/api_samples/OS-EXT-STS/servers-detail-resp.xml deleted file mode 100644 index e4dafd70bb..0000000000 --- a/doc/api_samples/OS-EXT-STS/servers-detail-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-VIF-NET/server-post-req.xml b/doc/api_samples/OS-EXT-VIF-NET/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/OS-EXT-VIF-NET/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-VIF-NET/server-post-resp.xml b/doc/api_samples/OS-EXT-VIF-NET/server-post-resp.xml deleted file mode 100644 index d620ed00b0..0000000000 --- a/doc/api_samples/OS-EXT-VIF-NET/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml b/doc/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml deleted file mode 100644 index d5a587d550..0000000000 --- a/doc/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml b/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml deleted file mode 100644 index 95d8b5d6d9..0000000000 --- a/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml b/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml deleted file mode 100644 index d49c273d64..0000000000 --- a/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml deleted file mode 100644 index 653e77cda2..0000000000 --- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml deleted file mode 100644 index dc48eebd8d..0000000000 --- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml deleted file mode 100644 index 99aec19ed8..0000000000 --- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml +++ /dev/null @@ -1,11 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml deleted file mode 100644 index 7da3e23797..0000000000 --- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml deleted file mode 100644 index 66843fae33..0000000000 --- a/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - xen - eb999657-dd6b-464e-8713-95c532ac3b18 - - diff --git a/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml deleted file mode 100644 index 59929d8083..0000000000 --- a/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-SRV-USG/server-get-resp.xml b/doc/api_samples/OS-SRV-USG/server-get-resp.xml deleted file mode 100644 index f5336a1471..0000000000 --- a/doc/api_samples/OS-SRV-USG/server-get-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-SRV-USG/server-post-req.xml b/doc/api_samples/OS-SRV-USG/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/OS-SRV-USG/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/OS-SRV-USG/server-post-resp.xml b/doc/api_samples/OS-SRV-USG/server-post-resp.xml deleted file mode 100644 index bac663bd35..0000000000 --- a/doc/api_samples/OS-SRV-USG/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-SRV-USG/servers-detail-resp.xml b/doc/api_samples/OS-SRV-USG/servers-detail-resp.xml deleted file mode 100644 index 099f2ded1f..0000000000 --- a/doc/api_samples/OS-SRV-USG/servers-detail-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml deleted file mode 100644 index 41f5a304f7..0000000000 --- a/doc/api_samples/all_extensions/extensions-get-resp.xml +++ /dev/null @@ -1,293 +0,0 @@ - - - - Multiple network support. - - - Disk Management Extension. - - - Extended Availability Zone support. - - - Adds image size to image listings. - - - Adds type parameter to the ip list. - - - Adds mac address parameter to the ip list. - - - Extended Server Attributes support. - - - Extended Status support. - - - Adds network id parameter to the virtual interface list. - - - Support to show the disabled status of a flavor. - - - Provide additional data for flavors. - - - Pass arbitrary key/value pairs to the scheduler. - - - Adds launched_at and terminated_at on Servers. - - - Enable admin-only server actions - - Actions include: pause, unpause, suspend, resume, migrate, - resetNetwork, injectNetworkInfo, lock, unlock, createBackup - - - - Agents support. - - - Admin-only aggregate administration. - - - Assisted volume snapshots. - - - Attach interface support. - - - 1. Add availability_zone to the Create Server v1.1 API. - 2. Add availability zones describing. - - - - Add extended status in Baremetal Nodes v2 API. - - - Admin-only bare-metal node administration. - - - Allow boot with the new BDM data format. - - - Adding functionality to get cell capacities. - - - Enables cells-related functionality such as adding neighbor cells, - listing neighbor cells, and getting the capabilities of the local cell. - - - - Certificates support. - - - Adds actions to create cloudpipe instances. - - When running with the Vlan network mode, you need a mechanism to route - from the public Internet to your vlans. This mechanism is known as a - cloudpipe. - - At the time of creating this class, only OpenVPN is supported. Support for - a SSH Bastion host is forthcoming. - - - - Adds the ability to set the vpn ip/port for cloudpipe instances. - - - Config Drive Extension. - - - Console token authentication support. - - - Console log output support, with tailing ability. - - - Interactive Console support. - - - Extended support to the Create Server v1.1 API. - - - Instance deferred delete. - - - Enables server evacuation. - - - Enables server evacuation without target host. Scheduler will select - one to target. - - - - Adds optional fixed_address to the add floating IP command. - - - Extended hypervisors support. - - - Adds additional fields to networks - - - Adds ability for admins to delete quota - and optionally force the update Quota command. - - - - Allow the user to specify the image to use for rescue. - - - Extended services support. - - - Extended services deletion support. - - - Show hypervisor status. - - - Extended Volumes support. - - - Fixed IPs support. - - - Flavor access support. - - - Instance type (flavor) extra specs. - - - Flavor create/delete API support. - - - Support to show the rxtx status of a flavor. - - - Support to show the swap status of a flavor. - - - Floating IP DNS support. - - - Floating IPs support. - - - Floating IPs support. - - - Bulk handling of Floating IPs. - - - Fping Management Extension. - - - Support hiding server addresses in certain states. - - - Admin-only host administration. - - - Admin-only hypervisor administration. - - - View a log of actions and events taken on an instance. - - - Admin-only Task Log Monitoring. - - - Keypair Support. - - - Provide data on migrations. - - - Allow multiple create in the Create Server v1.1 API. - - - Admin-only Network Management Extension. - - - Network association support. - - - Allow preservation of the ephemeral partition on rebuild. - - - Quota classes management support. - - - Quotas management support. - - - Instance rescue mode. - - - Default rules for security group support. - - - Security group support. - - - Allow Admins to view server diagnostics through server action. - - - Server External Event Triggers. - - - Server group support. - - - Adds quota support to server groups. - - - Allow to filter the servers by a set of status values. - - - Server password support. - - - Start/Stop instance compute API support. - - - Services support. - - - Instance shelve mode. - - - Simple tenant usage extension. - - - Tenant-based Network Management Extension. - - - Provide data on limited resources that are being used. - - - Provide data to admin on limited resources used by other tenants. - - - Add user_data to the Create Server v1.1 API. - - - Project user quota support. - - - Virtual interface support. - - - Support for updating a volume attachment. - - - Volumes support. - - - Add sorting support in get Server v2 API. - - diff --git a/doc/api_samples/all_extensions/flavor-get-resp.xml b/doc/api_samples/all_extensions/flavor-get-resp.xml deleted file mode 100644 index 53f870ec4d..0000000000 --- a/doc/api_samples/all_extensions/flavor-get-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/doc/api_samples/all_extensions/flavors-list-resp.xml b/doc/api_samples/all_extensions/flavors-list-resp.xml deleted file mode 100644 index 435f96be56..0000000000 --- a/doc/api_samples/all_extensions/flavors-list-resp.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-changepassword.xml b/doc/api_samples/all_extensions/server-action-changepassword.xml deleted file mode 100644 index 4326e01617..0000000000 --- a/doc/api_samples/all_extensions/server-action-changepassword.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-confirmresize.xml b/doc/api_samples/all_extensions/server-action-confirmresize.xml deleted file mode 100644 index ffad7f16ae..0000000000 --- a/doc/api_samples/all_extensions/server-action-confirmresize.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-createimage.xml b/doc/api_samples/all_extensions/server-action-createimage.xml deleted file mode 100644 index faa6ae7660..0000000000 --- a/doc/api_samples/all_extensions/server-action-createimage.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - foobar - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-reboot.xml b/doc/api_samples/all_extensions/server-action-reboot.xml deleted file mode 100644 index b36d35801f..0000000000 --- a/doc/api_samples/all_extensions/server-action-reboot.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-rebuild-resp.xml b/doc/api_samples/all_extensions/server-action-rebuild-resp.xml deleted file mode 100644 index c183f9e696..0000000000 --- a/doc/api_samples/all_extensions/server-action-rebuild-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-rebuild.xml b/doc/api_samples/all_extensions/server-action-rebuild.xml deleted file mode 100644 index d39b9d8a38..0000000000 --- a/doc/api_samples/all_extensions/server-action-rebuild.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-resize.xml b/doc/api_samples/all_extensions/server-action-resize.xml deleted file mode 100644 index 8dfb53c6a8..0000000000 --- a/doc/api_samples/all_extensions/server-action-resize.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-revertresize.xml b/doc/api_samples/all_extensions/server-action-revertresize.xml deleted file mode 100644 index 7981753e75..0000000000 --- a/doc/api_samples/all_extensions/server-action-revertresize.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-get-resp.xml b/doc/api_samples/all_extensions/server-get-resp.xml deleted file mode 100644 index 42fd2dd8cd..0000000000 --- a/doc/api_samples/all_extensions/server-get-resp.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-post-req.xml b/doc/api_samples/all_extensions/server-post-req.xml deleted file mode 100644 index 2dbbb4438d..0000000000 --- a/doc/api_samples/all_extensions/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/doc/api_samples/all_extensions/server-post-resp.xml b/doc/api_samples/all_extensions/server-post-resp.xml deleted file mode 100644 index 1754dc7005..0000000000 --- a/doc/api_samples/all_extensions/server-post-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/servers-details-resp.xml b/doc/api_samples/all_extensions/servers-details-resp.xml deleted file mode 100644 index e58aa25808..0000000000 --- a/doc/api_samples/all_extensions/servers-details-resp.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/all_extensions/servers-list-resp.xml b/doc/api_samples/all_extensions/servers-list-resp.xml deleted file mode 100644 index 34e7d90f82..0000000000 --- a/doc/api_samples/all_extensions/servers-list-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/flavor-get-resp.xml b/doc/api_samples/flavor-get-resp.xml deleted file mode 100644 index 1101fdb56b..0000000000 --- a/doc/api_samples/flavor-get-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/doc/api_samples/flavors-list-resp.xml b/doc/api_samples/flavors-list-resp.xml deleted file mode 100644 index 435f96be56..0000000000 --- a/doc/api_samples/flavors-list-resp.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/image-get-resp.xml b/doc/api_samples/image-get-resp.xml deleted file mode 100644 index 09ac3e1508..0000000000 --- a/doc/api_samples/image-get-resp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - nokernel - True - nokernel - x86_64 - - - - - diff --git a/doc/api_samples/image-meta-key-get.xml b/doc/api_samples/image-meta-key-get.xml deleted file mode 100644 index 1de6b40781..0000000000 --- a/doc/api_samples/image-meta-key-get.xml +++ /dev/null @@ -1,2 +0,0 @@ - -nokernel \ No newline at end of file diff --git a/doc/api_samples/image-meta-key-put-req.xml b/doc/api_samples/image-meta-key-put-req.xml deleted file mode 100644 index 23a6f47182..0000000000 --- a/doc/api_samples/image-meta-key-put-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - -False \ No newline at end of file diff --git a/doc/api_samples/image-meta-key-put-resp.xml b/doc/api_samples/image-meta-key-put-resp.xml deleted file mode 100644 index c989c38a2d..0000000000 --- a/doc/api_samples/image-meta-key-put-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -False \ No newline at end of file diff --git a/doc/api_samples/image-metadata-get-resp.xml b/doc/api_samples/image-metadata-get-resp.xml deleted file mode 100644 index 8409016bf4..0000000000 --- a/doc/api_samples/image-metadata-get-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - nokernel - True - nokernel - x86_64 - \ No newline at end of file diff --git a/doc/api_samples/image-metadata-post-req.xml b/doc/api_samples/image-metadata-post-req.xml deleted file mode 100644 index db1b74572c..0000000000 --- a/doc/api_samples/image-metadata-post-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - False - UpdatedImage - \ No newline at end of file diff --git a/doc/api_samples/image-metadata-post-resp.xml b/doc/api_samples/image-metadata-post-resp.xml deleted file mode 100644 index 1d96bd9af5..0000000000 --- a/doc/api_samples/image-metadata-post-resp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - False - nokernel - UpdatedImage - x86_64 - True - \ No newline at end of file diff --git a/doc/api_samples/image-metadata-put-req.xml b/doc/api_samples/image-metadata-put-req.xml deleted file mode 100644 index 454d9294f8..0000000000 --- a/doc/api_samples/image-metadata-put-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - True - Changed - \ No newline at end of file diff --git a/doc/api_samples/image-metadata-put-resp.xml b/doc/api_samples/image-metadata-put-resp.xml deleted file mode 100644 index 7011871cc9..0000000000 --- a/doc/api_samples/image-metadata-put-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - True - Changed - \ No newline at end of file diff --git a/doc/api_samples/images-details-get-resp.xml b/doc/api_samples/images-details-get-resp.xml deleted file mode 100644 index 22c533cbd5..0000000000 --- a/doc/api_samples/images-details-get-resp.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - nokernel - True - nokernel - x86_64 - - - - - - - - nokernel - nokernel - x86_64 - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - False - nokernel - x86_64 - - - - - - - - 155d900f-4e14-4e4c-a73d-069cbf4541e6 - None - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - nokernel - - - - - - diff --git a/doc/api_samples/images-details-resp.xml b/doc/api_samples/images-details-resp.xml deleted file mode 100644 index 654251a33f..0000000000 --- a/doc/api_samples/images-details-resp.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - nokernel - True - nokernel - x86_64 - - - - - - - - nokernel - nokernel - x86_64 - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - False - nokernel - x86_64 - - - - - - - - 155d900f-4e14-4e4c-a73d-069cbf4541e6 - None - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - nokernel - - - - - - \ No newline at end of file diff --git a/doc/api_samples/images-list-get-resp.xml b/doc/api_samples/images-list-get-resp.xml deleted file mode 100644 index 685345739b..0000000000 --- a/doc/api_samples/images-list-get-resp.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/images-list-resp.xml b/doc/api_samples/images-list-resp.xml deleted file mode 100644 index 0674afb09a..0000000000 --- a/doc/api_samples/images-list-resp.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/limit-get-resp.xml b/doc/api_samples/limit-get-resp.xml deleted file mode 100644 index 02c96ed782..0000000000 --- a/doc/api_samples/limit-get-resp.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/os-admin-actions/admin-actions-backup-server.xml b/doc/api_samples/os-admin-actions/admin-actions-backup-server.xml deleted file mode 100644 index 0acb176951..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-backup-server.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Backup 1 - daily - 1 - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-inject-network-info.xml b/doc/api_samples/os-admin-actions/admin-actions-inject-network-info.xml deleted file mode 100644 index 6091a5ed7b..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-inject-network-info.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-live-migrate.xml b/doc/api_samples/os-admin-actions/admin-actions-live-migrate.xml deleted file mode 100644 index 35269d76e3..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-live-migrate.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 6217bf142bb3491995f966af999f9f23 - false - false - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-lock-server.xml b/doc/api_samples/os-admin-actions/admin-actions-lock-server.xml deleted file mode 100644 index 943691c746..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-lock-server.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-migrate.xml b/doc/api_samples/os-admin-actions/admin-actions-migrate.xml deleted file mode 100644 index c686d9e19d..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-migrate.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-pause.xml b/doc/api_samples/os-admin-actions/admin-actions-pause.xml deleted file mode 100644 index 6a61bc26b3..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-pause.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-reset-network.xml b/doc/api_samples/os-admin-actions/admin-actions-reset-network.xml deleted file mode 100644 index d800b3decf..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-reset-network.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-reset-server-state.xml b/doc/api_samples/os-admin-actions/admin-actions-reset-server-state.xml deleted file mode 100644 index 976be070d5..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-reset-server-state.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - active - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-reset-state.xml b/doc/api_samples/os-admin-actions/admin-actions-reset-state.xml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/doc/api_samples/os-admin-actions/admin-actions-resume.xml b/doc/api_samples/os-admin-actions/admin-actions-resume.xml deleted file mode 100644 index d53370e158..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-resume.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-suspend.xml b/doc/api_samples/os-admin-actions/admin-actions-suspend.xml deleted file mode 100644 index 1da7328b51..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-suspend.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-unlock-server.xml b/doc/api_samples/os-admin-actions/admin-actions-unlock-server.xml deleted file mode 100644 index 5c59e3a577..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-unlock-server.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-unpause.xml b/doc/api_samples/os-admin-actions/admin-actions-unpause.xml deleted file mode 100644 index 1c3b538c13..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-unpause.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/server-post-req.xml b/doc/api_samples/os-admin-actions/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-admin-actions/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/server-post-resp.xml b/doc/api_samples/os-admin-actions/server-post-resp.xml deleted file mode 100644 index 06f00f80e4..0000000000 --- a/doc/api_samples/os-admin-actions/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-agents/agent-post-req.xml b/doc/api_samples/os-agents/agent-post-req.xml deleted file mode 100644 index b7b7d036ba..0000000000 --- a/doc/api_samples/os-agents/agent-post-req.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - hypervisor - os - x86 - 8.0 - add6bb58e139be103324d04d82d8f545 - http://example.com/path/to/resource - diff --git a/doc/api_samples/os-agents/agent-post-resp.xml b/doc/api_samples/os-agents/agent-post-resp.xml deleted file mode 100644 index abfe15f909..0000000000 --- a/doc/api_samples/os-agents/agent-post-resp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - http://example.com/path/to/resource - hypervisor - add6bb58e139be103324d04d82d8f545 - 8.0 - x86 - os - 1 - diff --git a/doc/api_samples/os-agents/agent-update-put-req.xml b/doc/api_samples/os-agents/agent-update-put-req.xml deleted file mode 100644 index 9a25cefdda..0000000000 --- a/doc/api_samples/os-agents/agent-update-put-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 7.0 - http://example.com/path/to/resource - add6bb58e139be103324d04d82d8f545 - diff --git a/doc/api_samples/os-agents/agent-update-put-resp.xml b/doc/api_samples/os-agents/agent-update-put-resp.xml deleted file mode 100644 index ce62db3868..0000000000 --- a/doc/api_samples/os-agents/agent-update-put-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - http://example.com/path/to/resource - 7.0 - 1 - add6bb58e139be103324d04d82d8f545 - diff --git a/doc/api_samples/os-agents/agents-get-resp.xml b/doc/api_samples/os-agents/agents-get-resp.xml deleted file mode 100644 index d804245305..0000000000 --- a/doc/api_samples/os-agents/agents-get-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - 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 5f48f043d2..0000000000 --- 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 d9b935fd45..0000000000 --- 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 d25f5f848c..0000000000 --- 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 544271bdc8..0000000000 --- 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 87e5d64f9a..0000000000 --- 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 1eb9c38fdb..0000000000 --- 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 25227669be..0000000000 --- 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 ad11f38597..0000000000 --- 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 431e59cf45..0000000000 --- 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 8d92e14664..0000000000 --- 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 5e2193d064..0000000000 --- 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 33dce28384..0000000000 --- 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/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml b/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml deleted file mode 100644 index 925dbf2f1e..0000000000 --- a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - 521752a6-acf6-4b2d-bc7a-119f9148cd8c - - 421752a6-acf6-4b2d-bc7a-119f9148cd8c - qcow2 - new_file_name - - diff --git a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml b/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml deleted file mode 100644 index 419d6d4066..0000000000 --- a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml b/doc/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml deleted file mode 100644 index bd3f242653..0000000000 --- a/doc/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - ce531f90-199f-48c0-816c-13e38010b442 - \ No newline at end of file diff --git a/doc/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml b/doc/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml deleted file mode 100644 index 4b32543717..0000000000 --- a/doc/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - 3cb9bc59-5699-4588-a4b1-b87f96708bc6 - ce531f90-199f-48c0-816c-13e38010b442 - - - f8a6e8f8-c2ec-497c-9f23-da9616de54ef - 192.168.1.3 - - - ACTIVE - fa:16:3e:4c:2c:30 - \ No newline at end of file diff --git a/doc/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml b/doc/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml deleted file mode 100644 index f1bef407cc..0000000000 --- a/doc/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - ACTIVE - - - f8a6e8f8-c2ec-497c-9f23-da9616de54ef - 192.168.1.3 - - - ce531f90-199f-48c0-816c-13e38010b442 - 3cb9bc59-5699-4588-a4b1-b87f96708bc6 - fa:16:3e:4c:2c:30 - - \ No newline at end of file diff --git a/doc/api_samples/os-attach-interfaces/attach-interfaces-list.xml b/doc/api_samples/os-attach-interfaces/attach-interfaces-list.xml deleted file mode 100644 index 3392e2cc65..0000000000 --- a/doc/api_samples/os-attach-interfaces/attach-interfaces-list.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ACTIVE - - - f8a6e8f8-c2ec-497c-9f23-da9616de54ef - 192.168.1.3 - - - ce531f90-199f-48c0-816c-13e38010b442 - 3cb9bc59-5699-4588-a4b1-b87f96708bc6 - fa:16:3e:4c:2c:30 - - - diff --git a/doc/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml b/doc/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml deleted file mode 100644 index ce3e2fec29..0000000000 --- a/doc/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - ACTIVE - - - b6e47749-6bf0-4d6e-ae4b-ba6b5e238510 - 192.168.123.131 - - - 89e64f2e-86bd-4c19-9155-4548b36fdcb2 - a9efd207-2c1a-4cdd-a296-d3c7c3211302 - fa:16:3e:a4:1c:12 - diff --git a/doc/api_samples/os-attach-interfaces/server-post-req.xml b/doc/api_samples/os-attach-interfaces/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-attach-interfaces/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-attach-interfaces/server-post-resp.xml b/doc/api_samples/os-attach-interfaces/server-post-resp.xml deleted file mode 100644 index 0efd9029d5..0000000000 --- a/doc/api_samples/os-attach-interfaces/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-availability-zone/availability-zone-post-req.xml b/doc/api_samples/os-availability-zone/availability-zone-post-req.xml deleted file mode 100644 index cbecd35225..0000000000 --- a/doc/api_samples/os-availability-zone/availability-zone-post-req.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-availability-zone/availability-zone-post-resp.xml b/doc/api_samples/os-availability-zone/availability-zone-post-resp.xml deleted file mode 100644 index e89bd74eba..0000000000 --- a/doc/api_samples/os-availability-zone/availability-zone-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.xml deleted file mode 100644 index 63ca9c21e7..0000000000 --- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.xml deleted file mode 100644 index 1da1dd2840..0000000000 --- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-req.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-req.xml deleted file mode 100644 index 5a910e3f92..0000000000 --- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-req.xml +++ /dev/null @@ -1,10 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.xml deleted file mode 100644 index a8b135a7f5..0000000000 --- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.xml deleted file mode 100644 index 3cbc3ea8a1..0000000000 --- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.xml +++ /dev/null @@ -1,11 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.xml deleted file mode 100644 index 9ae9c30374..0000000000 --- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.xml deleted file mode 100644 index 5c4558e969..0000000000 --- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.xml deleted file mode 100644 index 6457b059bd..0000000000 --- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.xml deleted file mode 100644 index 542c755b28..0000000000 --- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-req.xml deleted file mode 100644 index 63ca9c21e7..0000000000 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-resp.xml deleted file mode 100644 index 1da1dd2840..0000000000 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml deleted file mode 100644 index a06b8d73fe..0000000000 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml +++ /dev/null @@ -1,10 +0,0 @@ - - diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml deleted file mode 100644 index 6a0b3a2666..0000000000 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml deleted file mode 100644 index 8065c41c1d..0000000000 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml deleted file mode 100644 index 1432629ede..0000000000 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml deleted file mode 100644 index 2afc47f67e..0000000000 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-remove-interface-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-remove-interface-req.xml deleted file mode 100644 index 6457b059bd..0000000000 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-remove-interface-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml deleted file mode 100644 index 438ee5921a..0000000000 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml b/doc/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml deleted file mode 100644 index fa791f6ad3..0000000000 --- a/doc/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml b/doc/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml deleted file mode 100644 index 5b4c8bf594..0000000000 --- a/doc/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-cell-capacities/cells-capacities-resp.xml b/doc/api_samples/os-cell-capacities/cells-capacities-resp.xml deleted file mode 100644 index 63672b00bd..0000000000 --- a/doc/api_samples/os-cell-capacities/cells-capacities-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/os-cells/cells-get-resp.xml b/doc/api_samples/os-cells/cells-get-resp.xml deleted file mode 100644 index 12256a5bdc..0000000000 --- a/doc/api_samples/os-cells/cells-get-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-cells/cells-list-empty-resp.xml b/doc/api_samples/os-cells/cells-list-empty-resp.xml deleted file mode 100644 index 6ac77b4bd8..0000000000 --- a/doc/api_samples/os-cells/cells-list-empty-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-cells/cells-list-resp.xml b/doc/api_samples/os-cells/cells-list-resp.xml deleted file mode 100644 index 7d697bb918..0000000000 --- a/doc/api_samples/os-cells/cells-list-resp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-certificates/certificate-create-req.xml b/doc/api_samples/os-certificates/certificate-create-req.xml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/doc/api_samples/os-certificates/certificate-create-resp.xml b/doc/api_samples/os-certificates/certificate-create-resp.xml deleted file mode 100644 index 07c535b55d..0000000000 --- a/doc/api_samples/os-certificates/certificate-create-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-certificates/certificate-get-root-resp.xml b/doc/api_samples/os-certificates/certificate-get-root-resp.xml deleted file mode 100644 index 4d7cd96982..0000000000 --- a/doc/api_samples/os-certificates/certificate-get-root-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml b/doc/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml deleted file mode 100644 index 253b0426a8..0000000000 --- a/doc/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 192.168.1.1 - 2000 - \ No newline at end of file diff --git a/doc/api_samples/os-cloudpipe/cloud-pipe-create-req.xml b/doc/api_samples/os-cloudpipe/cloud-pipe-create-req.xml deleted file mode 100644 index e80a9113dc..0000000000 --- a/doc/api_samples/os-cloudpipe/cloud-pipe-create-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/doc/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml b/doc/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml deleted file mode 100644 index fafa90a3be..0000000000 --- a/doc/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 1a17f615-343b-430f-976a-457c029eddb7 - \ No newline at end of file diff --git a/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml b/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml deleted file mode 100644 index 6981aa5bd7..0000000000 --- a/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - 127.0.0.1 - 2012-09-25T18:18:49Z - 22 - down - 1a17f615-343b-430f-976a-457c029eddb7 - 192.168.0.3 - cloudpipe-6405f2ca-caf9-493b-a1f6-e55f595d75ab - - \ No newline at end of file diff --git a/doc/api_samples/os-config-drive/server-config-drive-get-resp.xml b/doc/api_samples/os-config-drive/server-config-drive-get-resp.xml deleted file mode 100644 index 6bb4c5e7c1..0000000000 --- a/doc/api_samples/os-config-drive/server-config-drive-get-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-config-drive/server-post-req.xml b/doc/api_samples/os-config-drive/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-config-drive/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-config-drive/server-post-resp.xml b/doc/api_samples/os-config-drive/server-post-resp.xml deleted file mode 100644 index 3cbb199ce3..0000000000 --- a/doc/api_samples/os-config-drive/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-config-drive/servers-config-drive-details-resp.xml b/doc/api_samples/os-config-drive/servers-config-drive-details-resp.xml deleted file mode 100644 index 6de687a91a..0000000000 --- a/doc/api_samples/os-config-drive/servers-config-drive-details-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml b/doc/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml deleted file mode 100644 index 18ab81e4c3..0000000000 --- a/doc/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - b48316c5-71e8-45e4-9884-6c78055b9b13 - localhost - 5900 - 51af38c3-555e-4884-a314-6c8cdde37444 - diff --git a/doc/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml b/doc/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml deleted file mode 100644 index 16cf28832d..0000000000 --- a/doc/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-console-auth-tokens/server-post-req.xml b/doc/api_samples/os-console-auth-tokens/server-post-req.xml deleted file mode 100644 index 077dd7618c..0000000000 --- a/doc/api_samples/os-console-auth-tokens/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/doc/api_samples/os-console-auth-tokens/server-post-resp.xml b/doc/api_samples/os-console-auth-tokens/server-post-resp.xml deleted file mode 100644 index 68f0933c77..0000000000 --- a/doc/api_samples/os-console-auth-tokens/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/api_samples/os-console-output/console-output-post-req.xml b/doc/api_samples/os-console-output/console-output-post-req.xml deleted file mode 100644 index 9024061fcf..0000000000 --- a/doc/api_samples/os-console-output/console-output-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-console-output/console-output-post-resp.xml b/doc/api_samples/os-console-output/console-output-post-resp.xml deleted file mode 100644 index 9c5bad625f..0000000000 --- a/doc/api_samples/os-console-output/console-output-post-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - -FAKE CONSOLE OUTPUT -ANOTHER -LAST LINE \ No newline at end of file diff --git a/doc/api_samples/os-console-output/server-post-req.xml b/doc/api_samples/os-console-output/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-console-output/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-console-output/server-post-resp.xml b/doc/api_samples/os-console-output/server-post-resp.xml deleted file mode 100644 index 0efd9029d5..0000000000 --- a/doc/api_samples/os-console-output/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-consoles/get-rdp-console-post-req.xml b/doc/api_samples/os-consoles/get-rdp-console-post-req.xml deleted file mode 100644 index 16cf28832d..0000000000 --- a/doc/api_samples/os-consoles/get-rdp-console-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-consoles/get-rdp-console-post-resp.xml b/doc/api_samples/os-consoles/get-rdp-console-post-resp.xml deleted file mode 100644 index 6c45d6e269..0000000000 --- a/doc/api_samples/os-consoles/get-rdp-console-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - rdp-html5 - http://example.com:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3 - diff --git a/doc/api_samples/os-consoles/get-serial-console-post-req.xml b/doc/api_samples/os-consoles/get-serial-console-post-req.xml deleted file mode 100644 index 15c423c930..0000000000 --- a/doc/api_samples/os-consoles/get-serial-console-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-consoles/get-serial-console-post-resp.xml b/doc/api_samples/os-consoles/get-serial-console-post-resp.xml deleted file mode 100644 index 7216750b5f..0000000000 --- a/doc/api_samples/os-consoles/get-serial-console-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - serial - ws://127.0.0.1:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3 - diff --git a/doc/api_samples/os-consoles/get-spice-console-post-req.xml b/doc/api_samples/os-consoles/get-spice-console-post-req.xml deleted file mode 100644 index 59052abea2..0000000000 --- a/doc/api_samples/os-consoles/get-spice-console-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-consoles/get-spice-console-post-resp.xml b/doc/api_samples/os-consoles/get-spice-console-post-resp.xml deleted file mode 100644 index 113b982afd..0000000000 --- a/doc/api_samples/os-consoles/get-spice-console-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - spice-html5 - http://example.com:6082/spice_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3 - diff --git a/doc/api_samples/os-consoles/get-vnc-console-post-req.xml b/doc/api_samples/os-consoles/get-vnc-console-post-req.xml deleted file mode 100644 index 00f32c6b92..0000000000 --- a/doc/api_samples/os-consoles/get-vnc-console-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-consoles/get-vnc-console-post-resp.xml b/doc/api_samples/os-consoles/get-vnc-console-post-resp.xml deleted file mode 100644 index 3c7e0c4a38..0000000000 --- a/doc/api_samples/os-consoles/get-vnc-console-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - novnc - http://example.com:6080/vnc_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3 - diff --git a/doc/api_samples/os-consoles/server-post-req.xml b/doc/api_samples/os-consoles/server-post-req.xml deleted file mode 100644 index 077dd7618c..0000000000 --- a/doc/api_samples/os-consoles/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/doc/api_samples/os-consoles/server-post-resp.xml b/doc/api_samples/os-consoles/server-post-resp.xml deleted file mode 100644 index 68f0933c77..0000000000 --- a/doc/api_samples/os-consoles/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/api_samples/os-deferred-delete/force-delete-post-req.xml b/doc/api_samples/os-deferred-delete/force-delete-post-req.xml deleted file mode 100644 index ab3477c9c0..0000000000 --- a/doc/api_samples/os-deferred-delete/force-delete-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-deferred-delete/restore-post-req.xml b/doc/api_samples/os-deferred-delete/restore-post-req.xml deleted file mode 100644 index a43bef2f54..0000000000 --- a/doc/api_samples/os-deferred-delete/restore-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-deferred-delete/server-post-req.xml b/doc/api_samples/os-deferred-delete/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-deferred-delete/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-deferred-delete/server-post-resp.xml b/doc/api_samples/os-deferred-delete/server-post-resp.xml deleted file mode 100644 index 1562cf7165..0000000000 --- a/doc/api_samples/os-deferred-delete/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-evacuate/server-evacuate-req.xml b/doc/api_samples/os-evacuate/server-evacuate-req.xml deleted file mode 100644 index d9f4824b7c..0000000000 --- a/doc/api_samples/os-evacuate/server-evacuate-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/doc/api_samples/os-evacuate/server-evacuate-resp.xml b/doc/api_samples/os-evacuate/server-evacuate-resp.xml deleted file mode 100644 index 5823886702..0000000000 --- a/doc/api_samples/os-evacuate/server-evacuate-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -MySecretPass \ No newline at end of file diff --git a/doc/api_samples/os-evacuate/server-post-req.xml b/doc/api_samples/os-evacuate/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-evacuate/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-evacuate/server-post-resp.xml b/doc/api_samples/os-evacuate/server-post-resp.xml deleted file mode 100644 index 3a31871ba9..0000000000 --- a/doc/api_samples/os-evacuate/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml b/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml deleted file mode 100644 index 4faf14a785..0000000000 --- a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml b/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml deleted file mode 100644 index 5823886702..0000000000 --- a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -MySecretPass \ No newline at end of file diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-post-req.xml b/doc/api_samples/os-extended-evacuate-find-host/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-extended-evacuate-find-host/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-post-resp.xml b/doc/api_samples/os-extended-evacuate-find-host/server-post-resp.xml deleted file mode 100644 index ad40d9e731..0000000000 --- a/doc/api_samples/os-extended-evacuate-find-host/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml b/doc/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-create-req.xml b/doc/api_samples/os-extended-floating-ips/floating-ips-create-req.xml deleted file mode 100644 index f77525e749..0000000000 --- a/doc/api_samples/os-extended-floating-ips/floating-ips-create-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - -nova \ No newline at end of file diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml b/doc/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml deleted file mode 100644 index e0f68ef503..0000000000 --- a/doc/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml b/doc/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml deleted file mode 100644 index da6f0d4ce9..0000000000 --- a/doc/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml b/doc/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml deleted file mode 100644 index 78348be553..0000000000 --- a/doc/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml b/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml deleted file mode 100644 index 4fd6ea8f9e..0000000000 --- a/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/doc/api_samples/os-extended-networks/network-create-req.xml b/doc/api_samples/os-extended-networks/network-create-req.xml deleted file mode 100644 index 3cc79bd837..0000000000 --- a/doc/api_samples/os-extended-networks/network-create-req.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - 10.20.105.0/24 - 9000 - 10.20.105.2 - False - True - 10.20.105.10 - 10.20.105.200 - diff --git a/doc/api_samples/os-extended-networks/network-create-resp.xml b/doc/api_samples/os-extended-networks/network-create-resp.xml deleted file mode 100644 index 9f16171ed7..0000000000 --- a/doc/api_samples/os-extended-networks/network-create-resp.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - None - None - 10.20.105.2 - None - True - None - a931ead3-4c5c-4b85-a90e-b248ffa71134 - None - None - 10.20.105.1 - None - - None - None - None - False - None - 10.20.105.255 - 255.255.255.0 - None - 10.20.105.0/24 - None - None - False - None - None - None - 9000 - None - None - 10.20.105.2 - None - \ No newline at end of file diff --git a/doc/api_samples/os-extended-networks/network-show-resp.xml b/doc/api_samples/os-extended-networks/network-show-resp.xml deleted file mode 100644 index 2f3176fbc3..0000000000 --- a/doc/api_samples/os-extended-networks/network-show-resp.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - br100 - 1000 - 10.0.0.3 - eth0 - False - 2011-08-16 09:26:13.048257 - 20c8acc0-f747-4d71-a389-46d078ebf047 - None - None - 10.0.0.1 - None - - None - 1234 - 10.0.0.2 - False - 100 - 10.0.0.7 - 255.255.255.248 - False - 10.0.0.0/29 - 127.0.0.1 - False - True - None - 2011-08-15 06:19:19.387525 - nsokolov-desktop - None - None - None - 10.0.0.1 - None - \ No newline at end of file diff --git a/doc/api_samples/os-extended-networks/networks-list-resp.xml b/doc/api_samples/os-extended-networks/networks-list-resp.xml deleted file mode 100644 index b3b6e8885f..0000000000 --- a/doc/api_samples/os-extended-networks/networks-list-resp.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - br100 - 1000 - 10.0.0.3 - eth0 - False - 2011-08-16 09:26:13.048257 - 20c8acc0-f747-4d71-a389-46d078ebf047 - None - None - 10.0.0.1 - None - - None - 1234 - 10.0.0.2 - False - 100 - 10.0.0.7 - 255.255.255.248 - False - 10.0.0.0/29 - 127.0.0.1 - False - True - None - 2011-08-15 06:19:19.387525 - nsokolov-desktop - None - None - None - 10.0.0.1 - None - - - br101 - 1001 - 10.0.0.11 - eth0 - False - None - 20c8acc0-f747-4d71-a389-46d078ebf000 - None - None - 10.0.0.9 - None - - None - None - 10.0.0.10 - False - 101 - 10.0.0.15 - 255.255.255.248 - False - 10.0.0.10/29 - None - False - True - None - 2011-08-15 06:19:19.885495 - None - None - None - None - 10.0.0.9 - None - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-quotas/quotas-update-post-req.xml b/doc/api_samples/os-extended-quotas/quotas-update-post-req.xml deleted file mode 100644 index 499b890f03..0000000000 --- a/doc/api_samples/os-extended-quotas/quotas-update-post-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - True - 45 - \ No newline at end of file diff --git a/doc/api_samples/os-extended-quotas/quotas-update-post-resp.xml b/doc/api_samples/os-extended-quotas/quotas-update-post-resp.xml deleted file mode 100644 index cd1b80ba0f..0000000000 --- a/doc/api_samples/os-extended-quotas/quotas-update-post-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 45 - 100 - 128 - 51200 - 20 - 10 - diff --git a/doc/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml b/doc/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml deleted file mode 100644 index b0da738c4c..0000000000 --- a/doc/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-rescue-with-image/server-post-req.xml b/doc/api_samples/os-extended-rescue-with-image/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-extended-rescue-with-image/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-rescue-with-image/server-post-resp.xml b/doc/api_samples/os-extended-rescue-with-image/server-post-resp.xml deleted file mode 100644 index 3a31871ba9..0000000000 --- a/doc/api_samples/os-extended-rescue-with-image/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-rescue-with-image/server-rescue-req.xml b/doc/api_samples/os-extended-rescue-with-image/server-rescue-req.xml deleted file mode 100644 index 7372633729..0000000000 --- a/doc/api_samples/os-extended-rescue-with-image/server-rescue-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-rescue-with-image/server-rescue.xml b/doc/api_samples/os-extended-rescue-with-image/server-rescue.xml deleted file mode 100644 index 5823886702..0000000000 --- a/doc/api_samples/os-extended-rescue-with-image/server-rescue.xml +++ /dev/null @@ -1,2 +0,0 @@ - -MySecretPass \ No newline at end of file diff --git a/doc/api_samples/os-extended-services-delete/services-get-resp.xml b/doc/api_samples/os-extended-services-delete/services-get-resp.xml deleted file mode 100644 index b5182a38be..0000000000 --- a/doc/api_samples/os-extended-services-delete/services-get-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/api_samples/os-extended-volumes/server-get-resp.xml b/doc/api_samples/os-extended-volumes/server-get-resp.xml deleted file mode 100644 index ea839a2af3..0000000000 --- a/doc/api_samples/os-extended-volumes/server-get-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-extended-volumes/server-post-req.xml b/doc/api_samples/os-extended-volumes/server-post-req.xml deleted file mode 100644 index 077dd7618c..0000000000 --- a/doc/api_samples/os-extended-volumes/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/doc/api_samples/os-extended-volumes/server-post-resp.xml b/doc/api_samples/os-extended-volumes/server-post-resp.xml deleted file mode 100644 index 68f0933c77..0000000000 --- a/doc/api_samples/os-extended-volumes/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/api_samples/os-extended-volumes/servers-detail-resp.xml b/doc/api_samples/os-extended-volumes/servers-detail-resp.xml deleted file mode 100644 index e95c17b44d..0000000000 --- a/doc/api_samples/os-extended-volumes/servers-detail-resp.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-fixed-ips/fixedip-post-req.xml b/doc/api_samples/os-fixed-ips/fixedip-post-req.xml deleted file mode 100644 index e29b685be2..0000000000 --- a/doc/api_samples/os-fixed-ips/fixedip-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - -None \ No newline at end of file diff --git a/doc/api_samples/os-fixed-ips/fixedips-get-resp.xml b/doc/api_samples/os-fixed-ips/fixedips-get-resp.xml deleted file mode 100644 index a9676721f3..0000000000 --- a/doc/api_samples/os-fixed-ips/fixedips-get-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - 192.168.1.0/24 - openstack - host -
192.168.1.1
- \ No newline at end of file diff --git a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml deleted file mode 100644 index ab9ec8ba70..0000000000 --- a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - fake_tenant - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml deleted file mode 100644 index 1e55ad2f95..0000000000 --- a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-access/flavor-access-create-req.xml b/doc/api_samples/os-flavor-access/flavor-access-create-req.xml deleted file mode 100644 index 81256cf256..0000000000 --- a/doc/api_samples/os-flavor-access/flavor-access-create-req.xml +++ /dev/null @@ -1,10 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-access/flavor-access-create-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-create-resp.xml deleted file mode 100644 index 5c40d3aeaa..0000000000 --- a/doc/api_samples/os-flavor-access/flavor-access-create-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml deleted file mode 100644 index 3099fa98f8..0000000000 --- a/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml deleted file mode 100644 index 1e55ad2f95..0000000000 --- a/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml deleted file mode 100644 index fc296c3022..0000000000 --- a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - fake_tenant - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml deleted file mode 100644 index 80d1ecc48c..0000000000 --- a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml deleted file mode 100644 index 3fa7f0c431..0000000000 --- a/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml deleted file mode 100644 index 95c1daab9f..0000000000 --- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - value1 - value2 - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml deleted file mode 100644 index 06b01a9fca..0000000000 --- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - value2 - value1 - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml deleted file mode 100644 index d57579ba64..0000000000 --- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -value1 \ No newline at end of file diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml deleted file mode 100644 index 06b01a9fca..0000000000 --- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - value2 - value1 - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml deleted file mode 100644 index b7ae6732b4..0000000000 --- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - new_value1 \ No newline at end of file diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml deleted file mode 100644 index 13208ad7c9..0000000000 --- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -new_value1 \ No newline at end of file diff --git a/doc/api_samples/os-flavor-manage/flavor-create-post-req.xml b/doc/api_samples/os-flavor-manage/flavor-create-post-req.xml deleted file mode 100644 index b90c108d0c..0000000000 --- a/doc/api_samples/os-flavor-manage/flavor-create-post-req.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - test_flavor - 1024 - 2 - 10 - 10 - diff --git a/doc/api_samples/os-flavor-manage/flavor-create-post-resp.xml b/doc/api_samples/os-flavor-manage/flavor-create-post-resp.xml deleted file mode 100644 index e213ddb311..0000000000 --- a/doc/api_samples/os-flavor-manage/flavor-create-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml deleted file mode 100644 index a07dfcfb99..0000000000 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml deleted file mode 100644 index c204e7cdfc..0000000000 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml deleted file mode 100644 index 7038e1b882..0000000000 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml +++ /dev/null @@ -1,9 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml deleted file mode 100644 index 8fb4f46be5..0000000000 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml b/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml deleted file mode 100644 index 2cf38aa6cd..0000000000 --- a/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml b/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml deleted file mode 100644 index d9a40dd962..0000000000 --- a/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-post-req.xml b/doc/api_samples/os-flavor-swap/flavor-swap-post-req.xml deleted file mode 100644 index b604f9bdf0..0000000000 --- a/doc/api_samples/os-flavor-swap/flavor-swap-post-req.xml +++ /dev/null @@ -1,9 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-post-resp.xml b/doc/api_samples/os-flavor-swap/flavor-swap-post-resp.xml deleted file mode 100644 index 7b779cf3f8..0000000000 --- a/doc/api_samples/os-flavor-swap/flavor-swap-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml deleted file mode 100644 index 36fa411207..0000000000 --- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 192.168.53.11 - A - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml deleted file mode 100644 index 25afe599a9..0000000000 --- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml deleted file mode 100644 index df12b61cf9..0000000000 --- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - domain1.example.org - public - project1 - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml deleted file mode 100644 index 8bdf42c41d..0000000000 --- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml deleted file mode 100644 index 441b977e69..0000000000 --- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml deleted file mode 100644 index 8d910e09bf..0000000000 --- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml deleted file mode 100644 index d874ef058f..0000000000 --- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml b/doc/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml deleted file mode 100644 index ca09fbf955..0000000000 --- a/doc/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml deleted file mode 100644 index 1fc7305090..0000000000 --- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - -192.168.1.0/24 -nova -eth0 - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml deleted file mode 100644 index db80bbfc10..0000000000 --- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - eth0 - 192.168.1.0/24 - nova - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml deleted file mode 100644 index c40f28dc34..0000000000 --- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - -192.168.1.0/24 \ No newline at end of file diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml deleted file mode 100644 index 3d77af334a..0000000000 --- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -192.168.1.0/24 \ No newline at end of file diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml deleted file mode 100644 index f8f78c8a23..0000000000 --- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - eth0 - None - None - None - nova -
10.10.10.3
- - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml deleted file mode 100644 index d632fe46fb..0000000000 --- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - eth0 - None - None - None - nova -
10.10.10.1
- - - eth0 - None - None - None - nova -
10.10.10.2
- - - eth0 - None - None - None - nova -
10.10.10.3
- - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml b/doc/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/doc/api_samples/os-floating-ips/floating-ips-create-req.xml b/doc/api_samples/os-floating-ips/floating-ips-create-req.xml deleted file mode 100644 index f77525e749..0000000000 --- a/doc/api_samples/os-floating-ips/floating-ips-create-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - -nova \ No newline at end of file diff --git a/doc/api_samples/os-floating-ips/floating-ips-create-resp.xml b/doc/api_samples/os-floating-ips/floating-ips-create-resp.xml deleted file mode 100644 index e0f68ef503..0000000000 --- a/doc/api_samples/os-floating-ips/floating-ips-create-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml b/doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml deleted file mode 100644 index da6f0d4ce9..0000000000 --- a/doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-floating-ips/floating-ips-list-resp.xml b/doc/api_samples/os-floating-ips/floating-ips-list-resp.xml deleted file mode 100644 index 78348be553..0000000000 --- a/doc/api_samples/os-floating-ips/floating-ips-list-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-fping/fping-get-details-resp.xml b/doc/api_samples/os-fping/fping-get-details-resp.xml deleted file mode 100644 index 5b3cb47852..0000000000 --- a/doc/api_samples/os-fping/fping-get-details-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - openstack - 69d3caab-ed51-4ee7-9d4b-941ee1b45484 - False - \ No newline at end of file diff --git a/doc/api_samples/os-fping/fping-get-resp.xml b/doc/api_samples/os-fping/fping-get-resp.xml deleted file mode 100644 index dbf03778b8..0000000000 --- a/doc/api_samples/os-fping/fping-get-resp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - openstack - 6a576ebe-8777-473a-ab95-8df34a50dedd - False - - \ No newline at end of file diff --git a/doc/api_samples/os-fping/server-post-req.xml b/doc/api_samples/os-fping/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-fping/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-fping/server-post-resp.xml b/doc/api_samples/os-fping/server-post-resp.xml deleted file mode 100644 index 7f84ac03df..0000000000 --- a/doc/api_samples/os-fping/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/server-get-resp.xml b/doc/api_samples/os-hide-server-addresses/server-get-resp.xml deleted file mode 100644 index caa4a2fa53..0000000000 --- a/doc/api_samples/os-hide-server-addresses/server-get-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/server-post-req.xml b/doc/api_samples/os-hide-server-addresses/server-post-req.xml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/doc/api_samples/os-hide-server-addresses/server-post-resp.xml b/doc/api_samples/os-hide-server-addresses/server-post-resp.xml deleted file mode 100644 index 446fe5a9cf..0000000000 --- a/doc/api_samples/os-hide-server-addresses/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml b/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml deleted file mode 100644 index 0296cc1673..0000000000 --- a/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/servers-list-resp.xml b/doc/api_samples/os-hide-server-addresses/servers-list-resp.xml deleted file mode 100644 index 3225a4c36b..0000000000 --- a/doc/api_samples/os-hide-server-addresses/servers-list-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-hosts/host-get-reboot.xml b/doc/api_samples/os-hosts/host-get-reboot.xml deleted file mode 100644 index 3b3fe27b50..0000000000 --- a/doc/api_samples/os-hosts/host-get-reboot.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-hosts/host-get-resp.xml b/doc/api_samples/os-hosts/host-get-resp.xml deleted file mode 100644 index 197812c875..0000000000 --- a/doc/api_samples/os-hosts/host-get-resp.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - (total) - 8192 - ecf3458ac6bf4a299cc2e0efa740f426 - 1 - 1028 - - - (used_now) - 512 - ecf3458ac6bf4a299cc2e0efa740f426 - 0 - 0 - - - (used_max) - 0 - ecf3458ac6bf4a299cc2e0efa740f426 - 0 - 0 - - \ No newline at end of file diff --git a/doc/api_samples/os-hosts/host-get-shutdown.xml b/doc/api_samples/os-hosts/host-get-shutdown.xml deleted file mode 100644 index 4f5f1a758b..0000000000 --- a/doc/api_samples/os-hosts/host-get-shutdown.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-hosts/host-get-startup.xml b/doc/api_samples/os-hosts/host-get-startup.xml deleted file mode 100644 index 8d6959946b..0000000000 --- a/doc/api_samples/os-hosts/host-get-startup.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-hosts/host-put-maintenance-req.xml b/doc/api_samples/os-hosts/host-put-maintenance-req.xml deleted file mode 100644 index 42b995b5d5..0000000000 --- a/doc/api_samples/os-hosts/host-put-maintenance-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - enable - disable - \ No newline at end of file diff --git a/doc/api_samples/os-hosts/host-put-maintenance-resp.xml b/doc/api_samples/os-hosts/host-put-maintenance-resp.xml deleted file mode 100644 index c4d1656281..0000000000 --- a/doc/api_samples/os-hosts/host-put-maintenance-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-hosts/hosts-list-resp.xml b/doc/api_samples/os-hosts/hosts-list-resp.xml deleted file mode 100644 index b651e732cb..0000000000 --- a/doc/api_samples/os-hosts/hosts-list-resp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/doc/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml b/doc/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml deleted file mode 100644 index dbfec700ce..0000000000 --- a/doc/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/doc/api_samples/os-hypervisors/hypervisors-detail-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-detail-resp.xml deleted file mode 100644 index 6904c089c8..0000000000 --- a/doc/api_samples/os-hypervisors/hypervisors-detail-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/api_samples/os-hypervisors/hypervisors-list-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-list-resp.xml deleted file mode 100644 index 8a784c592f..0000000000 --- a/doc/api_samples/os-hypervisors/hypervisors-list-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/doc/api_samples/os-hypervisors/hypervisors-search-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-search-resp.xml deleted file mode 100644 index 8a784c592f..0000000000 --- a/doc/api_samples/os-hypervisors/hypervisors-search-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/doc/api_samples/os-hypervisors/hypervisors-servers-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-servers-resp.xml deleted file mode 100644 index 950a5ab11f..0000000000 --- a/doc/api_samples/os-hypervisors/hypervisors-servers-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-hypervisors/hypervisors-show-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-show-resp.xml deleted file mode 100644 index 471709fb24..0000000000 --- a/doc/api_samples/os-hypervisors/hypervisors-show-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/doc/api_samples/os-hypervisors/hypervisors-statistics-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-statistics-resp.xml deleted file mode 100644 index 5d10411e3a..0000000000 --- a/doc/api_samples/os-hypervisors/hypervisors-statistics-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-hypervisors/hypervisors-uptime-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-uptime-resp.xml deleted file mode 100644 index 5c1b2cd7dd..0000000000 --- a/doc/api_samples/os-hypervisors/hypervisors-uptime-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-instance-actions/instance-action-get-resp.xml b/doc/api_samples/os-instance-actions/instance-action-get-resp.xml deleted file mode 100644 index 0fa985798c..0000000000 --- a/doc/api_samples/os-instance-actions/instance-action-get-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/doc/api_samples/os-instance-actions/instance-actions-list-resp.xml b/doc/api_samples/os-instance-actions/instance-actions-list-resp.xml deleted file mode 100644 index 33896df919..0000000000 --- a/doc/api_samples/os-instance-actions/instance-actions-list-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml b/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml deleted file mode 100644 index 82d157fb95..0000000000 --- a/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 0 - 0 - - 0 - 0 - 1 - - 107debd115684f098d4c73ffac7ec515 - - 0 of 1 hosts done. 0 errors. - 2013-01-01 00:00:00 - 2012-12-01 00:00:00 - 1 - \ No newline at end of file diff --git a/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml b/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml deleted file mode 100644 index 4536897373..0000000000 --- a/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 0 - 0 - - 0 - 0 - 1 - - 4b54478b73734afcbf0e2676a3303d1a - - 0 of 1 hosts done. 0 errors. - 2012-07-01 00:00:00 - 2012-06-01 00:00:00 - 1 - \ No newline at end of file diff --git a/doc/api_samples/os-keypairs/keypairs-get-resp.xml b/doc/api_samples/os-keypairs/keypairs-get-resp.xml deleted file mode 100644 index 131308bf7f..0000000000 --- a/doc/api_samples/os-keypairs/keypairs-get-resp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTWIBcXl7SSxGWOmzryHuYFYFQajo7uZXACg2juI92lRnQt1yy8aJ1710QZWaBlfluJYaOqBMccYXGxAR1vmZTONuW+lpBjRMqYgNG6ZC46p6z+Akp7Okbf1w1aqZ2rF2kq9OsjpU1x1SuB+xwC9stDv5MXEW2Gt/VPVcl3fVQLgvIoANhQPA5UJU5fRoeWgq0F/GCQtEGo7cQOQO3PC6IOshUPWAI/vRHt1dFGKnJjKJTkTbAuQkH2AnkMEWn6DvFFy8frBl3PwCYWnrResmOuPLvL5MG+Q5c1IrXpQm9ifTpEAstMalLJfHA0h5amQvIeWsj2y2yWyttcHoHg9K5 Generated-by-Nova - - fake - keypair-8cabfb98-b13f-48cb-af1a-068b585eaaf5 - False - 2014-05-07 12:06:00.402696+00:00 - None - ee:f5:79:02:69:af:ee:07:0f:ce:79:37:fd:5d:94:25 - None - 1 - \ No newline at end of file diff --git a/doc/api_samples/os-keypairs/keypairs-import-post-req.xml b/doc/api_samples/os-keypairs/keypairs-import-post-req.xml deleted file mode 100644 index 6c5f387aa9..0000000000 --- a/doc/api_samples/os-keypairs/keypairs-import-post-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - keypair-96bbe50e-05e1-4d59-9115-4779a3ebcc2e - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGgB4rMYmIf+6A4l6Rr+o/6lHBQdW5aYd44bd8JttDCE/F/pNRr0lRE+PiqSPO8nDPHw0010JeMH9gYgnnFlyY3/OcJ02RhIPyyxYpv9FhY+2YiUkpwFOcLImyrxEsYXpD/0d3ac30bNH6Sw9JD9UZHYcpSxsIbECHw== Generated-by-Nova - \ No newline at end of file diff --git a/doc/api_samples/os-keypairs/keypairs-import-post-resp.xml b/doc/api_samples/os-keypairs/keypairs-import-post-resp.xml deleted file mode 100644 index 18cfce47bd..0000000000 --- a/doc/api_samples/os-keypairs/keypairs-import-post-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGgB4rMYmIf+6A4l6Rr+o/6lHBQdW5aYd44bd8JttDCE/F/pNRr0lRE+PiqSPO8nDPHw0010JeMH9gYgnnFlyY3/OcJ02RhIPyyxYpv9FhY+2YiUkpwFOcLImyrxEsYXpD/0d3ac30bNH6Sw9JD9UZHYcpSxsIbECHw== Generated-by-Nova - fake - keypair-96bbe50e-05e1-4d59-9115-4779a3ebcc2e - 1e:2c:9b:56:79:4b:45:77:f9:ca:7a:98:2c:b0:d5:3c - \ No newline at end of file diff --git a/doc/api_samples/os-keypairs/keypairs-list-resp.xml b/doc/api_samples/os-keypairs/keypairs-list-resp.xml deleted file mode 100644 index 9771597f7e..0000000000 --- a/doc/api_samples/os-keypairs/keypairs-list-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCWdUoGD7qz9kjbLoY2L0S5CdhUS8RvQ1g62OTgvmWE/bEKDLwaTIFEEpN/0huGk/nxvVZ6VOhv1eSKC3o9dZ2NDk0C4sBsrvJ41uWd1hbq72sDGzVEkJ+925CraioSAbMpRK5Ea7UPWbR8laqrY1TsKtcuxiGJ936bOPIXW12h6Q== Generated-by-Nova - - keypair-a4c7d228-218b-4c4c-9d99-62e7878ebb1b - 62:32:23:67:56:ee:6f:51:4c:03:ce:b8:00:f9:41:ff - - \ No newline at end of file diff --git a/doc/api_samples/os-keypairs/keypairs-post-req.xml b/doc/api_samples/os-keypairs/keypairs-post-req.xml deleted file mode 100644 index 4dc4ce4836..0000000000 --- a/doc/api_samples/os-keypairs/keypairs-post-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - - keypair-b03122a0-102b-445b-a128-dba267c7cd2a - \ No newline at end of file diff --git a/doc/api_samples/os-keypairs/keypairs-post-resp.xml b/doc/api_samples/os-keypairs/keypairs-post-resp.xml deleted file mode 100644 index 88e514cdbe..0000000000 --- a/doc/api_samples/os-keypairs/keypairs-post-resp.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDNa8e/Gfe4572GwEDXlLsCqxsMcuUiF8Fr9RSeW30EuWg8Me5HM/rzqaShmzdHZbN5dvGH15H1yMXTUg8cxcLaOU04IQi/g+BHkGzbxV3gCdODWqjF+5928Ljg6x87e5lxxB6WAoyoGuzghaJXikOihRZSzdityb3DlYuYRfaRMw== Generated-by-Nova - - -----BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDNa8e/Gfe4572GwEDXlLsCqxsMcuUiF8Fr9RSeW30EuWg8Me5H -M/rzqaShmzdHZbN5dvGH15H1yMXTUg8cxcLaOU04IQi/g+BHkGzbxV3gCdODWqjF -+5928Ljg6x87e5lxxB6WAoyoGuzghaJXikOihRZSzdityb3DlYuYRfaRMwIDAQAB -AoGBAL67q4zqHJRIQDcE/W/t/jI9E3FcoRoluod12P4sbolbacgyiE7+ma1yv5T6 -HLqjWKCYay05YKI5GE3dbIDHsuHnnhd1S5tE2SNY85as8zC0QT6N8eFexh5/0Px4 -dVl3tXKj+Oaovb0tCKoiPVUHIZTsihNPwYqFS2kMuHnUwthxAkEA99Bw2FIWbgq9 -gj37qNGP5Vm2pmK9xU0aSyG2NJKH77CrERgmqrBT41a97BdsJbzuIaAwi4RJaDqm -AsTFBw312wJBANQ02vVin5NYD4BAfMyCsoNI7pQBCkq6UeK3VAC9ozCBE5BIDqat -VTx2ijbdlfwGqQVM6g773xuuNebgZJrbrYkCQQDV4YXzfe2z7fsf1MVGMBBkn2h/ -9ErbZa9i1ua+OxWt7qnGaDS/Ls5IMQ5cHN8PNx/Dz9D2KSd+GNg9HXz7mLXvAkEA -0GvZYomrEZy8HMs5x+PWUPug19ztrtew9Wv6JYAcd9dOz7b2LN6xiOEkfx7D4PTp -rTsN6AmZ6CYC6vAZ379DgQJAPMZjO9Z9KZ2t2VFu0YgK9LbQ4upbhew7YUmWA5dV -djCVjJ/0AZgQofvvUDe9FZHtSLt6IN5+jsLAi35Q3iQp9g== ------END RSA PRIVATE KEY----- - - fake - keypair-b03122a0-102b-445b-a128-dba267c7cd2a - 7f:97:1c:83:27:a3:6b:c5:a6:a2:37:90:4c:be:73:86 - \ No newline at end of file diff --git a/doc/api_samples/os-migrations/migrations-get.xml b/doc/api_samples/os-migrations/migrations-get.xml deleted file mode 100644 index f5c59c7f1b..0000000000 --- a/doc/api_samples/os-migrations/migrations-get.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml deleted file mode 100644 index 7ed374b3f8..0000000000 --- a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml deleted file mode 100644 index de1df128dd..0000000000 --- a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-multiple-create/multiple-create-post-req.xml b/doc/api_samples/os-multiple-create/multiple-create-post-req.xml deleted file mode 100644 index abe36f7ff6..0000000000 --- a/doc/api_samples/os-multiple-create/multiple-create-post-req.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-multiple-create/multiple-create-post-resp.xml b/doc/api_samples/os-multiple-create/multiple-create-post-resp.xml deleted file mode 100644 index 8db4ac2eb2..0000000000 --- a/doc/api_samples/os-multiple-create/multiple-create-post-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-networks-associate/network-associate-host-req.xml b/doc/api_samples/os-networks-associate/network-associate-host-req.xml deleted file mode 100644 index 3221be61d4..0000000000 --- a/doc/api_samples/os-networks-associate/network-associate-host-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - -testHost \ No newline at end of file diff --git a/doc/api_samples/os-networks-associate/network-disassociate-host-req.xml b/doc/api_samples/os-networks-associate/network-disassociate-host-req.xml deleted file mode 100644 index 3c2cc0d843..0000000000 --- a/doc/api_samples/os-networks-associate/network-disassociate-host-req.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/api_samples/os-networks-associate/network-disassociate-project-req.xml b/doc/api_samples/os-networks-associate/network-disassociate-project-req.xml deleted file mode 100644 index be94feb9f2..0000000000 --- a/doc/api_samples/os-networks-associate/network-disassociate-project-req.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/api_samples/os-networks-associate/network-disassociate-req.xml b/doc/api_samples/os-networks-associate/network-disassociate-req.xml deleted file mode 100644 index bcad8e0a80..0000000000 --- a/doc/api_samples/os-networks-associate/network-disassociate-req.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/api_samples/os-networks/network-add-req.xml b/doc/api_samples/os-networks/network-add-req.xml deleted file mode 100644 index 3ba873da36..0000000000 --- a/doc/api_samples/os-networks/network-add-req.xml +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/doc/api_samples/os-networks/network-create-req.xml b/doc/api_samples/os-networks/network-create-req.xml deleted file mode 100644 index 890d7bf3a1..0000000000 --- a/doc/api_samples/os-networks/network-create-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 10.20.105.0/24 - \ No newline at end of file diff --git a/doc/api_samples/os-networks/network-create-resp.xml b/doc/api_samples/os-networks/network-create-resp.xml deleted file mode 100644 index f638228ef5..0000000000 --- a/doc/api_samples/os-networks/network-create-resp.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - None - None - 10.20.105.2 - None - None - 1bbbed2b-0daa-47a1-b869-1981c29150b1 - None - None - 10.20.105.1 - None - - None - None - None - False - None - 10.20.105.255 - 255.255.255.0 - None - 10.20.105.0/24 - None - None - None - None - None - None - None - None - \ No newline at end of file diff --git a/doc/api_samples/os-networks/network-show-resp.xml b/doc/api_samples/os-networks/network-show-resp.xml deleted file mode 100644 index 2faed7a286..0000000000 --- a/doc/api_samples/os-networks/network-show-resp.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - br100 - 1000 - 10.0.0.3 - eth0 - 2011-08-16 09:26:13.048257 - 20c8acc0-f747-4d71-a389-46d078ebf047 - None - None - 10.0.0.1 - None - - None - 1234 - 10.0.0.2 - False - 100 - 10.0.0.7 - 255.255.255.248 - False - 10.0.0.0/29 - 127.0.0.1 - False - None - 2011-08-15 06:19:19.387525 - nsokolov-desktop - None - None - None - \ No newline at end of file diff --git a/doc/api_samples/os-networks/networks-disassociate-req.xml b/doc/api_samples/os-networks/networks-disassociate-req.xml deleted file mode 100644 index 85762fd0df..0000000000 --- a/doc/api_samples/os-networks/networks-disassociate-req.xml +++ /dev/null @@ -1 +0,0 @@ -None \ No newline at end of file diff --git a/doc/api_samples/os-networks/networks-list-resp.xml b/doc/api_samples/os-networks/networks-list-resp.xml deleted file mode 100644 index 59620c228b..0000000000 --- a/doc/api_samples/os-networks/networks-list-resp.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - br100 - 1000 - 10.0.0.3 - eth0 - 2011-08-16 09:26:13.048257 - 20c8acc0-f747-4d71-a389-46d078ebf047 - None - None - 10.0.0.1 - None - - None - 1234 - 10.0.0.2 - False - 100 - 10.0.0.7 - 255.255.255.248 - False - 10.0.0.0/29 - 127.0.0.1 - False - None - 2011-08-15 06:19:19.387525 - nsokolov-desktop - None - None - None - - - br101 - 1001 - 10.0.0.11 - eth0 - None - 20c8acc0-f747-4d71-a389-46d078ebf000 - None - None - 10.0.0.9 - None - - None - None - 10.0.0.10 - False - 101 - 10.0.0.15 - 255.255.255.248 - False - 10.0.0.10/29 - None - False - None - 2011-08-15 06:19:19.885495 - None - None - None - None - - \ No newline at end of file diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml deleted file mode 100644 index bc18e7405b..0000000000 --- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml deleted file mode 100644 index e755dfa8bc..0000000000 --- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml b/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml b/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml deleted file mode 100644 index ecdb860089..0000000000 --- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml b/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml deleted file mode 100644 index 91929d34ad..0000000000 --- a/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml deleted file mode 100644 index d147854820..0000000000 --- a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 50 - 10 - 10240 - 255 - 5 - 50 - 100 - 128 - 51200 - 20 - 10 - diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml deleted file mode 100644 index 23eb5088c7..0000000000 --- a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 50 - -1 - 10 - 10240 - 255 - 5 - 50 - 100 - 128 - 51200 - 20 - 10 - diff --git a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml deleted file mode 100644 index 76a9292c13..0000000000 --- a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - diff --git a/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml b/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml deleted file mode 100644 index 76a9292c13..0000000000 --- a/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - diff --git a/doc/api_samples/os-quota-sets/quotas-update-post-req.xml b/doc/api_samples/os-quota-sets/quotas-update-post-req.xml deleted file mode 100644 index 4bb7b3a474..0000000000 --- a/doc/api_samples/os-quota-sets/quotas-update-post-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 45 - \ No newline at end of file diff --git a/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml b/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml deleted file mode 100644 index e03a0bf5e4..0000000000 --- a/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 45 - diff --git a/doc/api_samples/os-rescue/server-get-resp-rescue.xml b/doc/api_samples/os-rescue/server-get-resp-rescue.xml deleted file mode 100644 index b0da738c4c..0000000000 --- a/doc/api_samples/os-rescue/server-get-resp-rescue.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-rescue/server-get-resp-unrescue.xml b/doc/api_samples/os-rescue/server-get-resp-unrescue.xml deleted file mode 100644 index 41fce846a1..0000000000 --- a/doc/api_samples/os-rescue/server-get-resp-unrescue.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-rescue/server-post-req.xml b/doc/api_samples/os-rescue/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-rescue/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-rescue/server-post-resp.xml b/doc/api_samples/os-rescue/server-post-resp.xml deleted file mode 100644 index 3a31871ba9..0000000000 --- a/doc/api_samples/os-rescue/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-rescue/server-rescue-req.xml b/doc/api_samples/os-rescue/server-rescue-req.xml deleted file mode 100644 index 7372633729..0000000000 --- a/doc/api_samples/os-rescue/server-rescue-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-rescue/server-rescue.xml b/doc/api_samples/os-rescue/server-rescue.xml deleted file mode 100644 index 5823886702..0000000000 --- a/doc/api_samples/os-rescue/server-rescue.xml +++ /dev/null @@ -1,2 +0,0 @@ - -MySecretPass \ No newline at end of file diff --git a/doc/api_samples/os-rescue/server-unrescue-req.xml b/doc/api_samples/os-rescue/server-unrescue-req.xml deleted file mode 100644 index 6a87f8fb21..0000000000 --- a/doc/api_samples/os-rescue/server-unrescue-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml deleted file mode 100644 index 7fa3af7d9d..0000000000 --- a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - TCP - 80 - 80 - 10.10.12.0/24 - \ No newline at end of file diff --git a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml deleted file mode 100644 index 9e700969ff..0000000000 --- a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - TCP - 80 - 80 - - 10.10.10.0/24 - - \ No newline at end of file diff --git a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml deleted file mode 100644 index f009bf80f1..0000000000 --- a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - TCP - 80 - 80 - - 10.10.10.0/24 - - - \ No newline at end of file diff --git a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml deleted file mode 100644 index 9181abd387..0000000000 --- a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - 80 - 80 - TCP - - 10.10.10.0/24 - - \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/security-group-add-post-req.xml b/doc/api_samples/os-security-groups/security-group-add-post-req.xml deleted file mode 100644 index e9e20739b8..0000000000 --- a/doc/api_samples/os-security-groups/security-group-add-post-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - test - \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/security-group-post-req.xml b/doc/api_samples/os-security-groups/security-group-post-req.xml deleted file mode 100644 index 03ccbd5c48..0000000000 --- a/doc/api_samples/os-security-groups/security-group-post-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - description - - \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/security-group-remove-post-req.xml b/doc/api_samples/os-security-groups/security-group-remove-post-req.xml deleted file mode 100644 index 74ac139b83..0000000000 --- a/doc/api_samples/os-security-groups/security-group-remove-post-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - test - \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/security-groups-create-resp.xml b/doc/api_samples/os-security-groups/security-groups-create-resp.xml deleted file mode 100644 index 045387ea62..0000000000 --- a/doc/api_samples/os-security-groups/security-groups-create-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - description - - - \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/security-groups-get-resp.xml b/doc/api_samples/os-security-groups/security-groups-get-resp.xml deleted file mode 100644 index 140f58b4e5..0000000000 --- a/doc/api_samples/os-security-groups/security-groups-get-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - default - - \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/security-groups-list-get-resp.xml b/doc/api_samples/os-security-groups/security-groups-list-get-resp.xml deleted file mode 100644 index f4266adef3..0000000000 --- a/doc/api_samples/os-security-groups/security-groups-list-get-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - default - - - \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/server-post-req.xml b/doc/api_samples/os-security-groups/server-post-req.xml deleted file mode 100644 index 77f8db2eff..0000000000 --- a/doc/api_samples/os-security-groups/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/server-post-resp.xml b/doc/api_samples/os-security-groups/server-post-resp.xml deleted file mode 100644 index 31af00c24e..0000000000 --- a/doc/api_samples/os-security-groups/server-post-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/server-security-groups-list-resp.xml b/doc/api_samples/os-security-groups/server-security-groups-list-resp.xml deleted file mode 100644 index f4266adef3..0000000000 --- a/doc/api_samples/os-security-groups/server-security-groups-list-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - default - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml b/doc/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml deleted file mode 100644 index 776419f82f..0000000000 --- a/doc/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 524288 - 5778432 - 26701 - 0 - 0 - 2070139 - 262144 - 488 - 140208 - 0 - 662 - 0 - 17300000000 - 112 - -1 - \ No newline at end of file diff --git a/doc/api_samples/os-server-diagnostics/server-post-req.xml b/doc/api_samples/os-server-diagnostics/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-server-diagnostics/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-diagnostics/server-post-resp.xml b/doc/api_samples/os-server-diagnostics/server-post-resp.xml deleted file mode 100644 index b7210473d5..0000000000 --- a/doc/api_samples/os-server-diagnostics/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-external-events/event-create-req.xml b/doc/api_samples/os-server-external-events/event-create-req.xml deleted file mode 100644 index cb1d7ecbd1..0000000000 --- a/doc/api_samples/os-server-external-events/event-create-req.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - test-event - foo - completed - 7dd63360-256e-4304-ba46-7d87311fbf33 - - diff --git a/doc/api_samples/os-server-external-events/event-create-resp.xml b/doc/api_samples/os-server-external-events/event-create-resp.xml deleted file mode 100644 index 0188eb519f..0000000000 --- a/doc/api_samples/os-server-external-events/event-create-resp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - completed - foo - network-changed - 8544aae8-a2e0-4429-8537-d3aaeaf55dc2 - 200 - - \ No newline at end of file diff --git a/doc/api_samples/os-server-external-events/server-post-req.xml b/doc/api_samples/os-server-external-events/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-server-external-events/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-external-events/server-post-resp.xml b/doc/api_samples/os-server-external-events/server-post-resp.xml deleted file mode 100644 index ff4c02fda4..0000000000 --- a/doc/api_samples/os-server-external-events/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-group-quotas/limit-get-resp.xml b/doc/api_samples/os-server-group-quotas/limit-get-resp.xml deleted file mode 100644 index 6ea2da0484..0000000000 --- a/doc/api_samples/os-server-group-quotas/limit-get-resp.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml b/doc/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml deleted file mode 100644 index 7d3954a2b2..0000000000 --- a/doc/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - 10 - 10 - diff --git a/doc/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml b/doc/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml deleted file mode 100644 index 5fccc0bea9..0000000000 --- a/doc/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 50 - 10 - 10240 - 255 - 5 - 50 - 100 - 128 - 51200 - 20 - 10 - 10 - 10 - diff --git a/doc/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml b/doc/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml deleted file mode 100644 index d87af34f41..0000000000 --- a/doc/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 50 - -1 - 10 - 10240 - 255 - 5 - 50 - 100 - 128 - 51200 - 20 - 10 - 10 - 10 - diff --git a/doc/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml b/doc/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml deleted file mode 100644 index c926f82bb7..0000000000 --- a/doc/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - 10 - 10 - diff --git a/doc/api_samples/os-server-group-quotas/quotas-show-get-resp.xml b/doc/api_samples/os-server-group-quotas/quotas-show-get-resp.xml deleted file mode 100644 index c926f82bb7..0000000000 --- a/doc/api_samples/os-server-group-quotas/quotas-show-get-resp.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - 10 - 10 - diff --git a/doc/api_samples/os-server-group-quotas/quotas-update-post-req.xml b/doc/api_samples/os-server-group-quotas/quotas-update-post-req.xml deleted file mode 100644 index 4bb7b3a474..0000000000 --- a/doc/api_samples/os-server-group-quotas/quotas-update-post-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 45 - \ No newline at end of file diff --git a/doc/api_samples/os-server-group-quotas/quotas-update-post-resp.xml b/doc/api_samples/os-server-group-quotas/quotas-update-post-resp.xml deleted file mode 100644 index 47c01bf124..0000000000 --- a/doc/api_samples/os-server-group-quotas/quotas-update-post-resp.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 45 - 10 - 10 - diff --git a/doc/api_samples/os-server-group-quotas/usedlimits-get-resp.xml b/doc/api_samples/os-server-group-quotas/usedlimits-get-resp.xml deleted file mode 100644 index 69e34e83eb..0000000000 --- a/doc/api_samples/os-server-group-quotas/usedlimits-get-resp.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/os-server-groups/server-groups-get-resp.xml b/doc/api_samples/os-server-groups/server-groups-get-resp.xml deleted file mode 100644 index 65d7ba23e0..0000000000 --- a/doc/api_samples/os-server-groups/server-groups-get-resp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - anti-affinity - - - - diff --git a/doc/api_samples/os-server-groups/server-groups-list-resp.xml b/doc/api_samples/os-server-groups/server-groups-list-resp.xml deleted file mode 100644 index 0123bb0782..0000000000 --- a/doc/api_samples/os-server-groups/server-groups-list-resp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - anti-affinity - - - - - diff --git a/doc/api_samples/os-server-groups/server-groups-post-req.xml b/doc/api_samples/os-server-groups/server-groups-post-req.xml deleted file mode 100644 index abe8459549..0000000000 --- a/doc/api_samples/os-server-groups/server-groups-post-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - anti-affinity - - diff --git a/doc/api_samples/os-server-groups/server-groups-post-resp.xml b/doc/api_samples/os-server-groups/server-groups-post-resp.xml deleted file mode 100644 index 65d7ba23e0..0000000000 --- a/doc/api_samples/os-server-groups/server-groups-post-resp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - anti-affinity - - - - diff --git a/doc/api_samples/os-server-list-multi-status/server-post-req.xml b/doc/api_samples/os-server-list-multi-status/server-post-req.xml deleted file mode 100644 index 2dbbb4438d..0000000000 --- a/doc/api_samples/os-server-list-multi-status/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/doc/api_samples/os-server-list-multi-status/server-post-resp.xml b/doc/api_samples/os-server-list-multi-status/server-post-resp.xml deleted file mode 100644 index 9725f33bf4..0000000000 --- a/doc/api_samples/os-server-list-multi-status/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-list-multi-status/servers-list-resp.xml b/doc/api_samples/os-server-list-multi-status/servers-list-resp.xml deleted file mode 100644 index cbd7892e73..0000000000 --- a/doc/api_samples/os-server-list-multi-status/servers-list-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-password/get-password-resp.xml b/doc/api_samples/os-server-password/get-password-resp.xml deleted file mode 100644 index 64b46a5712..0000000000 --- a/doc/api_samples/os-server-password/get-password-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -xlozO3wLCBRWAa2yDjCCVx8vwNPypxnypmRYDa/zErlQ+EzPe1S/Gz6nfmC52mOlOSCRuUOmG7kqqgejPof6M7bOezS387zjq4LSvvwp28zUknzy4YzfFGhnHAdai3TxUJ26pfQCYrq8UTzmKF2Bq8ioSEtVVzM0A96pDh8W2i7BOz6MdoiVyiev/I1K2LsuipfxSJR7Wdke4zNXJjHHP2RfYsVbZ/k9ANu+Nz4iIH8/7Cacud/pphH7EjrY6a4RZNrjQskrhKYed0YERpotyjYk1eDtRe72GrSiXteqCM4biaQ5w3ruS+AcX//PXk3uJ5kC7d67fPXaVz4WaQRYMg== \ No newline at end of file diff --git a/doc/api_samples/os-server-password/server-post-req.xml b/doc/api_samples/os-server-password/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-server-password/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-password/server-post-resp.xml b/doc/api_samples/os-server-password/server-post-resp.xml deleted file mode 100644 index cac50bc9b9..0000000000 --- a/doc/api_samples/os-server-password/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-sort-keys/server-post-req.xml b/doc/api_samples/os-server-sort-keys/server-post-req.xml deleted file mode 100644 index d5cc736ee8..0000000000 --- a/doc/api_samples/os-server-sort-keys/server-post-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/doc/api_samples/os-server-sort-keys/server-post-resp.xml b/doc/api_samples/os-server-sort-keys/server-post-resp.xml deleted file mode 100644 index 742d5158e2..0000000000 --- a/doc/api_samples/os-server-sort-keys/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/api_samples/os-server-sort-keys/server-sort-keys-list-resp.xml b/doc/api_samples/os-server-sort-keys/server-sort-keys-list-resp.xml deleted file mode 100644 index abd876a7a5..0000000000 --- a/doc/api_samples/os-server-sort-keys/server-sort-keys-list-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/doc/api_samples/os-server-start-stop/server-post-req.xml b/doc/api_samples/os-server-start-stop/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-server-start-stop/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-start-stop/server-post-resp.xml b/doc/api_samples/os-server-start-stop/server-post-resp.xml deleted file mode 100644 index 7f84ac03df..0000000000 --- a/doc/api_samples/os-server-start-stop/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-server-start-stop/server_start_stop.xml b/doc/api_samples/os-server-start-stop/server_start_stop.xml deleted file mode 100644 index 974e415a52..0000000000 --- a/doc/api_samples/os-server-start-stop/server_start_stop.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-services/service-disable-log-put-req.xml b/doc/api_samples/os-services/service-disable-log-put-req.xml deleted file mode 100644 index f8eec8173f..0000000000 --- a/doc/api_samples/os-services/service-disable-log-put-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-services/service-disable-log-put-resp.xml b/doc/api_samples/os-services/service-disable-log-put-resp.xml deleted file mode 100644 index 1ddf273b16..0000000000 --- a/doc/api_samples/os-services/service-disable-log-put-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-services/service-disable-put-req.xml b/doc/api_samples/os-services/service-disable-put-req.xml deleted file mode 100644 index 598ffc0ca9..0000000000 --- a/doc/api_samples/os-services/service-disable-put-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-services/service-disable-put-resp.xml b/doc/api_samples/os-services/service-disable-put-resp.xml deleted file mode 100644 index f7569159d9..0000000000 --- a/doc/api_samples/os-services/service-disable-put-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-services/service-enable-put-req.xml b/doc/api_samples/os-services/service-enable-put-req.xml deleted file mode 100644 index 598ffc0ca9..0000000000 --- a/doc/api_samples/os-services/service-enable-put-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-services/service-enable-put-resp.xml b/doc/api_samples/os-services/service-enable-put-resp.xml deleted file mode 100644 index 04c29ffa03..0000000000 --- a/doc/api_samples/os-services/service-enable-put-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-services/services-get-resp.xml b/doc/api_samples/os-services/services-get-resp.xml deleted file mode 100644 index f011bf7b1b..0000000000 --- a/doc/api_samples/os-services/services-get-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/api_samples/os-services/services-list-get-resp.xml b/doc/api_samples/os-services/services-list-get-resp.xml deleted file mode 100644 index e9868c2f26..0000000000 --- a/doc/api_samples/os-services/services-list-get-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/api_samples/os-shelve/os-shelve-offload.xml b/doc/api_samples/os-shelve/os-shelve-offload.xml deleted file mode 100644 index 0d6e379123..0000000000 --- a/doc/api_samples/os-shelve/os-shelve-offload.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-shelve/os-shelve.xml b/doc/api_samples/os-shelve/os-shelve.xml deleted file mode 100644 index 687b1b1f58..0000000000 --- a/doc/api_samples/os-shelve/os-shelve.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-shelve/os-unshelve.xml b/doc/api_samples/os-shelve/os-unshelve.xml deleted file mode 100644 index e56b78a83c..0000000000 --- a/doc/api_samples/os-shelve/os-unshelve.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/api_samples/os-shelve/server-post-req.xml b/doc/api_samples/os-shelve/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-shelve/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-shelve/server-post-resp.xml b/doc/api_samples/os-shelve/server-post-resp.xml deleted file mode 100644 index 7b789b2246..0000000000 --- a/doc/api_samples/os-shelve/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-simple-tenant-usage/server-post-req.xml b/doc/api_samples/os-simple-tenant-usage/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-simple-tenant-usage/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-simple-tenant-usage/server-post-resp.xml b/doc/api_samples/os-simple-tenant-usage/server-post-resp.xml deleted file mode 100644 index 7b0c8a439d..0000000000 --- a/doc/api_samples/os-simple-tenant-usage/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml deleted file mode 100644 index 56f95edc48..0000000000 --- a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - openstack - 1.0 - 1.0 - 512.0 - 1.0 - 2012-10-08 20:10:51.902640 - 2012-10-08 21:10:51.902640 - - - e4521f3b-d9ad-4454-be8a-e2732f0630ef - new-server-test - 1.0 - 512 - 1 - 1 - openstack - m1.tiny - 2012-10-08 20:10:51.854331 - None - active - 3600 - - - diff --git a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml deleted file mode 100644 index 8807691b74..0000000000 --- a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - openstack - 1.0 - 1.0 - 512.0 - 1.0 - 2012-10-08 21:10:51.902640 - 2012-10-08 22:10:51.902640 - - - diff --git a/doc/api_samples/os-tenant-networks/networks-list-res.xml b/doc/api_samples/os-tenant-networks/networks-list-res.xml deleted file mode 100644 index 6aaeec85bb..0000000000 --- a/doc/api_samples/os-tenant-networks/networks-list-res.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - 10.0.0.0/29 - cf3fb0f1-9967-4dac-8284-2d103e904099 - - - - 10.0.0.8/29 - 434385bc-a7ac-4778-b295-56f8134fddbc - - - \ No newline at end of file diff --git a/doc/api_samples/os-tenant-networks/networks-post-req.xml b/doc/api_samples/os-tenant-networks/networks-post-req.xml deleted file mode 100644 index f4c06aa9d8..0000000000 --- a/doc/api_samples/os-tenant-networks/networks-post-req.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - 172.0.0.0/24 - 1 - 1 - 255 - \ No newline at end of file diff --git a/doc/api_samples/os-tenant-networks/networks-post-res.xml b/doc/api_samples/os-tenant-networks/networks-post-res.xml deleted file mode 100644 index 7bbc6a4b68..0000000000 --- a/doc/api_samples/os-tenant-networks/networks-post-res.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 172.0.0.0/24 - 9ac30188-57d8-4349-94d1-dbad63b20e4d - - \ No newline at end of file diff --git a/doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml b/doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml deleted file mode 100644 index a403c5eff5..0000000000 --- a/doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/os-used-limits/usedlimits-get-resp.xml b/doc/api_samples/os-used-limits/usedlimits-get-resp.xml deleted file mode 100644 index a403c5eff5..0000000000 --- a/doc/api_samples/os-used-limits/usedlimits-get-resp.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/api_samples/os-user-data/userdata-post-req.xml b/doc/api_samples/os-user-data/userdata-post-req.xml deleted file mode 100644 index f2b427c314..0000000000 --- a/doc/api_samples/os-user-data/userdata-post-req.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg== - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-user-data/userdata-post-resp.xml b/doc/api_samples/os-user-data/userdata-post-resp.xml deleted file mode 100644 index 24f94ba218..0000000000 --- a/doc/api_samples/os-user-data/userdata-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-user-quotas/user-quotas-show-get-resp.xml b/doc/api_samples/os-user-quotas/user-quotas-show-get-resp.xml deleted file mode 100644 index 76a9292c13..0000000000 --- a/doc/api_samples/os-user-quotas/user-quotas-show-get-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - diff --git a/doc/api_samples/os-user-quotas/user-quotas-update-post-req.xml b/doc/api_samples/os-user-quotas/user-quotas-update-post-req.xml deleted file mode 100644 index c5084d44e6..0000000000 --- a/doc/api_samples/os-user-quotas/user-quotas-update-post-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - True - 9 - diff --git a/doc/api_samples/os-user-quotas/user-quotas-update-post-resp.xml b/doc/api_samples/os-user-quotas/user-quotas-update-post-resp.xml deleted file mode 100644 index 43c36c7da3..0000000000 --- a/doc/api_samples/os-user-quotas/user-quotas-update-post-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 9 - 100 - 128 - 51200 - 20 - 10 - diff --git a/doc/api_samples/os-virtual-interfaces/server-post-req.xml b/doc/api_samples/os-virtual-interfaces/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-virtual-interfaces/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-virtual-interfaces/server-post-resp.xml b/doc/api_samples/os-virtual-interfaces/server-post-resp.xml deleted file mode 100644 index d620ed00b0..0000000000 --- a/doc/api_samples/os-virtual-interfaces/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-virtual-interfaces/vifs-list-resp.xml b/doc/api_samples/os-virtual-interfaces/vifs-list-resp.xml deleted file mode 100644 index 73aafe09b0..0000000000 --- a/doc/api_samples/os-virtual-interfaces/vifs-list-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/doc/api_samples/os-volume-attachment-update/server-post-req.xml b/doc/api_samples/os-volume-attachment-update/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-volume-attachment-update/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-volume-attachment-update/server-post-resp.xml b/doc/api_samples/os-volume-attachment-update/server-post-resp.xml deleted file mode 100644 index 558e1abbfc..0000000000 --- a/doc/api_samples/os-volume-attachment-update/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-volume-attachment-update/update-volume-req.xml b/doc/api_samples/os-volume-attachment-update/update-volume-req.xml deleted file mode 100644 index 37d7f84630..0000000000 --- a/doc/api_samples/os-volume-attachment-update/update-volume-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/attach-volume-to-server-req.xml b/doc/api_samples/os-volumes/attach-volume-to-server-req.xml deleted file mode 100644 index eedfc329a8..0000000000 --- a/doc/api_samples/os-volumes/attach-volume-to-server-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/attach-volume-to-server-resp.xml b/doc/api_samples/os-volumes/attach-volume-to-server-resp.xml deleted file mode 100644 index aaa85dd43f..0000000000 --- a/doc/api_samples/os-volumes/attach-volume-to-server-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/list-volume-attachments-resp.xml b/doc/api_samples/os-volumes/list-volume-attachments-resp.xml deleted file mode 100644 index 7d70882c08..0000000000 --- a/doc/api_samples/os-volumes/list-volume-attachments-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/os-volumes-detail-resp.xml b/doc/api_samples/os-volumes/os-volumes-detail-resp.xml deleted file mode 100644 index c6ff8c23e7..0000000000 --- a/doc/api_samples/os-volumes/os-volumes-detail-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/doc/api_samples/os-volumes/os-volumes-get-resp.xml b/doc/api_samples/os-volumes/os-volumes-get-resp.xml deleted file mode 100644 index a65b78c9de..0000000000 --- a/doc/api_samples/os-volumes/os-volumes-get-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/doc/api_samples/os-volumes/os-volumes-index-resp.xml b/doc/api_samples/os-volumes/os-volumes-index-resp.xml deleted file mode 100644 index c6ff8c23e7..0000000000 --- a/doc/api_samples/os-volumes/os-volumes-index-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/doc/api_samples/os-volumes/os-volumes-post-req.xml b/doc/api_samples/os-volumes/os-volumes-post-req.xml deleted file mode 100644 index 68a0b58643..0000000000 --- a/doc/api_samples/os-volumes/os-volumes-post-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/doc/api_samples/os-volumes/os-volumes-post-resp.xml b/doc/api_samples/os-volumes/os-volumes-post-resp.xml deleted file mode 100644 index a65b78c9de..0000000000 --- a/doc/api_samples/os-volumes/os-volumes-post-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/doc/api_samples/os-volumes/server-post-req.xml b/doc/api_samples/os-volumes/server-post-req.xml deleted file mode 100644 index 0a3c8bb530..0000000000 --- a/doc/api_samples/os-volumes/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/server-post-resp.xml b/doc/api_samples/os-volumes/server-post-resp.xml deleted file mode 100644 index b2474027d1..0000000000 --- a/doc/api_samples/os-volumes/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/snapshot-create-req.xml b/doc/api_samples/os-volumes/snapshot-create-req.xml deleted file mode 100644 index e5001cf06f..0000000000 --- a/doc/api_samples/os-volumes/snapshot-create-req.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - snap-001 - Daily backup - 521752a6-acf6-4b2d-bc7a-119f9148cd8c - false - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/snapshot-create-resp.xml b/doc/api_samples/os-volumes/snapshot-create-resp.xml deleted file mode 100644 index 654bf3d34b..0000000000 --- a/doc/api_samples/os-volumes/snapshot-create-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/snapshots-detail-resp.xml b/doc/api_samples/os-volumes/snapshots-detail-resp.xml deleted file mode 100644 index 5e946939f8..0000000000 --- a/doc/api_samples/os-volumes/snapshots-detail-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/snapshots-list-resp.xml b/doc/api_samples/os-volumes/snapshots-list-resp.xml deleted file mode 100644 index 6714c98bc1..0000000000 --- a/doc/api_samples/os-volumes/snapshots-list-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/snapshots-show-resp.xml b/doc/api_samples/os-volumes/snapshots-show-resp.xml deleted file mode 100644 index 3c70cf033f..0000000000 --- a/doc/api_samples/os-volumes/snapshots-show-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/os-volumes/volume-attachment-detail-resp.xml b/doc/api_samples/os-volumes/volume-attachment-detail-resp.xml deleted file mode 100644 index dea2352927..0000000000 --- a/doc/api_samples/os-volumes/volume-attachment-detail-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/server-action-changepassword.xml b/doc/api_samples/server-action-changepassword.xml deleted file mode 100644 index 4326e01617..0000000000 --- a/doc/api_samples/server-action-changepassword.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/server-action-confirmresize.xml b/doc/api_samples/server-action-confirmresize.xml deleted file mode 100644 index ffad7f16ae..0000000000 --- a/doc/api_samples/server-action-confirmresize.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/server-action-createimage.xml b/doc/api_samples/server-action-createimage.xml deleted file mode 100644 index faa6ae7660..0000000000 --- a/doc/api_samples/server-action-createimage.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - foobar - - \ No newline at end of file diff --git a/doc/api_samples/server-action-reboot.xml b/doc/api_samples/server-action-reboot.xml deleted file mode 100644 index b36d35801f..0000000000 --- a/doc/api_samples/server-action-reboot.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/server-action-rebuild-resp.xml b/doc/api_samples/server-action-rebuild-resp.xml deleted file mode 100644 index b31c861f07..0000000000 --- a/doc/api_samples/server-action-rebuild-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/server-action-rebuild.xml b/doc/api_samples/server-action-rebuild.xml deleted file mode 100644 index d39b9d8a38..0000000000 --- a/doc/api_samples/server-action-rebuild.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file diff --git a/doc/api_samples/server-action-resize.xml b/doc/api_samples/server-action-resize.xml deleted file mode 100644 index 8dfb53c6a8..0000000000 --- a/doc/api_samples/server-action-resize.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/server-action-revertresize.xml b/doc/api_samples/server-action-revertresize.xml deleted file mode 100644 index 7981753e75..0000000000 --- a/doc/api_samples/server-action-revertresize.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/doc/api_samples/server-get-resp.xml b/doc/api_samples/server-get-resp.xml deleted file mode 100644 index e59319e426..0000000000 --- a/doc/api_samples/server-get-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/server-ips-network-resp.xml b/doc/api_samples/server-ips-network-resp.xml deleted file mode 100644 index 30c7678c4f..0000000000 --- a/doc/api_samples/server-ips-network-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/doc/api_samples/server-ips-resp.xml b/doc/api_samples/server-ips-resp.xml deleted file mode 100644 index 2679457ff4..0000000000 --- a/doc/api_samples/server-ips-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/server-metadata-all-req.xml b/doc/api_samples/server-metadata-all-req.xml deleted file mode 100644 index 72811e3025..0000000000 --- a/doc/api_samples/server-metadata-all-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - Foo Value - \ No newline at end of file diff --git a/doc/api_samples/server-metadata-all-resp.xml b/doc/api_samples/server-metadata-all-resp.xml deleted file mode 100644 index 55c949c577..0000000000 --- a/doc/api_samples/server-metadata-all-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Foo Value - \ No newline at end of file diff --git a/doc/api_samples/server-metadata-req.xml b/doc/api_samples/server-metadata-req.xml deleted file mode 100644 index f237b2b369..0000000000 --- a/doc/api_samples/server-metadata-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - - -Bar Value \ No newline at end of file diff --git a/doc/api_samples/server-metadata-resp.xml b/doc/api_samples/server-metadata-resp.xml deleted file mode 100644 index c01e16a47a..0000000000 --- a/doc/api_samples/server-metadata-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -Bar Value \ No newline at end of file diff --git a/doc/api_samples/server-post-req.xml b/doc/api_samples/server-post-req.xml deleted file mode 100644 index 2dbbb4438d..0000000000 --- a/doc/api_samples/server-post-req.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/doc/api_samples/server-post-resp.xml b/doc/api_samples/server-post-resp.xml deleted file mode 100644 index 9725f33bf4..0000000000 --- a/doc/api_samples/server-post-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/doc/api_samples/servers-details-resp.xml b/doc/api_samples/servers-details-resp.xml deleted file mode 100644 index 83bcf0f79b..0000000000 --- a/doc/api_samples/servers-details-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/servers-list-resp.xml b/doc/api_samples/servers-list-resp.xml deleted file mode 100644 index cbd7892e73..0000000000 --- a/doc/api_samples/servers-list-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/versions-get-resp.xml b/doc/api_samples/versions-get-resp.xml deleted file mode 100644 index 09c4a52f9e..0000000000 --- a/doc/api_samples/versions-get-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/nova/tests/functional/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl b/nova/tests/functional/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl deleted file mode 100644 index ad11129129..0000000000 --- a/nova/tests/functional/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - %(networkId)s - diff --git a/nova/tests/functional/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl b/nova/tests/functional/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl deleted file mode 100644 index 10b722220f..0000000000 --- a/nova/tests/functional/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - -
%(ip)s
- diff --git a/nova/tests/functional/api_samples/NMN/server-post-req.xml.tpl b/nova/tests/functional/api_samples/NMN/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/NMN/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/NMN/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/NMN/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/NMN/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/OS-DCF/image-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/image-get-resp.xml.tpl deleted file mode 100644 index bf82d296d1..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/image-get-resp.xml.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - nokernel - True - nokernel - x86_64 - - - - - diff --git a/nova/tests/functional/api_samples/OS-DCF/image-list-resp.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/image-list-resp.xml.tpl deleted file mode 100644 index b4213312d7..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/image-list-resp.xml.tpl +++ /dev/null @@ -1,71 +0,0 @@ - - - - - nokernel - True - nokernel - x86_64 - - - - - - - - nokernel - nokernel - x86_64 - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - False - nokernel - x86_64 - - - - - - - - %(id)s - None - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - nokernel - - - - - - diff --git a/nova/tests/functional/api_samples/OS-DCF/list-servers-detail-get.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/list-servers-detail-get.xml.tpl deleted file mode 100644 index 36b53957c6..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/list-servers-detail-get.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-req.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-req.xml.tpl deleted file mode 100644 index 93bfb0d4e9..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-req.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl deleted file mode 100644 index 5835392c31..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-DCF/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/server-get-resp.xml.tpl deleted file mode 100644 index b9e8a2b365..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-get-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-DCF/server-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/server-post-req.xml.tpl deleted file mode 100644 index fcfada031b..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/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-DCF/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/server-post-resp.xml.tpl deleted file mode 100644 index 1309e6dfee..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/OS-DCF/server-resize-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/server-resize-post-req.xml.tpl deleted file mode 100644 index aa0b0b67a3..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-resize-post-req.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/OS-DCF/server-update-put-req.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/server-update-put-req.xml.tpl deleted file mode 100644 index 8088846987..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-update-put-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/OS-DCF/server-update-put-resp.xml.tpl b/nova/tests/functional/api_samples/OS-DCF/server-update-put-resp.xml.tpl deleted file mode 100644 index cb8c662442..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-update-put-resp.xml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl deleted file mode 100644 index 2c4cdc07f2..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-AZ/server-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-AZ/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-AZ/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-EXT-AZ/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-AZ/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-AZ/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl deleted file mode 100644 index 35e1618678..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl deleted file mode 100644 index e8dffa3ba4..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - nokernel - True - nokernel - x86_64 - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl deleted file mode 100644 index 586c8ed46d..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl +++ /dev/null @@ -1,71 +0,0 @@ - - - - - nokernel - True - nokernel - x86_64 - - - - - - - - nokernel - nokernel - x86_64 - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - False - nokernel - x86_64 - - - - - - - - 155d900f-4e14-4e4c-a73d-069cbf4541e6 - None - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - nokernel - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl deleted file mode 100644 index 49d8a8e2bf..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/server-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/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-EXT-IPS-MAC/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl deleted file mode 100644 index 23dda7c583..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl deleted file mode 100644 index aa78378f84..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-IPS/server-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-IPS/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-IPS/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-EXT-IPS/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl deleted file mode 100644 index d3b5c524d3..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl deleted file mode 100644 index 10495ff9d5..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/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-EXT-SRV-ATTR/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl deleted file mode 100644 index f7da4086a3..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/OS-EXT-STS/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-STS/server-get-resp.xml.tpl deleted file mode 100644 index 6b28dde2da..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-STS/server-get-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-STS/server-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-STS/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-STS/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-EXT-STS/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-STS/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-STS/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl deleted file mode 100644 index 89c3b9396e..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-VIF-NET/server-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-VIF-NET/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-VIF-NET/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-EXT-VIF-NET/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-VIF-NET/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-VIF-NET/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml.tpl b/nova/tests/functional/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml.tpl deleted file mode 100644 index adf7d7baa3..0000000000 --- a/nova/tests/functional/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl deleted file mode 100644 index 5d73195fad..0000000000 --- a/nova/tests/functional/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl deleted file mode 100644 index 13908e2ac6..0000000000 --- a/nova/tests/functional/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl deleted file mode 100644 index da45536c37..0000000000 --- a/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl b/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl deleted file mode 100644 index 5ba4631884..0000000000 --- a/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml.tpl deleted file mode 100644 index df74ab383f..0000000000 --- a/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml.tpl b/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml.tpl deleted file mode 100644 index df7fc07a32..0000000000 --- a/nova/tests/functional/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml.tpl deleted file mode 100644 index a680e3476e..0000000000 --- a/nova/tests/functional/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - xen - %(image_near)s - - diff --git a/nova/tests/functional/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml.tpl b/nova/tests/functional/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml.tpl deleted file mode 100644 index 5a11c73c3c..0000000000 --- a/nova/tests/functional/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/OS-SRV-USG/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/OS-SRV-USG/server-get-resp.xml.tpl deleted file mode 100644 index ee35f36fa0..0000000000 --- a/nova/tests/functional/api_samples/OS-SRV-USG/server-get-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/OS-SRV-USG/server-post-req.xml.tpl b/nova/tests/functional/api_samples/OS-SRV-USG/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/OS-SRV-USG/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-SRV-USG/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/OS-SRV-USG/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/OS-SRV-USG/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl b/nova/tests/functional/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl deleted file mode 100644 index bce5e2eabe..0000000000 --- a/nova/tests/functional/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/all_extensions/extensions-get-resp.xml.tpl b/nova/tests/functional/api_samples/all_extensions/extensions-get-resp.xml.tpl deleted file mode 100644 index ddd7faa993..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/extensions-get-resp.xml.tpl +++ /dev/null @@ -1,272 +0,0 @@ - - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - Attach interface support. - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - Fixed IPs support. - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - Support hiding server addresses in certain states. - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - - %(text)s - - diff --git a/nova/tests/functional/api_samples/all_extensions/flavor-get-resp.xml.tpl b/nova/tests/functional/api_samples/all_extensions/flavor-get-resp.xml.tpl deleted file mode 100644 index 53f870ec4d..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/flavor-get-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/all_extensions/flavors-list-resp.xml.tpl b/nova/tests/functional/api_samples/all_extensions/flavors-list-resp.xml.tpl deleted file mode 100644 index 435f96be56..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/flavors-list-resp.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-changepassword.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-action-changepassword.xml.tpl deleted file mode 100644 index 6c343024e2..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/server-action-changepassword.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-confirmresize.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-action-confirmresize.xml.tpl deleted file mode 100644 index 18f07bd67b..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/server-action-confirmresize.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-createimage.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-action-createimage.xml.tpl deleted file mode 100644 index aa1eccf8a5..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/server-action-createimage.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - %(meta_val)s - - diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-reboot.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-action-reboot.xml.tpl deleted file mode 100644 index d4cfe198c7..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/server-action-reboot.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl deleted file mode 100644 index 6fa0505367..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-rebuild.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-action-rebuild.xml.tpl deleted file mode 100644 index bd42f88b22..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/server-action-rebuild.xml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-resize.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-action-resize.xml.tpl deleted file mode 100644 index cbe49ea59a..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/server-action-resize.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-revertresize.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-action-revertresize.xml.tpl deleted file mode 100644 index 5c13bbdc0c..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/server-action-revertresize.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/all_extensions/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-get-resp.xml.tpl deleted file mode 100644 index 1bd75a99b9..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/server-get-resp.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/all_extensions/server-post-req.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/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/all_extensions/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/all_extensions/server-post-resp.xml.tpl deleted file mode 100644 index d7dc316552..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/server-post-resp.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/nova/tests/functional/api_samples/all_extensions/servers-details-resp.xml.tpl b/nova/tests/functional/api_samples/all_extensions/servers-details-resp.xml.tpl deleted file mode 100644 index bf8dc083cd..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/servers-details-resp.xml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/all_extensions/servers-list-resp.xml.tpl b/nova/tests/functional/api_samples/all_extensions/servers-list-resp.xml.tpl deleted file mode 100644 index 03bee03a6e..0000000000 --- a/nova/tests/functional/api_samples/all_extensions/servers-list-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/nova/tests/functional/api_samples/flavor-get-resp.xml.tpl b/nova/tests/functional/api_samples/flavor-get-resp.xml.tpl deleted file mode 100644 index 5925c588d0..0000000000 --- a/nova/tests/functional/api_samples/flavor-get-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/flavors-list-resp.xml.tpl b/nova/tests/functional/api_samples/flavors-list-resp.xml.tpl deleted file mode 100644 index 435f96be56..0000000000 --- a/nova/tests/functional/api_samples/flavors-list-resp.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/image-get-resp.xml.tpl b/nova/tests/functional/api_samples/image-get-resp.xml.tpl deleted file mode 100644 index 2a69728071..0000000000 --- a/nova/tests/functional/api_samples/image-get-resp.xml.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - nokernel - True - nokernel - x86_64 - - - - - diff --git a/nova/tests/functional/api_samples/image-meta-key-get.xml.tpl b/nova/tests/functional/api_samples/image-meta-key-get.xml.tpl deleted file mode 100644 index 1de6b40781..0000000000 --- a/nova/tests/functional/api_samples/image-meta-key-get.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -nokernel \ No newline at end of file diff --git a/nova/tests/functional/api_samples/image-meta-key-put-req.xml.tpl b/nova/tests/functional/api_samples/image-meta-key-put-req.xml.tpl deleted file mode 100644 index 319e075eef..0000000000 --- a/nova/tests/functional/api_samples/image-meta-key-put-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - -False diff --git a/nova/tests/functional/api_samples/image-meta-key-put-resp.xml.tpl b/nova/tests/functional/api_samples/image-meta-key-put-resp.xml.tpl deleted file mode 100644 index c989c38a2d..0000000000 --- a/nova/tests/functional/api_samples/image-meta-key-put-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -False \ No newline at end of file diff --git a/nova/tests/functional/api_samples/image-metadata-get-resp.xml.tpl b/nova/tests/functional/api_samples/image-metadata-get-resp.xml.tpl deleted file mode 100644 index 8409016bf4..0000000000 --- a/nova/tests/functional/api_samples/image-metadata-get-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - nokernel - True - nokernel - x86_64 - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/image-metadata-post-req.xml.tpl b/nova/tests/functional/api_samples/image-metadata-post-req.xml.tpl deleted file mode 100644 index 6170aab5ae..0000000000 --- a/nova/tests/functional/api_samples/image-metadata-post-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - False - UpdatedImage - diff --git a/nova/tests/functional/api_samples/image-metadata-post-resp.xml.tpl b/nova/tests/functional/api_samples/image-metadata-post-resp.xml.tpl deleted file mode 100644 index 1d96bd9af5..0000000000 --- a/nova/tests/functional/api_samples/image-metadata-post-resp.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - False - nokernel - UpdatedImage - x86_64 - True - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/image-metadata-put-req.xml.tpl b/nova/tests/functional/api_samples/image-metadata-put-req.xml.tpl deleted file mode 100644 index e5f5d8991c..0000000000 --- a/nova/tests/functional/api_samples/image-metadata-put-req.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - True - Changed - diff --git a/nova/tests/functional/api_samples/image-metadata-put-resp.xml.tpl b/nova/tests/functional/api_samples/image-metadata-put-resp.xml.tpl deleted file mode 100644 index 7011871cc9..0000000000 --- a/nova/tests/functional/api_samples/image-metadata-put-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - True - Changed - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/images-details-get-resp.xml.tpl b/nova/tests/functional/api_samples/images-details-get-resp.xml.tpl deleted file mode 100644 index 2194789790..0000000000 --- a/nova/tests/functional/api_samples/images-details-get-resp.xml.tpl +++ /dev/null @@ -1,71 +0,0 @@ - - - - - nokernel - True - nokernel - x86_64 - - - - - - - - nokernel - nokernel - x86_64 - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - False - nokernel - x86_64 - - - - - - - - 155d900f-4e14-4e4c-a73d-069cbf4541e6 - None - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - nokernel - - - - - - diff --git a/nova/tests/functional/api_samples/images-details-resp.xml.tpl b/nova/tests/functional/api_samples/images-details-resp.xml.tpl deleted file mode 100644 index aa1d973b9a..0000000000 --- a/nova/tests/functional/api_samples/images-details-resp.xml.tpl +++ /dev/null @@ -1,71 +0,0 @@ - - - - - nokernel - True - nokernel - x86_64 - - - - - - - - nokernel - nokernel - x86_64 - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - False - nokernel - x86_64 - - - - - - - - 155d900f-4e14-4e4c-a73d-069cbf4541e6 - None - - - - - - - - nokernel - nokernel - - - - - - - - nokernel - nokernel - - - - - - diff --git a/nova/tests/functional/api_samples/images-list-get-resp.xml.tpl b/nova/tests/functional/api_samples/images-list-get-resp.xml.tpl deleted file mode 100644 index 71b9bfc8bf..0000000000 --- a/nova/tests/functional/api_samples/images-list-get-resp.xml.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/images-list-resp.xml.tpl b/nova/tests/functional/api_samples/images-list-resp.xml.tpl deleted file mode 100644 index 701e958926..0000000000 --- a/nova/tests/functional/api_samples/images-list-resp.xml.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/limit-get-resp.xml.tpl b/nova/tests/functional/api_samples/limit-get-resp.xml.tpl deleted file mode 100644 index ecc7b3b5da..0000000000 --- a/nova/tests/functional/api_samples/limit-get-resp.xml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-backup-server.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-backup-server.xml.tpl deleted file mode 100644 index f2f9024bd7..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-backup-server.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - Backup 1 - daily - 1 - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-inject-network-info.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-inject-network-info.xml.tpl deleted file mode 100644 index e5b71ffcdb..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-inject-network-info.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-live-migrate.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-live-migrate.xml.tpl deleted file mode 100644 index 88ead85f20..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-live-migrate.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - %(hostname)s - false - false - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-lock-server.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-lock-server.xml.tpl deleted file mode 100644 index f86b130547..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-lock-server.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-migrate.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-migrate.xml.tpl deleted file mode 100644 index 431284448d..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-migrate.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-pause.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-pause.xml.tpl deleted file mode 100644 index a37359338c..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-pause.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-network.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-network.xml.tpl deleted file mode 100644 index 6034983911..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-network.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-server-state.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-server-state.xml.tpl deleted file mode 100644 index 435c1c7d76..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-server-state.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - active - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-state.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-state.xml.tpl deleted file mode 100644 index 435c1c7d76..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-state.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - active - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-resume.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-resume.xml.tpl deleted file mode 100644 index 4d6aaa750c..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-resume.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-suspend.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-suspend.xml.tpl deleted file mode 100644 index 02aeac572a..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-suspend.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-unlock-server.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-unlock-server.xml.tpl deleted file mode 100644 index 8331e2258a..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-unlock-server.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-unpause.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-unpause.xml.tpl deleted file mode 100644 index b674f09269..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-unpause.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-admin-actions/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/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-admin-actions/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-admin-actions/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-agents/agent-post-req.xml.tpl b/nova/tests/functional/api_samples/os-agents/agent-post-req.xml.tpl deleted file mode 100644 index 5c777749a2..0000000000 --- a/nova/tests/functional/api_samples/os-agents/agent-post-req.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - %(hypervisor)s - %(os)s - %(architecture)s - %(version)s - %(md5hash)s - %(url)s - diff --git a/nova/tests/functional/api_samples/os-agents/agent-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-agents/agent-post-resp.xml.tpl deleted file mode 100644 index ecf97b91e9..0000000000 --- a/nova/tests/functional/api_samples/os-agents/agent-post-resp.xml.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - %(url)s - %(hypervisor)s - %(md5hash)s - %(version)s - %(architecture)s - %(os)s - %(agent_id)d - diff --git a/nova/tests/functional/api_samples/os-agents/agent-update-put-req.xml.tpl b/nova/tests/functional/api_samples/os-agents/agent-update-put-req.xml.tpl deleted file mode 100644 index 19751dc807..0000000000 --- a/nova/tests/functional/api_samples/os-agents/agent-update-put-req.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - %(version)s - %(url)s - %(md5hash)s - diff --git a/nova/tests/functional/api_samples/os-agents/agent-update-put-resp.xml.tpl b/nova/tests/functional/api_samples/os-agents/agent-update-put-resp.xml.tpl deleted file mode 100644 index 2c9e50572c..0000000000 --- a/nova/tests/functional/api_samples/os-agents/agent-update-put-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - %(agent_id)d - %(version)s - %(url)s - %(md5hash)s - diff --git a/nova/tests/functional/api_samples/os-agents/agents-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-agents/agents-get-resp.xml.tpl deleted file mode 100644 index fbbbdad288..0000000000 --- a/nova/tests/functional/api_samples/os-agents/agents-get-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - 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 4454134efb..0000000000 --- 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 72b1e742aa..0000000000 --- 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 4931476ae5..0000000000 --- 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 2a1bee5868..0000000000 --- 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 bc2896835f..0000000000 --- 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 04ce4fba58..0000000000 --- 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 1ff22bc0e0..0000000000 --- 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 7412dee66d..0000000000 --- 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 7f44a231cb..0000000000 --- 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 79af4a8d89..0000000000 --- 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 01245a4dbb..0000000000 --- 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 7f44a231cb..0000000000 --- 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 f926149842..0000000000 --- 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 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-aggregates/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml.tpl b/nova/tests/functional/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml.tpl deleted file mode 100644 index 772bb43d92..0000000000 --- a/nova/tests/functional/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - %(volume_id)s - - %(snapshot_id)s - %(type)s - %(new_file)s - - diff --git a/nova/tests/functional/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml.tpl b/nova/tests/functional/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml.tpl deleted file mode 100644 index 5da7d148b1..0000000000 --- a/nova/tests/functional/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml.tpl b/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml.tpl deleted file mode 100644 index 75e9b97c8c..0000000000 --- a/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - %(port_id)s - diff --git a/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml.tpl deleted file mode 100644 index b391e59733..0000000000 --- a/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - %(net_id)s - %(port_id)s - - - %(subnet_id)s - %(ip_address)s - - - %(port_state)s - %(mac_addr)s - diff --git a/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml.tpl deleted file mode 100644 index f3262e948e..0000000000 --- a/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - - %(port_state)s - - - %(subnet_id)s - %(ip_address)s - - - %(port_id)s - %(net_id)s - %(mac_addr)s - - diff --git a/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml.tpl b/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml.tpl deleted file mode 100644 index a3393448d4..0000000000 --- a/nova/tests/functional/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - %(port_state)s - - - %(subnet_id)s - %(ip_address)s - - - %(port_id)s - %(net_id)s - %(mac_addr)s - diff --git a/nova/tests/functional/api_samples/os-attach-interfaces/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-attach-interfaces/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-attach-interfaces/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-attach-interfaces/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-attach-interfaces/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-attach-interfaces/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-availability-zone/availability-zone-details-resp.xml.tpl b/nova/tests/functional/api_samples/os-availability-zone/availability-zone-details-resp.xml.tpl deleted file mode 100644 index 856a649577..0000000000 --- a/nova/tests/functional/api_samples/os-availability-zone/availability-zone-details-resp.xml.tpl +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-availability-zone/availability-zone-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-availability-zone/availability-zone-get-resp.xml.tpl deleted file mode 100644 index 1eff177dee..0000000000 --- a/nova/tests/functional/api_samples/os-availability-zone/availability-zone-get-resp.xml.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl b/nova/tests/functional/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl deleted file mode 100644 index 9c55b49cbe..0000000000 --- a/nova/tests/functional/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/nova/tests/functional/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl deleted file mode 100644 index 2ad5c102b0..0000000000 --- a/nova/tests/functional/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml.tpl deleted file mode 100644 index 962b507658..0000000000 --- a/nova/tests/functional/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - - - - - diff --git a/nova/tests/functional/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-cell-capacities/cells-capacities-resp.xml.tpl b/nova/tests/functional/api_samples/os-cell-capacities/cells-capacities-resp.xml.tpl deleted file mode 100644 index 63672b00bd..0000000000 --- a/nova/tests/functional/api_samples/os-cell-capacities/cells-capacities-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-cells/cells-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-cells/cells-get-resp.xml.tpl deleted file mode 100644 index d31a674a2f..0000000000 --- a/nova/tests/functional/api_samples/os-cells/cells-get-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-cells/cells-list-empty-resp.xml.tpl b/nova/tests/functional/api_samples/os-cells/cells-list-empty-resp.xml.tpl deleted file mode 100644 index 32fef4f048..0000000000 --- a/nova/tests/functional/api_samples/os-cells/cells-list-empty-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-cells/cells-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-cells/cells-list-resp.xml.tpl deleted file mode 100644 index 58312201f6..0000000000 --- a/nova/tests/functional/api_samples/os-cells/cells-list-resp.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-certificates/certificate-create-req.xml.tpl b/nova/tests/functional/api_samples/os-certificates/certificate-create-req.xml.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nova/tests/functional/api_samples/os-certificates/certificate-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-certificates/certificate-create-resp.xml.tpl deleted file mode 100644 index 75f2d5d7f4..0000000000 --- a/nova/tests/functional/api_samples/os-certificates/certificate-create-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-certificates/certificate-get-root-resp.xml.tpl b/nova/tests/functional/api_samples/os-certificates/certificate-get-root-resp.xml.tpl deleted file mode 100644 index bbc54284a5..0000000000 --- a/nova/tests/functional/api_samples/os-certificates/certificate-get-root-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml.tpl b/nova/tests/functional/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml.tpl deleted file mode 100644 index 34d2be9dfc..0000000000 --- a/nova/tests/functional/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - %(vpn_ip)s - %(vpn_port)s - diff --git a/nova/tests/functional/api_samples/os-cloudpipe/cloud-pipe-create-req.xml.tpl b/nova/tests/functional/api_samples/os-cloudpipe/cloud-pipe-create-req.xml.tpl deleted file mode 100644 index b0a60b896c..0000000000 --- a/nova/tests/functional/api_samples/os-cloudpipe/cloud-pipe-create-req.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/nova/tests/functional/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml.tpl deleted file mode 100644 index 63064cc51a..0000000000 --- a/nova/tests/functional/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - %(uuid)s - diff --git a/nova/tests/functional/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml.tpl deleted file mode 100644 index 63eb40be4f..0000000000 --- a/nova/tests/functional/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - %(ip)s - %(isotime)s - 22 - down - %(uuid)s - %(ip)s - %(project_id)s - - diff --git a/nova/tests/functional/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl deleted file mode 100644 index 6cd025045e..0000000000 --- a/nova/tests/functional/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-config-drive/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-config-drive/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-config-drive/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-config-drive/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-config-drive/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-config-drive/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl b/nova/tests/functional/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl deleted file mode 100644 index 1882ba835a..0000000000 --- a/nova/tests/functional/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml.tpl deleted file mode 100644 index de81f08fe8..0000000000 --- a/nova/tests/functional/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - %(id)s - %(host)s - %(port)s - %(internal_access_path)s - diff --git a/nova/tests/functional/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml.tpl b/nova/tests/functional/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml.tpl deleted file mode 100644 index b761d78b67..0000000000 --- a/nova/tests/functional/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - rdp-html5 - diff --git a/nova/tests/functional/api_samples/os-console-auth-tokens/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-console-auth-tokens/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-console-auth-tokens/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-console-auth-tokens/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-console-auth-tokens/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-console-auth-tokens/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-console-output/console-output-post-req.xml.tpl b/nova/tests/functional/api_samples/os-console-output/console-output-post-req.xml.tpl deleted file mode 100644 index af477004df..0000000000 --- a/nova/tests/functional/api_samples/os-console-output/console-output-post-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-console-output/console-output-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-console-output/console-output-post-resp.xml.tpl deleted file mode 100644 index e93d81df35..0000000000 --- a/nova/tests/functional/api_samples/os-console-output/console-output-post-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - -FAKE CONSOLE OUTPUT -ANOTHER -LAST LINE diff --git a/nova/tests/functional/api_samples/os-console-output/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-console-output/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-console-output/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-console-output/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-console-output/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-console-output/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-consoles/get-rdp-console-post-req.xml.tpl b/nova/tests/functional/api_samples/os-consoles/get-rdp-console-post-req.xml.tpl deleted file mode 100644 index b761d78b67..0000000000 --- a/nova/tests/functional/api_samples/os-consoles/get-rdp-console-post-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - rdp-html5 - diff --git a/nova/tests/functional/api_samples/os-consoles/get-rdp-console-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-consoles/get-rdp-console-post-resp.xml.tpl deleted file mode 100644 index 24fc3cd848..0000000000 --- a/nova/tests/functional/api_samples/os-consoles/get-rdp-console-post-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - rdp-html5 - %(url)s - diff --git a/nova/tests/functional/api_samples/os-consoles/get-serial-console-post-req.xml.tpl b/nova/tests/functional/api_samples/os-consoles/get-serial-console-post-req.xml.tpl deleted file mode 100644 index 71eb3ae555..0000000000 --- a/nova/tests/functional/api_samples/os-consoles/get-serial-console-post-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - serial - diff --git a/nova/tests/functional/api_samples/os-consoles/get-serial-console-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-consoles/get-serial-console-post-resp.xml.tpl deleted file mode 100644 index 1bef48769d..0000000000 --- a/nova/tests/functional/api_samples/os-consoles/get-serial-console-post-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - serial - %(url)s - diff --git a/nova/tests/functional/api_samples/os-consoles/get-spice-console-post-req.xml.tpl b/nova/tests/functional/api_samples/os-consoles/get-spice-console-post-req.xml.tpl deleted file mode 100644 index c8cd2df9f4..0000000000 --- a/nova/tests/functional/api_samples/os-consoles/get-spice-console-post-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - spice-html5 - diff --git a/nova/tests/functional/api_samples/os-consoles/get-spice-console-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-consoles/get-spice-console-post-resp.xml.tpl deleted file mode 100644 index 77e35ae5b8..0000000000 --- a/nova/tests/functional/api_samples/os-consoles/get-spice-console-post-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - spice-html5 - %(url)s - diff --git a/nova/tests/functional/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl b/nova/tests/functional/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl deleted file mode 100644 index c1f73180e8..0000000000 --- a/nova/tests/functional/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - novnc - diff --git a/nova/tests/functional/api_samples/os-consoles/get-vnc-console-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-consoles/get-vnc-console-post-resp.xml.tpl deleted file mode 100644 index d4904aa9a5..0000000000 --- a/nova/tests/functional/api_samples/os-consoles/get-vnc-console-post-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - novnc - %(url)s - diff --git a/nova/tests/functional/api_samples/os-consoles/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-consoles/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-consoles/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-consoles/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-consoles/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-consoles/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl b/nova/tests/functional/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl deleted file mode 100644 index 31928207e8..0000000000 --- a/nova/tests/functional/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-deferred-delete/restore-post-req.xml.tpl b/nova/tests/functional/api_samples/os-deferred-delete/restore-post-req.xml.tpl deleted file mode 100644 index 8a95b4fccf..0000000000 --- a/nova/tests/functional/api_samples/os-deferred-delete/restore-post-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-deferred-delete/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-deferred-delete/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-deferred-delete/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-deferred-delete/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-deferred-delete/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-deferred-delete/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-evacuate/server-evacuate-req.xml.tpl b/nova/tests/functional/api_samples/os-evacuate/server-evacuate-req.xml.tpl deleted file mode 100644 index b0471f9162..0000000000 --- a/nova/tests/functional/api_samples/os-evacuate/server-evacuate-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-evacuate/server-evacuate-resp.xml.tpl b/nova/tests/functional/api_samples/os-evacuate/server-evacuate-resp.xml.tpl deleted file mode 100644 index 2a779af6d1..0000000000 --- a/nova/tests/functional/api_samples/os-evacuate/server-evacuate-resp.xml.tpl +++ /dev/null @@ -1 +0,0 @@ -%(password)s \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-evacuate/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-evacuate/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-evacuate/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-evacuate/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-evacuate/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-evacuate/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml.tpl b/nova/tests/functional/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml.tpl deleted file mode 100644 index a86c9e5c8a..0000000000 --- a/nova/tests/functional/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/nova/tests/functional/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml.tpl deleted file mode 100644 index b3b95fdde4..0000000000 --- a/nova/tests/functional/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(password)s \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-extended-evacuate-find-host/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-extended-evacuate-find-host/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-extended-evacuate-find-host/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-extended-evacuate-find-host/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-evacuate-find-host/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-extended-evacuate-find-host/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml.tpl b/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-req.xml.tpl b/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-req.xml.tpl deleted file mode 100644 index a80147389d..0000000000 --- a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(pool)s \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml.tpl deleted file mode 100644 index e0f68ef503..0000000000 --- a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-get-resp.xml.tpl deleted file mode 100644 index e0f68ef503..0000000000 --- a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-get-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml.tpl deleted file mode 100644 index da6f0d4ce9..0000000000 --- a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml.tpl deleted file mode 100644 index bbd0b117ef..0000000000 --- a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml.tpl deleted file mode 100644 index ed2a8b0829..0000000000 --- a/nova/tests/functional/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/os-extended-networks/network-create-req.xml.tpl b/nova/tests/functional/api_samples/os-extended-networks/network-create-req.xml.tpl deleted file mode 100644 index 3cc79bd837..0000000000 --- a/nova/tests/functional/api_samples/os-extended-networks/network-create-req.xml.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - 10.20.105.0/24 - 9000 - 10.20.105.2 - False - True - 10.20.105.10 - 10.20.105.200 - diff --git a/nova/tests/functional/api_samples/os-extended-networks/network-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-networks/network-create-resp.xml.tpl deleted file mode 100644 index 3a757c5f2f..0000000000 --- a/nova/tests/functional/api_samples/os-extended-networks/network-create-resp.xml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - None - None - %(ip)s - None - None - %(id)s - None - None - %(ip)s - None - - None - None - None - False - None - %(ip)s - %(ip)s - None - 10.20.105.0/24 - None - None - None - None - None - None - None - None - 9000 - 10.20.105.2 - False - True - diff --git a/nova/tests/functional/api_samples/os-extended-networks/network-show-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-networks/network-show-resp.xml.tpl deleted file mode 100644 index 3139ca88a8..0000000000 --- a/nova/tests/functional/api_samples/os-extended-networks/network-show-resp.xml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - - br100 - 1000 - %(ip)s - eth0 - %(xmltime)s - %(id)s - None - None - %(ip)s - None - - None - 1234 - %(ip)s - False - 100 - %(ip)s - %(ip)s - False - 10.0.0.0/29 - %(ip)s - False - None - %(xmltime)s - nsokolov-desktop - None - None - None - None - %(ip)s - True - False - diff --git a/nova/tests/functional/api_samples/os-extended-networks/networks-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-networks/networks-list-resp.xml.tpl deleted file mode 100644 index 0b7f456402..0000000000 --- a/nova/tests/functional/api_samples/os-extended-networks/networks-list-resp.xml.tpl +++ /dev/null @@ -1,71 +0,0 @@ - - - - br100 - 1000 - %(ip)s - eth0 - %(xmltime)s - %(id)s - None - None - %(ip)s - None - - None - 1234 - %(ip)s - False - 100 - %(ip)s - %(ip)s - False - 10.0.0.0/29 - %(ip)s - False - None - %(xmltime)s - nsokolov-desktop - None - None - None - None - %(ip)s - True - False - - - br101 - 1001 - %(ip)s - eth0 - None - %(id)s - None - None - %(ip)s - None - - None - None - %(ip)s - False - 101 - %(ip)s - %(ip)s - False - 10.0.0.10/29 - None - False - None - %(xmltime)s - None - None - None - None - None - %(ip)s - True - False - - diff --git a/nova/tests/functional/api_samples/os-extended-quotas/quotas-update-post-req.xml.tpl b/nova/tests/functional/api_samples/os-extended-quotas/quotas-update-post-req.xml.tpl deleted file mode 100644 index 499b890f03..0000000000 --- a/nova/tests/functional/api_samples/os-extended-quotas/quotas-update-post-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - True - 45 - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-extended-quotas/quotas-update-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-quotas/quotas-update-post-resp.xml.tpl deleted file mode 100644 index b8c4c0d831..0000000000 --- a/nova/tests/functional/api_samples/os-extended-quotas/quotas-update-post-resp.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 45 - 100 - 128 - 51200 - 20 - 10 - diff --git a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl b/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl deleted file mode 100755 index fee8326e0c..0000000000 --- a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-post-req.xml.tpl deleted file mode 100755 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-extended-rescue-with-image/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-extended-rescue-with-image/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-post-resp.xml.tpl deleted file mode 100755 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-rescue-req.xml.tpl b/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-rescue-req.xml.tpl deleted file mode 100755 index 75666d81a2..0000000000 --- a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-rescue-req.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-rescue.xml.tpl b/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-rescue.xml.tpl deleted file mode 100755 index b3b95fdde4..0000000000 --- a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-rescue.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(password)s \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-extended-services-delete/services-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-services-delete/services-get-resp.xml.tpl deleted file mode 100644 index 8e87af9173..0000000000 --- a/nova/tests/functional/api_samples/os-extended-services-delete/services-get-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/nova/tests/functional/api_samples/os-extended-volumes/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-volumes/server-get-resp.xml.tpl deleted file mode 100644 index 75a8fb10cc..0000000000 --- a/nova/tests/functional/api_samples/os-extended-volumes/server-get-resp.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-extended-volumes/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-extended-volumes/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-extended-volumes/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-extended-volumes/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-volumes/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-extended-volumes/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl b/nova/tests/functional/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl deleted file mode 100644 index a2ecf018eb..0000000000 --- a/nova/tests/functional/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-fixed-ips/fixedip-post-req.xml.tpl b/nova/tests/functional/api_samples/os-fixed-ips/fixedip-post-req.xml.tpl deleted file mode 100644 index 3896b24eb6..0000000000 --- a/nova/tests/functional/api_samples/os-fixed-ips/fixedip-post-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(reserve)s diff --git a/nova/tests/functional/api_samples/os-fixed-ips/fixedips-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-fixed-ips/fixedips-get-resp.xml.tpl deleted file mode 100644 index 3e9598f347..0000000000 --- a/nova/tests/functional/api_samples/os-fixed-ips/fixedips-get-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - %(cidr)s - %(hostname)s - %(host)s -
%(address)s
- diff --git a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml.tpl b/nova/tests/functional/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml.tpl deleted file mode 100644 index 312819dadb..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - %(tenant_id)s - diff --git a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl deleted file mode 100644 index 2223052aae..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl b/nova/tests/functional/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl deleted file mode 100644 index 5714fb9d0d..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-create-req.xml.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl deleted file mode 100644 index c3a8994078..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl deleted file mode 100644 index 8ee66226a5..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl deleted file mode 100644 index 1e55ad2f95..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml.tpl b/nova/tests/functional/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml.tpl deleted file mode 100644 index 490de3e315..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - %(tenant_id)s - diff --git a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl deleted file mode 100644 index 80d1ecc48c..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl deleted file mode 100644 index ae18daba22..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml.tpl b/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml.tpl deleted file mode 100644 index c94595cad1..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - %(value1)s - %(value2)s - diff --git a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml.tpl deleted file mode 100644 index 1008b5bb0e..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - %(value2)s - %(value1)s - diff --git a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml.tpl deleted file mode 100644 index e3de59a342..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(value1)s diff --git a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml.tpl deleted file mode 100644 index 1008b5bb0e..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - %(value2)s - %(value1)s - diff --git a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml.tpl b/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml.tpl deleted file mode 100644 index 6421e59592..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - %(value1)s diff --git a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml.tpl deleted file mode 100644 index e3de59a342..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(value1)s diff --git a/nova/tests/functional/api_samples/os-flavor-manage/flavor-create-post-req.xml.tpl b/nova/tests/functional/api_samples/os-flavor-manage/flavor-create-post-req.xml.tpl deleted file mode 100644 index 764cebe8e4..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-manage/flavor-create-post-req.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - %(flavor_name)s - 1024 - 2 - 10 - %(flavor_id)s - diff --git a/nova/tests/functional/api_samples/os-flavor-manage/flavor-create-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-manage/flavor-create-post-resp.xml.tpl deleted file mode 100644 index 156ef215e6..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-manage/flavor-create-post-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl deleted file mode 100644 index d461b443ed..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl deleted file mode 100644 index ee937b974b..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml.tpl b/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml.tpl deleted file mode 100644 index a87b47670e..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl deleted file mode 100644 index d24623c555..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl deleted file mode 100644 index 9375b14b5e..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl deleted file mode 100644 index 7c9c589bef..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-post-req.xml.tpl b/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-post-req.xml.tpl deleted file mode 100644 index 5f54df5cd2..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-post-req.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-post-resp.xml.tpl deleted file mode 100644 index e8c69ecee7..0000000000 --- a/nova/tests/functional/api_samples/os-flavor-swap/flavor-swap-post-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml.tpl b/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml.tpl deleted file mode 100644 index bd62d34186..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - %(ip)s - %(dns_type)s - diff --git a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml.tpl deleted file mode 100644 index 38a659b78e..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml.tpl b/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml.tpl deleted file mode 100644 index 40866a5373..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - %(domain)s - %(scope)s - %(project)s - diff --git a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml.tpl deleted file mode 100644 index 1759c403af..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml.tpl deleted file mode 100644 index a889ef6e2c..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml.tpl deleted file mode 100644 index bf7788f94d..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml.tpl deleted file mode 100644 index e57c290cb8..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml.tpl deleted file mode 100644 index ae4b3a4bb3..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml.tpl deleted file mode 100644 index ebe0b9aa9a..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - -%(ip_range)s -%(pool)s -%(interface)s - diff --git a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml.tpl deleted file mode 100644 index db80bbfc10..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - eth0 - 192.168.1.0/24 - nova - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml.tpl deleted file mode 100644 index 27a6b0e95a..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(ip_range)s diff --git a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml.tpl deleted file mode 100644 index 3d77af334a..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -192.168.1.0/24 \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml.tpl deleted file mode 100644 index f8f78c8a23..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - - eth0 - None - None - None - nova -
10.10.10.3
- - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml.tpl deleted file mode 100644 index 082e75853e..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml.tpl +++ /dev/null @@ -1,27 +0,0 @@ - - - - eth0 - None - None - None - nova -
10.10.10.1
- - - eth0 - None - None - None - nova -
10.10.10.2
- - - eth0 - None - None - None - nova -
10.10.10.3
- - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml.tpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-create-req.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips/floating-ips-create-req.xml.tpl deleted file mode 100644 index a80147389d..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-create-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(pool)s \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips/floating-ips-create-resp.xml.tpl deleted file mode 100644 index e0f68ef503..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-create-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips/floating-ips-get-resp.xml.tpl deleted file mode 100644 index e0f68ef503..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-get-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml.tpl deleted file mode 100644 index da6f0d4ce9..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-floating-ips/floating-ips-list-resp.xml.tpl deleted file mode 100644 index bbd0b117ef..0000000000 --- a/nova/tests/functional/api_samples/os-floating-ips/floating-ips-list-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-fping/fping-get-details-resp.xml.tpl b/nova/tests/functional/api_samples/os-fping/fping-get-details-resp.xml.tpl deleted file mode 100644 index 758519b60e..0000000000 --- a/nova/tests/functional/api_samples/os-fping/fping-get-details-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - openstack - %(uuid)s - False - diff --git a/nova/tests/functional/api_samples/os-fping/fping-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-fping/fping-get-resp.xml.tpl deleted file mode 100644 index 290ad6ca68..0000000000 --- a/nova/tests/functional/api_samples/os-fping/fping-get-resp.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - openstack - %(uuid)s - False - - diff --git a/nova/tests/functional/api_samples/os-fping/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-fping/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-fping/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-fping/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-fping/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-fping/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl deleted file mode 100644 index cee28db35c..0000000000 --- a/nova/tests/functional/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-hide-server-addresses/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-hide-server-addresses/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-hide-server-addresses/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-hide-server-addresses/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-hide-server-addresses/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-hide-server-addresses/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl b/nova/tests/functional/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl deleted file mode 100644 index da0472dbcf..0000000000 --- a/nova/tests/functional/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-hide-server-addresses/servers-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-hide-server-addresses/servers-list-resp.xml.tpl deleted file mode 100644 index 03bee03a6e..0000000000 --- a/nova/tests/functional/api_samples/os-hide-server-addresses/servers-list-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/nova/tests/functional/api_samples/os-hosts/host-get-reboot.xml.tpl b/nova/tests/functional/api_samples/os-hosts/host-get-reboot.xml.tpl deleted file mode 100644 index 4f9c8e4378..0000000000 --- a/nova/tests/functional/api_samples/os-hosts/host-get-reboot.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-hosts/host-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-hosts/host-get-resp.xml.tpl deleted file mode 100644 index e162734ba3..0000000000 --- a/nova/tests/functional/api_samples/os-hosts/host-get-resp.xml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - - - (total) - 8192 - %(host_name)s - 1 - 1028 - - - (used_now) - 512 - %(host_name)s - 0 - 0 - - - (used_max) - 0 - %(host_name)s - 0 - 0 - - diff --git a/nova/tests/functional/api_samples/os-hosts/host-get-shutdown.xml.tpl b/nova/tests/functional/api_samples/os-hosts/host-get-shutdown.xml.tpl deleted file mode 100644 index d78bd32a5d..0000000000 --- a/nova/tests/functional/api_samples/os-hosts/host-get-shutdown.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-hosts/host-get-startup.xml.tpl b/nova/tests/functional/api_samples/os-hosts/host-get-startup.xml.tpl deleted file mode 100644 index 581f7cf07f..0000000000 --- a/nova/tests/functional/api_samples/os-hosts/host-get-startup.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-hosts/host-put-maintenance-req.xml.tpl b/nova/tests/functional/api_samples/os-hosts/host-put-maintenance-req.xml.tpl deleted file mode 100644 index d127a7a26b..0000000000 --- a/nova/tests/functional/api_samples/os-hosts/host-put-maintenance-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - enable - disable - diff --git a/nova/tests/functional/api_samples/os-hosts/host-put-maintenance-resp.xml.tpl b/nova/tests/functional/api_samples/os-hosts/host-put-maintenance-resp.xml.tpl deleted file mode 100644 index e9c99512b8..0000000000 --- a/nova/tests/functional/api_samples/os-hosts/host-put-maintenance-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-hosts/hosts-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-hosts/hosts-list-resp.xml.tpl deleted file mode 100644 index a031c9b661..0000000000 --- a/nova/tests/functional/api_samples/os-hosts/hosts-list-resp.xml.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml.tpl b/nova/tests/functional/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml.tpl deleted file mode 100644 index 6cfd860af5..0000000000 --- a/nova/tests/functional/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-detail-resp.xml.tpl b/nova/tests/functional/api_samples/os-hypervisors/hypervisors-detail-resp.xml.tpl deleted file mode 100644 index 1169ce1e01..0000000000 --- a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-detail-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-hypervisors/hypervisors-list-resp.xml.tpl deleted file mode 100644 index 6b7d9d7ca1..0000000000 --- a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-list-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-search-resp.xml.tpl b/nova/tests/functional/api_samples/os-hypervisors/hypervisors-search-resp.xml.tpl deleted file mode 100644 index 6b7d9d7ca1..0000000000 --- a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-search-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-servers-resp.xml.tpl b/nova/tests/functional/api_samples/os-hypervisors/hypervisors-servers-resp.xml.tpl deleted file mode 100644 index 7782732ba6..0000000000 --- a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-servers-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-show-resp.xml.tpl b/nova/tests/functional/api_samples/os-hypervisors/hypervisors-show-resp.xml.tpl deleted file mode 100644 index 090f720398..0000000000 --- a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-show-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-statistics-resp.xml.tpl b/nova/tests/functional/api_samples/os-hypervisors/hypervisors-statistics-resp.xml.tpl deleted file mode 100644 index 5d10411e3a..0000000000 --- a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-statistics-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-uptime-resp.xml.tpl b/nova/tests/functional/api_samples/os-hypervisors/hypervisors-uptime-resp.xml.tpl deleted file mode 100644 index 04219f5b5d..0000000000 --- a/nova/tests/functional/api_samples/os-hypervisors/hypervisors-uptime-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-instance-actions/instance-action-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-instance-actions/instance-action-get-resp.xml.tpl deleted file mode 100644 index 61c0ac8c76..0000000000 --- a/nova/tests/functional/api_samples/os-instance-actions/instance-action-get-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-instance-actions/instance-actions-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-instance-actions/instance-actions-list-resp.xml.tpl deleted file mode 100644 index 87a8726cce..0000000000 --- a/nova/tests/functional/api_samples/os-instance-actions/instance-actions-list-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml.tpl deleted file mode 100644 index 8b670b0c91..0000000000 --- a/nova/tests/functional/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - - 0 - 0 - - 0 - 0 - 1 - - %(hostid)s - - 0 of 1 hosts done. 0 errors. - %(xmltime)s - %(xmltime)s - 1 - diff --git a/nova/tests/functional/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml.tpl deleted file mode 100644 index 9ceb1c26c8..0000000000 --- a/nova/tests/functional/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - - 0 - 0 - - 0 - 0 - 1 - - %(hostid)s - - 0 of 1 hosts done. 0 errors. - %(xmltime)s - %(xmltime)s - 1 - diff --git a/nova/tests/functional/api_samples/os-keypairs/keypairs-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-keypairs/keypairs-get-resp.xml.tpl deleted file mode 100644 index 3442f1ed62..0000000000 --- a/nova/tests/functional/api_samples/os-keypairs/keypairs-get-resp.xml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - %(public_key)s - - %(keypair_name)s - %(fingerprint)s - fake - False - %(xmltime)s - None - None - 1 - diff --git a/nova/tests/functional/api_samples/os-keypairs/keypairs-import-post-req.xml.tpl b/nova/tests/functional/api_samples/os-keypairs/keypairs-import-post-req.xml.tpl deleted file mode 100644 index 0516de3035..0000000000 --- a/nova/tests/functional/api_samples/os-keypairs/keypairs-import-post-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - %(keypair_name)s - %(public_key)s - diff --git a/nova/tests/functional/api_samples/os-keypairs/keypairs-import-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-keypairs/keypairs-import-post-resp.xml.tpl deleted file mode 100644 index ed2543c107..0000000000 --- a/nova/tests/functional/api_samples/os-keypairs/keypairs-import-post-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - %(public_key)s - fake - %(keypair_name)s - %(fingerprint)s - diff --git a/nova/tests/functional/api_samples/os-keypairs/keypairs-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-keypairs/keypairs-list-resp.xml.tpl deleted file mode 100644 index 493bfa3161..0000000000 --- a/nova/tests/functional/api_samples/os-keypairs/keypairs-list-resp.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - - %(public_key)s - - %(keypair_name)s - %(fingerprint)s - - diff --git a/nova/tests/functional/api_samples/os-keypairs/keypairs-post-req.xml.tpl b/nova/tests/functional/api_samples/os-keypairs/keypairs-post-req.xml.tpl deleted file mode 100644 index e14935d314..0000000000 --- a/nova/tests/functional/api_samples/os-keypairs/keypairs-post-req.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - %(keypair_name)s - diff --git a/nova/tests/functional/api_samples/os-keypairs/keypairs-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-keypairs/keypairs-post-resp.xml.tpl deleted file mode 100644 index 4f041e0c9e..0000000000 --- a/nova/tests/functional/api_samples/os-keypairs/keypairs-post-resp.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - %(public_key)s - - %(private_key)s - fake - %(keypair_name)s - %(fingerprint)s - diff --git a/nova/tests/functional/api_samples/os-migrations/migrations-get.xml.tpl b/nova/tests/functional/api_samples/os-migrations/migrations-get.xml.tpl deleted file mode 100644 index f5c59c7f1b..0000000000 --- a/nova/tests/functional/api_samples/os-migrations/migrations-get.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml.tpl b/nova/tests/functional/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml.tpl deleted file mode 100644 index 1548974da3..0000000000 --- a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml.tpl deleted file mode 100644 index 2ad5c102b0..0000000000 --- a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-post-req.xml.tpl b/nova/tests/functional/api_samples/os-multiple-create/multiple-create-post-req.xml.tpl deleted file mode 100644 index 7ac9b23d67..0000000000 --- a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-post-req.xml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-multiple-create/multiple-create-post-resp.xml.tpl deleted file mode 100644 index e5ba2cc56e..0000000000 --- a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-post-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-networks-associate/network-associate-host-req.xml.tpl b/nova/tests/functional/api_samples/os-networks-associate/network-associate-host-req.xml.tpl deleted file mode 100644 index 7c96c96a12..0000000000 --- a/nova/tests/functional/api_samples/os-networks-associate/network-associate-host-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(host)s diff --git a/nova/tests/functional/api_samples/os-networks-associate/network-disassociate-host-req.xml.tpl b/nova/tests/functional/api_samples/os-networks-associate/network-disassociate-host-req.xml.tpl deleted file mode 100644 index 910504a44a..0000000000 --- a/nova/tests/functional/api_samples/os-networks-associate/network-disassociate-host-req.xml.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/nova/tests/functional/api_samples/os-networks-associate/network-disassociate-project-req.xml.tpl b/nova/tests/functional/api_samples/os-networks-associate/network-disassociate-project-req.xml.tpl deleted file mode 100644 index d4162c19e0..0000000000 --- a/nova/tests/functional/api_samples/os-networks-associate/network-disassociate-project-req.xml.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/nova/tests/functional/api_samples/os-networks-associate/network-disassociate-req.xml.tpl b/nova/tests/functional/api_samples/os-networks-associate/network-disassociate-req.xml.tpl deleted file mode 100644 index c26f7b61a8..0000000000 --- a/nova/tests/functional/api_samples/os-networks-associate/network-disassociate-req.xml.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/nova/tests/functional/api_samples/os-networks/network-add-req.xml.tpl b/nova/tests/functional/api_samples/os-networks/network-add-req.xml.tpl deleted file mode 100644 index 9e5822a9e8..0000000000 --- a/nova/tests/functional/api_samples/os-networks/network-add-req.xml.tpl +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/nova/tests/functional/api_samples/os-networks/network-create-req.xml.tpl b/nova/tests/functional/api_samples/os-networks/network-create-req.xml.tpl deleted file mode 100644 index d5222f9e8f..0000000000 --- a/nova/tests/functional/api_samples/os-networks/network-create-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - 10.20.105.0/24 - diff --git a/nova/tests/functional/api_samples/os-networks/network-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-networks/network-create-resp.xml.tpl deleted file mode 100644 index d709952cda..0000000000 --- a/nova/tests/functional/api_samples/os-networks/network-create-resp.xml.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - None - None - %(ip)s - None - None - %(id)s - None - None - %(ip)s - None - - None - None - None - False - None - %(ip)s - %(ip)s - None - 10.20.105.0/24 - None - None - None - None - None - None - None - None - diff --git a/nova/tests/functional/api_samples/os-networks/network-show-resp.xml.tpl b/nova/tests/functional/api_samples/os-networks/network-show-resp.xml.tpl deleted file mode 100644 index aeab222391..0000000000 --- a/nova/tests/functional/api_samples/os-networks/network-show-resp.xml.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - br100 - 1000 - %(ip)s - eth0 - %(xmltime)s - %(id)s - None - None - %(ip)s - None - - None - 1234 - %(ip)s - False - 100 - %(ip)s - %(ip)s - False - 10.0.0.0/29 - %(ip)s - False - None - %(xmltime)s - nsokolov-desktop - None - None - None - diff --git a/nova/tests/functional/api_samples/os-networks/networks-disassociate-req.xml.tpl b/nova/tests/functional/api_samples/os-networks/networks-disassociate-req.xml.tpl deleted file mode 100644 index 63c0300904..0000000000 --- a/nova/tests/functional/api_samples/os-networks/networks-disassociate-req.xml.tpl +++ /dev/null @@ -1 +0,0 @@ -None diff --git a/nova/tests/functional/api_samples/os-networks/networks-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-networks/networks-list-resp.xml.tpl deleted file mode 100644 index 7ac19a8137..0000000000 --- a/nova/tests/functional/api_samples/os-networks/networks-list-resp.xml.tpl +++ /dev/null @@ -1,63 +0,0 @@ - - - - br100 - 1000 - %(ip)s - eth0 - %(xmltime)s - %(id)s - None - None - %(ip)s - None - - None - 1234 - %(ip)s - False - 100 - %(ip)s - %(ip)s - False - 10.0.0.0/29 - %(ip)s - False - None - %(xmltime)s - nsokolov-desktop - None - None - None - - - br101 - 1001 - %(ip)s - eth0 - None - %(id)s - None - None - %(ip)s - None - - None - None - %(ip)s - False - 101 - %(ip)s - %(ip)s - False - 10.0.0.10/29 - None - False - None - %(xmltime)s - None - None - None - None - - diff --git a/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl b/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl deleted file mode 100644 index 254745649c..0000000000 --- a/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml.tpl b/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml.tpl deleted file mode 100644 index 6d469d40ea..0000000000 --- a/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/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-preserve-ephemeral-rebuild/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml.tpl deleted file mode 100644 index fb8e7992a5..0000000000 --- a/nova/tests/functional/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - diff --git a/nova/tests/functional/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml.tpl b/nova/tests/functional/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml.tpl deleted file mode 100644 index 150fb6a42a..0000000000 --- a/nova/tests/functional/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - 50 - 10 - -1 - 10240 - 255 - 5 - 50 - 100 - 128 - 51200 - 20 - 10 - diff --git a/nova/tests/functional/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml.tpl deleted file mode 100644 index cd674a24da..0000000000 --- a/nova/tests/functional/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - 50 - 10 - -1 - 10240 - 255 - 5 - 50 - 100 - 128 - 51200 - 20 - 10 - diff --git a/nova/tests/functional/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml.tpl deleted file mode 100644 index f56987563c..0000000000 --- a/nova/tests/functional/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - diff --git a/nova/tests/functional/api_samples/os-quota-sets/quotas-show-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-quota-sets/quotas-show-get-resp.xml.tpl deleted file mode 100644 index f56987563c..0000000000 --- a/nova/tests/functional/api_samples/os-quota-sets/quotas-show-get-resp.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - diff --git a/nova/tests/functional/api_samples/os-quota-sets/quotas-update-post-req.xml.tpl b/nova/tests/functional/api_samples/os-quota-sets/quotas-update-post-req.xml.tpl deleted file mode 100644 index 596ce56ac3..0000000000 --- a/nova/tests/functional/api_samples/os-quota-sets/quotas-update-post-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - 45 - diff --git a/nova/tests/functional/api_samples/os-quota-sets/quotas-update-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-quota-sets/quotas-update-post-resp.xml.tpl deleted file mode 100644 index 91ac3a0dda..0000000000 --- a/nova/tests/functional/api_samples/os-quota-sets/quotas-update-post-resp.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 45 - diff --git a/nova/tests/functional/api_samples/os-rescue/server-get-resp-rescue.xml.tpl b/nova/tests/functional/api_samples/os-rescue/server-get-resp-rescue.xml.tpl deleted file mode 100644 index 5b134dcee0..0000000000 --- a/nova/tests/functional/api_samples/os-rescue/server-get-resp-rescue.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl b/nova/tests/functional/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl deleted file mode 100644 index 145dd0be28..0000000000 --- a/nova/tests/functional/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-rescue/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-rescue/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-rescue/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-rescue/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-rescue/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-rescue/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-rescue/server-rescue-req.xml.tpl b/nova/tests/functional/api_samples/os-rescue/server-rescue-req.xml.tpl deleted file mode 100644 index 09acae072a..0000000000 --- a/nova/tests/functional/api_samples/os-rescue/server-rescue-req.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-rescue/server-rescue.xml.tpl b/nova/tests/functional/api_samples/os-rescue/server-rescue.xml.tpl deleted file mode 100644 index b3b95fdde4..0000000000 --- a/nova/tests/functional/api_samples/os-rescue/server-rescue.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(password)s \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-rescue/server-unrescue-req.xml.tpl b/nova/tests/functional/api_samples/os-rescue/server-unrescue-req.xml.tpl deleted file mode 100644 index 6a87f8fb21..0000000000 --- a/nova/tests/functional/api_samples/os-rescue/server-unrescue-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml.tpl b/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml.tpl deleted file mode 100644 index daee122905..0000000000 --- a/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - TCP - 80 - 80 - 10.10.10.0/24 - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml.tpl deleted file mode 100644 index 9e700969ff..0000000000 --- a/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - TCP - 80 - 80 - - 10.10.10.0/24 - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml.tpl deleted file mode 100644 index f009bf80f1..0000000000 --- a/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - - TCP - 80 - 80 - - 10.10.10.0/24 - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml.tpl b/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml.tpl deleted file mode 100644 index 9181abd387..0000000000 --- a/nova/tests/functional/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - 80 - 80 - TCP - - 10.10.10.0/24 - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-security-groups/security-group-add-post-req.xml.tpl b/nova/tests/functional/api_samples/os-security-groups/security-group-add-post-req.xml.tpl deleted file mode 100644 index 7540245bc3..0000000000 --- a/nova/tests/functional/api_samples/os-security-groups/security-group-add-post-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - %(group_name)s - diff --git a/nova/tests/functional/api_samples/os-security-groups/security-group-post-req.xml.tpl b/nova/tests/functional/api_samples/os-security-groups/security-group-post-req.xml.tpl deleted file mode 100644 index c62b14c495..0000000000 --- a/nova/tests/functional/api_samples/os-security-groups/security-group-post-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - description - - diff --git a/nova/tests/functional/api_samples/os-security-groups/security-group-remove-post-req.xml.tpl b/nova/tests/functional/api_samples/os-security-groups/security-group-remove-post-req.xml.tpl deleted file mode 100644 index 9a64a5debc..0000000000 --- a/nova/tests/functional/api_samples/os-security-groups/security-group-remove-post-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - %(group_name)s - diff --git a/nova/tests/functional/api_samples/os-security-groups/security-groups-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-security-groups/security-groups-create-resp.xml.tpl deleted file mode 100644 index c641fd60fc..0000000000 --- a/nova/tests/functional/api_samples/os-security-groups/security-groups-create-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - description - - - diff --git a/nova/tests/functional/api_samples/os-security-groups/security-groups-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-security-groups/security-groups-get-resp.xml.tpl deleted file mode 100644 index 2b19797101..0000000000 --- a/nova/tests/functional/api_samples/os-security-groups/security-groups-get-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - default - - diff --git a/nova/tests/functional/api_samples/os-security-groups/security-groups-list-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-security-groups/security-groups-list-get-resp.xml.tpl deleted file mode 100644 index 8f6e201bdd..0000000000 --- a/nova/tests/functional/api_samples/os-security-groups/security-groups-list-get-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - default - - - diff --git a/nova/tests/functional/api_samples/os-security-groups/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-security-groups/server-post-req.xml.tpl deleted file mode 100644 index 4f0444219c..0000000000 --- a/nova/tests/functional/api_samples/os-security-groups/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-security-groups/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-security-groups/server-post-resp.xml.tpl deleted file mode 100644 index 1ca430955b..0000000000 --- a/nova/tests/functional/api_samples/os-security-groups/server-post-resp.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-security-groups/server-security-groups-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-security-groups/server-security-groups-list-resp.xml.tpl deleted file mode 100644 index 8f6e201bdd..0000000000 --- a/nova/tests/functional/api_samples/os-security-groups/server-security-groups-list-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - default - - - diff --git a/nova/tests/functional/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml.tpl deleted file mode 100644 index 776419f82f..0000000000 --- a/nova/tests/functional/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - - 524288 - 5778432 - 26701 - 0 - 0 - 2070139 - 262144 - 488 - 140208 - 0 - 662 - 0 - 17300000000 - 112 - -1 - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-server-diagnostics/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-server-diagnostics/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-server-diagnostics/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-server-diagnostics/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-diagnostics/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-server-diagnostics/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-server-external-events/event-create-req.xml.tpl b/nova/tests/functional/api_samples/os-server-external-events/event-create-req.xml.tpl deleted file mode 100644 index a9029857cf..0000000000 --- a/nova/tests/functional/api_samples/os-server-external-events/event-create-req.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - - %(name)s - %(tag)s - %(status)s - %(uuid)s - - diff --git a/nova/tests/functional/api_samples/os-server-external-events/event-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-external-events/event-create-resp.xml.tpl deleted file mode 100644 index 24cf59ccba..0000000000 --- a/nova/tests/functional/api_samples/os-server-external-events/event-create-resp.xml.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - %(status)s - %(tag)s - %(name)s - %(uuid)s - 200 - - diff --git a/nova/tests/functional/api_samples/os-server-external-events/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-server-external-events/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-server-external-events/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-server-external-events/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-external-events/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-server-external-events/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/limit-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-group-quotas/limit-get-resp.xml.tpl deleted file mode 100644 index 91fd5e0b9f..0000000000 --- a/nova/tests/functional/api_samples/os-server-group-quotas/limit-get-resp.xml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml.tpl deleted file mode 100644 index 5951360f60..0000000000 --- a/nova/tests/functional/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - 10 - 10 - diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml.tpl b/nova/tests/functional/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml.tpl deleted file mode 100644 index e32e3d44c1..0000000000 --- a/nova/tests/functional/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - 50 - 10 - -1 - 10240 - 255 - 5 - 50 - 100 - 128 - 51200 - 20 - 10 - 10 - 10 - diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml.tpl deleted file mode 100644 index d0c34e50a6..0000000000 --- a/nova/tests/functional/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - 50 - 10 - -1 - 10240 - 255 - 5 - 50 - 100 - 128 - 51200 - 20 - 10 - 10 - 10 - diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml.tpl deleted file mode 100644 index e6076286ca..0000000000 --- a/nova/tests/functional/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - 10 - 10 - diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/quotas-show-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-group-quotas/quotas-show-get-resp.xml.tpl deleted file mode 100644 index e6076286ca..0000000000 --- a/nova/tests/functional/api_samples/os-server-group-quotas/quotas-show-get-resp.xml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - 10 - 10 - diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/quotas-update-post-req.xml.tpl b/nova/tests/functional/api_samples/os-server-group-quotas/quotas-update-post-req.xml.tpl deleted file mode 100644 index 596ce56ac3..0000000000 --- a/nova/tests/functional/api_samples/os-server-group-quotas/quotas-update-post-req.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - 45 - diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/quotas-update-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-group-quotas/quotas-update-post-resp.xml.tpl deleted file mode 100644 index dfaddfd969..0000000000 --- a/nova/tests/functional/api_samples/os-server-group-quotas/quotas-update-post-resp.xml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 45 - 10 - 10 - diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/usedlimits-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-group-quotas/usedlimits-get-resp.xml.tpl deleted file mode 100644 index 4b4ea91539..0000000000 --- a/nova/tests/functional/api_samples/os-server-group-quotas/usedlimits-get-resp.xml.tpl +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-server-groups/server-groups-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-groups/server-groups-get-resp.xml.tpl deleted file mode 100644 index dc4651aab7..0000000000 --- a/nova/tests/functional/api_samples/os-server-groups/server-groups-get-resp.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - anti-affinity - - - - diff --git a/nova/tests/functional/api_samples/os-server-groups/server-groups-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-groups/server-groups-list-resp.xml.tpl deleted file mode 100644 index bda7562118..0000000000 --- a/nova/tests/functional/api_samples/os-server-groups/server-groups-list-resp.xml.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - - anti-affinity - - - - - diff --git a/nova/tests/functional/api_samples/os-server-groups/server-groups-post-req.xml.tpl b/nova/tests/functional/api_samples/os-server-groups/server-groups-post-req.xml.tpl deleted file mode 100644 index abe8459549..0000000000 --- a/nova/tests/functional/api_samples/os-server-groups/server-groups-post-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - anti-affinity - - diff --git a/nova/tests/functional/api_samples/os-server-groups/server-groups-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-groups/server-groups-post-resp.xml.tpl deleted file mode 100644 index dc4651aab7..0000000000 --- a/nova/tests/functional/api_samples/os-server-groups/server-groups-post-resp.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - anti-affinity - - - - diff --git a/nova/tests/functional/api_samples/os-server-list-multi-status/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-server-list-multi-status/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-server-list-multi-status/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-server-list-multi-status/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-list-multi-status/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-server-list-multi-status/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-server-list-multi-status/servers-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-list-multi-status/servers-list-resp.xml.tpl deleted file mode 100644 index 03bee03a6e..0000000000 --- a/nova/tests/functional/api_samples/os-server-list-multi-status/servers-list-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/nova/tests/functional/api_samples/os-server-password/get-password-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-password/get-password-resp.xml.tpl deleted file mode 100644 index 046eed30fb..0000000000 --- a/nova/tests/functional/api_samples/os-server-password/get-password-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -%(encrypted_password)s diff --git a/nova/tests/functional/api_samples/os-server-password/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-server-password/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-server-password/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-server-password/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-password/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-server-password/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-server-sort-keys/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-server-sort-keys/server-post-req.xml.tpl deleted file mode 100644 index 10370edc57..0000000000 --- a/nova/tests/functional/api_samples/os-server-sort-keys/server-post-req.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/nova/tests/functional/api_samples/os-server-sort-keys/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-sort-keys/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-server-sort-keys/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-server-sort-keys/server-sort-keys-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-sort-keys/server-sort-keys-list-resp.xml.tpl deleted file mode 100644 index 03bee03a6e..0000000000 --- a/nova/tests/functional/api_samples/os-server-sort-keys/server-sort-keys-list-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/nova/tests/functional/api_samples/os-server-start-stop/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-server-start-stop/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-server-start-stop/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-server-start-stop/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-server-start-stop/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-server-start-stop/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-server-start-stop/server_start_stop.xml.tpl b/nova/tests/functional/api_samples/os-server-start-stop/server_start_stop.xml.tpl deleted file mode 100644 index 35cc3c2045..0000000000 --- a/nova/tests/functional/api_samples/os-server-start-stop/server_start_stop.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -<%(action)s/> diff --git a/nova/tests/functional/api_samples/os-services/service-disable-log-put-req.xml.tpl b/nova/tests/functional/api_samples/os-services/service-disable-log-put-req.xml.tpl deleted file mode 100644 index a1ffd7e205..0000000000 --- a/nova/tests/functional/api_samples/os-services/service-disable-log-put-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-services/service-disable-log-put-resp.xml.tpl b/nova/tests/functional/api_samples/os-services/service-disable-log-put-resp.xml.tpl deleted file mode 100644 index f7255d3851..0000000000 --- a/nova/tests/functional/api_samples/os-services/service-disable-log-put-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-services/service-disable-put-req.xml.tpl b/nova/tests/functional/api_samples/os-services/service-disable-put-req.xml.tpl deleted file mode 100644 index fc297bcd34..0000000000 --- a/nova/tests/functional/api_samples/os-services/service-disable-put-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-services/service-disable-put-resp.xml.tpl b/nova/tests/functional/api_samples/os-services/service-disable-put-resp.xml.tpl deleted file mode 100644 index cc03298c53..0000000000 --- a/nova/tests/functional/api_samples/os-services/service-disable-put-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-services/service-enable-put-req.xml.tpl b/nova/tests/functional/api_samples/os-services/service-enable-put-req.xml.tpl deleted file mode 100644 index fc297bcd34..0000000000 --- a/nova/tests/functional/api_samples/os-services/service-enable-put-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-services/service-enable-put-resp.xml.tpl b/nova/tests/functional/api_samples/os-services/service-enable-put-resp.xml.tpl deleted file mode 100644 index 3cbf51b778..0000000000 --- a/nova/tests/functional/api_samples/os-services/service-enable-put-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-services/services-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-services/services-get-resp.xml.tpl deleted file mode 100644 index 365f02e573..0000000000 --- a/nova/tests/functional/api_samples/os-services/services-get-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/nova/tests/functional/api_samples/os-services/services-list-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-services/services-list-get-resp.xml.tpl deleted file mode 100644 index 1c6b0113b7..0000000000 --- a/nova/tests/functional/api_samples/os-services/services-list-get-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-shelve/os-shelve-offload.xml.tpl b/nova/tests/functional/api_samples/os-shelve/os-shelve-offload.xml.tpl deleted file mode 100644 index 41d18bdac0..0000000000 --- a/nova/tests/functional/api_samples/os-shelve/os-shelve-offload.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - <%(action)s/> diff --git a/nova/tests/functional/api_samples/os-shelve/os-shelve.xml.tpl b/nova/tests/functional/api_samples/os-shelve/os-shelve.xml.tpl deleted file mode 100644 index 41d18bdac0..0000000000 --- a/nova/tests/functional/api_samples/os-shelve/os-shelve.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - <%(action)s/> diff --git a/nova/tests/functional/api_samples/os-shelve/os-unshelve.xml.tpl b/nova/tests/functional/api_samples/os-shelve/os-unshelve.xml.tpl deleted file mode 100644 index 41d18bdac0..0000000000 --- a/nova/tests/functional/api_samples/os-shelve/os-unshelve.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - <%(action)s/> diff --git a/nova/tests/functional/api_samples/os-shelve/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-shelve/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-shelve/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-shelve/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-shelve/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-shelve/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-simple-tenant-usage/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-simple-tenant-usage/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-simple-tenant-usage/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-simple-tenant-usage/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl b/nova/tests/functional/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl deleted file mode 100644 index 014c2f9d64..0000000000 --- a/nova/tests/functional/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - openstack - 1.0 - 1.0 - 512.0 - 1.0 - %(xmltime)s - %(xmltime)s - - - %(uuid)s - new-server-test - 1.0 - 512 - 1 - 1 - openstack - m1.tiny - %(xmltime)s - None - active - 3600 - - - diff --git a/nova/tests/functional/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl b/nova/tests/functional/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl deleted file mode 100644 index b1bb63f1c4..0000000000 --- a/nova/tests/functional/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - openstack - 1.0 - 1.0 - 512.0 - 1.0 - %(xmltime)s - %(xmltime)s - - - diff --git a/nova/tests/functional/api_samples/os-tenant-networks/networks-list-res.xml.tpl b/nova/tests/functional/api_samples/os-tenant-networks/networks-list-res.xml.tpl deleted file mode 100644 index 0562ebae7c..0000000000 --- a/nova/tests/functional/api_samples/os-tenant-networks/networks-list-res.xml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - 10.0.0.0/29 - %(id)s - - - - 10.0.0.8/29 - %(id)s - - - diff --git a/nova/tests/functional/api_samples/os-tenant-networks/networks-post-req.xml.tpl b/nova/tests/functional/api_samples/os-tenant-networks/networks-post-req.xml.tpl deleted file mode 100644 index 0493de3872..0000000000 --- a/nova/tests/functional/api_samples/os-tenant-networks/networks-post-req.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - 172.0.0.0/24 - 1 - 1 - 255 - diff --git a/nova/tests/functional/api_samples/os-tenant-networks/networks-post-res.xml.tpl b/nova/tests/functional/api_samples/os-tenant-networks/networks-post-res.xml.tpl deleted file mode 100644 index 9c6c2f28b2..0000000000 --- a/nova/tests/functional/api_samples/os-tenant-networks/networks-post-res.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - 172.0.0.0/24 - %(id)s - - diff --git a/nova/tests/functional/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml.tpl deleted file mode 100644 index 9f6a2d9f7a..0000000000 --- a/nova/tests/functional/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl deleted file mode 100644 index 9f6a2d9f7a..0000000000 --- a/nova/tests/functional/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-user-data/userdata-post-req.xml.tpl b/nova/tests/functional/api_samples/os-user-data/userdata-post-req.xml.tpl deleted file mode 100644 index 22ec4d5c5f..0000000000 --- a/nova/tests/functional/api_samples/os-user-data/userdata-post-req.xml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - %(user_data)s - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/nova/tests/functional/api_samples/os-user-data/userdata-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-user-data/userdata-post-resp.xml.tpl deleted file mode 100644 index 2ad5c102b0..0000000000 --- a/nova/tests/functional/api_samples/os-user-data/userdata-post-resp.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-user-quotas/user-quotas-show-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-user-quotas/user-quotas-show-get-resp.xml.tpl deleted file mode 100644 index f56987563c..0000000000 --- a/nova/tests/functional/api_samples/os-user-quotas/user-quotas-show-get-resp.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - diff --git a/nova/tests/functional/api_samples/os-user-quotas/user-quotas-update-post-req.xml.tpl b/nova/tests/functional/api_samples/os-user-quotas/user-quotas-update-post-req.xml.tpl deleted file mode 100644 index c5084d44e6..0000000000 --- a/nova/tests/functional/api_samples/os-user-quotas/user-quotas-update-post-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - True - 9 - diff --git a/nova/tests/functional/api_samples/os-user-quotas/user-quotas-update-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-user-quotas/user-quotas-update-post-resp.xml.tpl deleted file mode 100644 index 43c36c7da3..0000000000 --- a/nova/tests/functional/api_samples/os-user-quotas/user-quotas-update-post-resp.xml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 9 - 100 - 128 - 51200 - 20 - 10 - diff --git a/nova/tests/functional/api_samples/os-virtual-interfaces/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-virtual-interfaces/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-virtual-interfaces/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-virtual-interfaces/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-virtual-interfaces/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-virtual-interfaces/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-virtual-interfaces/vifs-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-virtual-interfaces/vifs-list-resp.xml.tpl deleted file mode 100644 index 74d0c6f394..0000000000 --- a/nova/tests/functional/api_samples/os-virtual-interfaces/vifs-list-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-volume-attachment-update/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-volume-attachment-update/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-volume-attachment-update/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-volume-attachment-update/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-volume-attachment-update/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-volume-attachment-update/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-volume-attachment-update/update-volume-req.xml.tpl b/nova/tests/functional/api_samples/os-volume-attachment-update/update-volume-req.xml.tpl deleted file mode 100644 index ffb20ad1ea..0000000000 --- a/nova/tests/functional/api_samples/os-volume-attachment-update/update-volume-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-volumes/attach-volume-to-server-req.xml.tpl b/nova/tests/functional/api_samples/os-volumes/attach-volume-to-server-req.xml.tpl deleted file mode 100644 index ffb20ad1ea..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/attach-volume-to-server-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-volumes/attach-volume-to-server-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/attach-volume-to-server-resp.xml.tpl deleted file mode 100644 index efad2fd02a..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/attach-volume-to-server-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-volumes/list-volume-attachments-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/list-volume-attachments-resp.xml.tpl deleted file mode 100644 index 351646d81e..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/list-volume-attachments-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/functional/api_samples/os-volumes/os-volumes-detail-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/os-volumes-detail-resp.xml.tpl deleted file mode 100644 index bd8f324ee0..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/os-volumes-detail-resp.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-volumes/os-volumes-get-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/os-volumes-get-resp.xml.tpl deleted file mode 100644 index cb3c5edf90..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/os-volumes-get-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/nova/tests/functional/api_samples/os-volumes/os-volumes-index-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/os-volumes-index-resp.xml.tpl deleted file mode 100644 index bd8f324ee0..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/os-volumes-index-resp.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/nova/tests/functional/api_samples/os-volumes/os-volumes-post-req.xml.tpl b/nova/tests/functional/api_samples/os-volumes/os-volumes-post-req.xml.tpl deleted file mode 100644 index bb115cc61b..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/os-volumes-post-req.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-volumes/os-volumes-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/os-volumes-post-resp.xml.tpl deleted file mode 100644 index cb3c5edf90..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/os-volumes-post-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/nova/tests/functional/api_samples/os-volumes/server-post-req.xml.tpl b/nova/tests/functional/api_samples/os-volumes/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/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-volumes/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-volumes/snapshot-create-req.xml.tpl b/nova/tests/functional/api_samples/os-volumes/snapshot-create-req.xml.tpl deleted file mode 100644 index a5b670bc2f..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/snapshot-create-req.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - %(snapshot_name)s - %(description)s - %(volume_id)s - false - diff --git a/nova/tests/functional/api_samples/os-volumes/snapshot-create-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/snapshot-create-resp.xml.tpl deleted file mode 100644 index 78268c822c..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/snapshot-create-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-volumes/snapshots-detail-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/snapshots-detail-resp.xml.tpl deleted file mode 100644 index 730921f4cf..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/snapshots-detail-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-volumes/snapshots-list-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/snapshots-list-resp.xml.tpl deleted file mode 100644 index 730921f4cf..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/snapshots-list-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/os-volumes/snapshots-show-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/snapshots-show-resp.xml.tpl deleted file mode 100644 index c42bf41b3c..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/snapshots-show-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/os-volumes/volume-attachment-detail-resp.xml.tpl b/nova/tests/functional/api_samples/os-volumes/volume-attachment-detail-resp.xml.tpl deleted file mode 100644 index 45fd199793..0000000000 --- a/nova/tests/functional/api_samples/os-volumes/volume-attachment-detail-resp.xml.tpl +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/server-action-changepassword.xml.tpl b/nova/tests/functional/api_samples/server-action-changepassword.xml.tpl deleted file mode 100644 index 6c343024e2..0000000000 --- a/nova/tests/functional/api_samples/server-action-changepassword.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/server-action-confirmresize.xml.tpl b/nova/tests/functional/api_samples/server-action-confirmresize.xml.tpl deleted file mode 100644 index 18f07bd67b..0000000000 --- a/nova/tests/functional/api_samples/server-action-confirmresize.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/server-action-createimage.xml.tpl b/nova/tests/functional/api_samples/server-action-createimage.xml.tpl deleted file mode 100644 index aa1eccf8a5..0000000000 --- a/nova/tests/functional/api_samples/server-action-createimage.xml.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - %(meta_val)s - - diff --git a/nova/tests/functional/api_samples/server-action-reboot.xml.tpl b/nova/tests/functional/api_samples/server-action-reboot.xml.tpl deleted file mode 100644 index d4cfe198c7..0000000000 --- a/nova/tests/functional/api_samples/server-action-reboot.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/server-action-rebuild-resp.xml.tpl b/nova/tests/functional/api_samples/server-action-rebuild-resp.xml.tpl deleted file mode 100644 index 254745649c..0000000000 --- a/nova/tests/functional/api_samples/server-action-rebuild-resp.xml.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/server-action-rebuild.xml.tpl b/nova/tests/functional/api_samples/server-action-rebuild.xml.tpl deleted file mode 100644 index 84f0b98961..0000000000 --- a/nova/tests/functional/api_samples/server-action-rebuild.xml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/nova/tests/functional/api_samples/server-action-resize.xml.tpl b/nova/tests/functional/api_samples/server-action-resize.xml.tpl deleted file mode 100644 index cbe49ea59a..0000000000 --- a/nova/tests/functional/api_samples/server-action-resize.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/server-action-revertresize.xml.tpl b/nova/tests/functional/api_samples/server-action-revertresize.xml.tpl deleted file mode 100644 index 5c13bbdc0c..0000000000 --- a/nova/tests/functional/api_samples/server-action-revertresize.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/nova/tests/functional/api_samples/server-get-resp.xml.tpl b/nova/tests/functional/api_samples/server-get-resp.xml.tpl deleted file mode 100644 index cee28db35c..0000000000 --- a/nova/tests/functional/api_samples/server-get-resp.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - diff --git a/nova/tests/functional/api_samples/server-ips-network-resp.xml.tpl b/nova/tests/functional/api_samples/server-ips-network-resp.xml.tpl deleted file mode 100644 index 153dca9b54..0000000000 --- a/nova/tests/functional/api_samples/server-ips-network-resp.xml.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/functional/api_samples/server-ips-resp.xml.tpl b/nova/tests/functional/api_samples/server-ips-resp.xml.tpl deleted file mode 100644 index 62d804b2af..0000000000 --- a/nova/tests/functional/api_samples/server-ips-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/server-metadata-all-req.xml.tpl b/nova/tests/functional/api_samples/server-metadata-all-req.xml.tpl deleted file mode 100644 index e742706736..0000000000 --- a/nova/tests/functional/api_samples/server-metadata-all-req.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - %(value)s - diff --git a/nova/tests/functional/api_samples/server-metadata-all-resp.xml.tpl b/nova/tests/functional/api_samples/server-metadata-all-resp.xml.tpl deleted file mode 100644 index e742706736..0000000000 --- a/nova/tests/functional/api_samples/server-metadata-all-resp.xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - - - %(value)s - diff --git a/nova/tests/functional/api_samples/server-metadata-req.xml.tpl b/nova/tests/functional/api_samples/server-metadata-req.xml.tpl deleted file mode 100644 index fa9d6ad480..0000000000 --- a/nova/tests/functional/api_samples/server-metadata-req.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - -%(value)s diff --git a/nova/tests/functional/api_samples/server-metadata-resp.xml.tpl b/nova/tests/functional/api_samples/server-metadata-resp.xml.tpl deleted file mode 100644 index fa9d6ad480..0000000000 --- a/nova/tests/functional/api_samples/server-metadata-resp.xml.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - -%(value)s diff --git a/nova/tests/functional/api_samples/server-post-req.xml.tpl b/nova/tests/functional/api_samples/server-post-req.xml.tpl deleted file mode 100644 index f926149842..0000000000 --- a/nova/tests/functional/api_samples/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/server-post-resp.xml.tpl b/nova/tests/functional/api_samples/server-post-resp.xml.tpl deleted file mode 100644 index 3bb13e69bd..0000000000 --- a/nova/tests/functional/api_samples/server-post-resp.xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/nova/tests/functional/api_samples/servers-details-resp.xml.tpl b/nova/tests/functional/api_samples/servers-details-resp.xml.tpl deleted file mode 100644 index da0472dbcf..0000000000 --- a/nova/tests/functional/api_samples/servers-details-resp.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - diff --git a/nova/tests/functional/api_samples/servers-list-resp.xml.tpl b/nova/tests/functional/api_samples/servers-list-resp.xml.tpl deleted file mode 100644 index 03bee03a6e..0000000000 --- a/nova/tests/functional/api_samples/servers-list-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/nova/tests/functional/api_samples/versions-get-resp.xml.tpl b/nova/tests/functional/api_samples/versions-get-resp.xml.tpl deleted file mode 100644 index 09c4a52f9e..0000000000 --- a/nova/tests/functional/api_samples/versions-get-resp.xml.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/nova/tests/functional/test_api_samples.py b/nova/tests/functional/test_api_samples.py index 29bb230e60..28910162d4 100644 --- a/nova/tests/functional/test_api_samples.py +++ b/nova/tests/functional/test_api_samples.py @@ -22,7 +22,6 @@ import re import urllib import uuid as uuid_lib -from lxml import etree import mock from oslo.config import cfg from oslo.serialization import jsonutils @@ -169,11 +168,6 @@ class VersionsSampleJsonTest(ApiSampleTestBaseV2): self._verify_response('versions-get-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class VersionsSampleXmlTest(VersionsSampleJsonTest): - ctype = 'xml' - - class ServersSampleBase(ApiSampleTestBaseV2): def _post_server(self): subs = { @@ -217,31 +211,16 @@ class ServersSampleJsonTest(ServersSampleBase): self._verify_response('servers-details-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServersSampleXmlTest(ServersSampleJsonTest): - ctype = 'xml' - - class ServersSampleAllExtensionJsonTest(ServersSampleJsonTest): all_extensions = True -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServersSampleAllExtensionXmlTest(ServersSampleXmlTest): - all_extensions = True - - class ServersSampleHideAddressesJsonTest(ServersSampleJsonTest): extension_name = '.'.join(('nova.api.openstack.compute.contrib', 'hide_server_addresses', 'Hide_server_addresses')) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServersSampleHideAddressesXMLTest(ServersSampleHideAddressesJsonTest): - ctype = 'xml' - - class ServersSampleMultiStatusJsonTest(ServersSampleBase): extension_name = '.'.join(('nova.api.openstack.compute.contrib', 'server_list_multi_status', @@ -255,11 +234,6 @@ class ServersSampleMultiStatusJsonTest(ServersSampleBase): self._verify_response('servers-list-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServersSampleMultiStatusXMLTest(ServersSampleMultiStatusJsonTest): - ctype = 'xml' - - class ServersMetadataJsonTest(ServersSampleBase): def _create_and_set(self, subs): uuid = self._post_server() @@ -321,11 +295,6 @@ class ServersMetadataJsonTest(ServersSampleBase): self.assertEqual(response.content, '') -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServersMetadataXmlTest(ServersMetadataJsonTest): - ctype = 'xml' - - class ServersIpsJsonTest(ServersSampleBase): def test_get(self): # Test getting a server's IP information. @@ -342,11 +311,6 @@ class ServersIpsJsonTest(ServersSampleBase): self._verify_response('server-ips-network-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServersIpsXmlTest(ServersIpsJsonTest): - ctype = 'xml' - - class ExtensionsSampleJsonTest(ApiSampleTestBaseV2): all_extensions = True @@ -356,11 +320,6 @@ class ExtensionsSampleJsonTest(ApiSampleTestBaseV2): self._verify_response('extensions-get-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtensionsSampleXmlTest(ExtensionsSampleJsonTest): - ctype = 'xml' - - class FlavorsSampleJsonTest(ApiSampleTestBaseV2): def test_flavors_get(self): @@ -374,11 +333,6 @@ class FlavorsSampleJsonTest(ApiSampleTestBaseV2): self._verify_response('flavors-list-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorsSampleXmlTest(FlavorsSampleJsonTest): - ctype = 'xml' - - class HostsSampleJsonTest(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib.hosts.Hosts" @@ -414,20 +368,10 @@ class HostsSampleJsonTest(ApiSampleTestBaseV2): self._verify_response('hosts-list-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class HostsSampleXmlTest(HostsSampleJsonTest): - ctype = 'xml' - - class FlavorsSampleAllExtensionJsonTest(FlavorsSampleJsonTest): all_extensions = True -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorsSampleAllExtensionXmlTest(FlavorsSampleXmlTest): - all_extensions = True - - class ImagesSampleJsonTest(ApiSampleTestBaseV2): def test_images_list(self): # Get api sample of images get list request. @@ -492,11 +436,6 @@ class ImagesSampleJsonTest(ApiSampleTestBaseV2): self._verify_response('image-meta-key-put-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ImagesSampleXmlTest(ImagesSampleJsonTest): - ctype = 'xml' - - class LimitsSampleJsonTest(ApiSampleTestBaseV2): def test_limits_get(self): response = self._do_get('limits') @@ -504,11 +443,6 @@ class LimitsSampleJsonTest(ApiSampleTestBaseV2): self._verify_response('limit-get-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class LimitsSampleXmlTest(LimitsSampleJsonTest): - ctype = 'xml' - - class ServersActionsJsonTest(ServersSampleBase): def _test_server_action(self, uuid, action, subs=None, resp_tpl=None, code=202): @@ -577,20 +511,10 @@ class ServersActionsJsonTest(ServersSampleBase): 'meta_val': 'foobar'}) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServersActionsXmlTest(ServersActionsJsonTest): - ctype = 'xml' - - class ServersActionsAllJsonTest(ServersActionsJsonTest): all_extensions = True -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServersActionsAllXmlTest(ServersActionsXmlTest): - all_extensions = True - - class ServerStartStopJsonTest(ServersSampleBase): extension_name = "nova.api.openstack.compute.contrib" + \ ".server_start_stop.Server_start_stop" @@ -612,11 +536,6 @@ class ServerStartStopJsonTest(ServersSampleBase): self._test_server_action(uuid, 'os-stop') -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerStartStopXmlTest(ServerStartStopJsonTest): - ctype = 'xml' - - class UserDataJsonTest(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib.user_data.User_data" @@ -634,11 +553,6 @@ class UserDataJsonTest(ApiSampleTestBaseV2): self._verify_response('userdata-post-resp', subs, response, 202) -@test.skipXmlTest("Nova v2 XML support is disabled") -class UserDataXmlTest(UserDataJsonTest): - ctype = 'xml' - - class FlavorsExtraDataJsonTest(ApiSampleTestBaseV2): extension_name = ('nova.api.openstack.compute.contrib.flavorextradata.' 'Flavorextradata') @@ -681,11 +595,6 @@ class FlavorsExtraDataJsonTest(ApiSampleTestBaseV2): subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorsExtraDataXmlTest(FlavorsExtraDataJsonTest): - ctype = 'xml' - - class FlavorRxtxJsonTest(ApiSampleTestBaseV2): extension_name = ('nova.api.openstack.compute.contrib.flavor_rxtx.' 'Flavor_rxtx') @@ -725,11 +634,6 @@ class FlavorRxtxJsonTest(ApiSampleTestBaseV2): self._verify_response('flavor-rxtx-post-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorRxtxXmlTest(FlavorRxtxJsonTest): - ctype = 'xml' - - class FlavorSwapJsonTest(ApiSampleTestBaseV2): extension_name = ('nova.api.openstack.compute.contrib.flavor_swap.' 'Flavor_swap') @@ -769,11 +673,6 @@ class FlavorSwapJsonTest(ApiSampleTestBaseV2): self._verify_response('flavor-swap-post-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorSwapXmlTest(FlavorSwapJsonTest): - ctype = 'xml' - - class SecurityGroupsSampleJsonTest(ServersSampleBase): extension_name = "nova.api.openstack.compute.contrib" + \ ".security_groups.Security_groups" @@ -844,11 +743,6 @@ class SecurityGroupsSampleJsonTest(ServersSampleBase): self.assertEqual(response.content, '') -@test.skipXmlTest("Nova v2 XML support is disabled") -class SecurityGroupsSampleXmlTest(SecurityGroupsSampleJsonTest): - ctype = 'xml' - - class SecurityGroupDefaultRulesSampleJsonTest(ServersSampleBase): extension_name = ('nova.api.openstack.compute.contrib' '.security_group_default_rules' @@ -875,12 +769,6 @@ class SecurityGroupDefaultRulesSampleJsonTest(ServersSampleBase): {}, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class SecurityGroupDefaultRulesSampleXmlTest( - SecurityGroupDefaultRulesSampleJsonTest): - ctype = 'xml' - - class SchedulerHintsJsonTest(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.scheduler_hints." "Scheduler_hints") @@ -896,11 +784,6 @@ class SchedulerHintsJsonTest(ApiSampleTestBaseV2): self._verify_response('scheduler-hints-post-resp', subs, response, 202) -@test.skipXmlTest("Nova v2 XML support is disabled") -class SchedulerHintsXmlTest(SchedulerHintsJsonTest): - ctype = 'xml' - - class ConsoleOutputSampleJsonTest(ServersSampleBase): extension_name = "nova.api.openstack.compute.contrib" + \ ".console_output.Console_output" @@ -914,11 +797,6 @@ class ConsoleOutputSampleJsonTest(ServersSampleBase): self._verify_response('console-output-post-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ConsoleOutputSampleXmlTest(ConsoleOutputSampleJsonTest): - ctype = 'xml' - - class ExtendedServerAttributesJsonTest(ServersSampleBase): extension_name = "nova.api.openstack.compute.contrib" + \ ".extended_server_attributes" + \ @@ -947,11 +825,6 @@ class ExtendedServerAttributesJsonTest(ServersSampleBase): self._verify_response('servers-detail-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedServerAttributesXmlTest(ExtendedServerAttributesJsonTest): - ctype = 'xml' - - class FloatingIpsJsonTest(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib." \ "floating_ips.Floating_ips" @@ -1043,16 +916,6 @@ class ExtendedFloatingIpsJsonTest(FloatingIpsJsonTest): "extended_floating_ips.Extended_floating_ips") -@test.skipXmlTest("Nova v2 XML support is disabled") -class FloatingIpsXmlTest(FloatingIpsJsonTest): - ctype = 'xml' - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedFloatingIpsXmlTest(ExtendedFloatingIpsJsonTest): - ctype = 'xml' - - class FloatingIpsBulkJsonTest(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib." \ "floating_ips_bulk.Floating_ips_bulk" @@ -1121,11 +984,6 @@ class FloatingIpsBulkJsonTest(ApiSampleTestBaseV2): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FloatingIpsBulkXmlTest(FloatingIpsBulkJsonTest): - ctype = 'xml' - - class KeyPairsSampleJsonTest(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib.keypairs.Keypairs" @@ -1180,11 +1038,6 @@ class KeyPairsSampleJsonTest(ApiSampleTestBaseV2): self._verify_response('keypairs-get-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class KeyPairsSampleXmlTest(KeyPairsSampleJsonTest): - ctype = 'xml' - - class RescueJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".rescue.Rescue") @@ -1232,11 +1085,6 @@ class RescueJsonTest(ServersSampleBase): self._verify_response('server-get-resp-unrescue', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class RescueXmlTest(RescueJsonTest): - ctype = 'xml' - - class ExtendedRescueWithImageJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".extended_rescue_with_image.Extended_rescue_with_image") @@ -1273,11 +1121,6 @@ class ExtendedRescueWithImageJsonTest(ServersSampleBase): self._verify_response('server-get-resp-rescue', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedRescueWithImageXmlTest(ExtendedRescueWithImageJsonTest): - ctype = 'xml' - - class ShelveJsonTest(ServersSampleBase): extension_name = "nova.api.openstack.compute.contrib.shelve.Shelve" @@ -1307,11 +1150,6 @@ class ShelveJsonTest(ServersSampleBase): self._test_server_action(uuid, 'os-unshelve', 'unshelve') -@test.skipXmlTest("Nova v2 XML support is disabled") -class ShelveXmlTest(ShelveJsonTest): - ctype = 'xml' - - class VirtualInterfacesJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".virtual_interfaces.Virtual_interfaces") @@ -1327,11 +1165,6 @@ class VirtualInterfacesJsonTest(ServersSampleBase): self._verify_response('vifs-list-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class VirtualInterfacesXmlTest(VirtualInterfacesJsonTest): - ctype = 'xml' - - class CloudPipeSampleJsonTest(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib.cloudpipe.Cloudpipe" @@ -1377,11 +1210,6 @@ class CloudPipeSampleJsonTest(ApiSampleTestBaseV2): self._verify_response('cloud-pipe-get-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class CloudPipeSampleXmlTest(CloudPipeSampleJsonTest): - ctype = "xml" - - class CloudPipeUpdateJsonTest(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib" ".cloudpipe_update.Cloudpipe_update") @@ -1404,11 +1232,6 @@ class CloudPipeUpdateJsonTest(ApiSampleTestBaseV2): self.assertEqual(response.content, "") -@test.skipXmlTest("Nova v2 XML support is disabled") -class CloudPipeUpdateXmlTest(CloudPipeUpdateJsonTest): - ctype = "xml" - - class AgentsJsonTest(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib.agents.Agents" @@ -1505,11 +1328,6 @@ class AgentsJsonTest(ApiSampleTestBaseV2): self.assertEqual(response.status_code, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class AgentsXmlTest(AgentsJsonTest): - ctype = "xml" - - class FixedIpJsonTest(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib.fixed_ips.Fixed_ips" @@ -1593,11 +1411,6 @@ class FixedIpJsonTest(ApiSampleTestBaseV2): self._verify_response('fixedips-get-resp', project, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FixedIpXmlTest(FixedIpJsonTest): - ctype = "xml" - - class AggregatesSampleJsonTest(ServersSampleBase): extension_name = "nova.api.openstack.compute.contrib" + \ ".aggregates.Aggregates" @@ -1668,11 +1481,6 @@ class AggregatesSampleJsonTest(ServersSampleBase): subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class AggregatesSampleXmlTest(AggregatesSampleJsonTest): - ctype = 'xml' - - class CertificatesSamplesJsonTest(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.certificates." "Certificates") @@ -1689,11 +1497,6 @@ class CertificatesSamplesJsonTest(ApiSampleTestBaseV2): self._verify_response('certificate-get-root-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class CertificatesSamplesXmlTest(CertificatesSamplesJsonTest): - ctype = 'xml' - - class UsedLimitsSamplesJsonTest(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.used_limits." "Used_limits") @@ -1705,11 +1508,6 @@ class UsedLimitsSamplesJsonTest(ApiSampleTestBaseV2): self._verify_response('usedlimits-get-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class UsedLimitsSamplesXmlTest(UsedLimitsSamplesJsonTest): - ctype = "xml" - - class UsedLimitsForAdminSamplesJsonTest(ApiSampleTestBaseV2): extends_name = ("nova.api.openstack.compute.contrib.used_limits." "Used_limits") @@ -1725,11 +1523,6 @@ class UsedLimitsForAdminSamplesJsonTest(ApiSampleTestBaseV2): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class UsedLimitsForAdminSamplesXmlTest(UsedLimitsForAdminSamplesJsonTest): - ctype = "xml" - - class MultipleCreateJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.multiple_create." "Multiple_create") @@ -1759,11 +1552,6 @@ class MultipleCreateJsonTest(ServersSampleBase): response, 202) -@test.skipXmlTest("Nova v2 XML support is disabled") -class MultipleCreateXmlTest(MultipleCreateJsonTest): - ctype = 'xml' - - class ServicesJsonTest(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib.services.Services" @@ -1846,11 +1634,6 @@ class ServicesJsonTest(ApiSampleTestBaseV2): subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServicesXmlTest(ServicesJsonTest): - ctype = 'xml' - - class ExtendedServicesJsonTest(ApiSampleTestBaseV2): """This extension is extending the functionalities of the Services extension so the funcionalities introduced by this extension @@ -1861,12 +1644,6 @@ class ExtendedServicesJsonTest(ApiSampleTestBaseV2): "extended_services.Extended_services") -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedServicesXmlTest(ExtendedServicesJsonTest): - """This extension is tested in the ServicesXmlTest class.""" - ctype = 'xml' - - @mock.patch.object(db, 'service_get_all', side_effect=test_services.fake_db_api_service_get_all) @mock.patch.object(db, 'service_get_by_args', @@ -1906,12 +1683,6 @@ class ExtendedServicesDeleteJsonTest(ApiSampleTestBaseV2): self.assertEqual(response.content, "") -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedServicesDeleteXmlTest(ExtendedServicesDeleteJsonTest): - """This extension is tested in the ExtendedServicesDeleteJsonTest class.""" - ctype = 'xml' - - class SimpleTenantUsageSampleJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.simple_tenant_usage." "Simple_tenant_usage") @@ -1954,11 +1725,6 @@ class SimpleTenantUsageSampleJsonTest(ServersSampleBase): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class SimpleTenantUsageSampleXmlTest(SimpleTenantUsageSampleJsonTest): - ctype = "xml" - - class ServerDiagnosticsSamplesJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.server_diagnostics." "Server_diagnostics") @@ -1971,11 +1737,6 @@ class ServerDiagnosticsSamplesJsonTest(ServersSampleBase): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerDiagnosticsSamplesXmlTest(ServerDiagnosticsSamplesJsonTest): - ctype = "xml" - - class AvailabilityZoneJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.availability_zone." "Availability_zone") @@ -1992,11 +1753,6 @@ class AvailabilityZoneJsonTest(ServersSampleBase): response, 202) -@test.skipXmlTest("Nova v2 XML support is disabled") -class AvailabilityZoneXmlTest(AvailabilityZoneJsonTest): - ctype = "xml" - - class AdminActionsSamplesJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.admin_actions." "Admin_actions") @@ -2119,11 +1875,6 @@ class AdminActionsSamplesJsonTest(ServersSampleBase): self.assertEqual(response.status_code, 202) -@test.skipXmlTest("Nova v2 XML support is disabled") -class AdminActionsSamplesXmlTest(AdminActionsSamplesJsonTest): - ctype = 'xml' - - class ConsolesSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".consoles.Consoles") @@ -2179,11 +1930,6 @@ class ConsolesSampleJsonTests(ServersSampleBase): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ConsolesSampleXmlTests(ConsolesSampleJsonTests): - ctype = 'xml' - - class ConsoleAuthTokensSampleJsonTests(ServersSampleBase): extends_name = ("nova.api.openstack.compute.contrib.consoles.Consoles") extension_name = ("nova.api.openstack.compute.contrib.console_auth_tokens." @@ -2217,14 +1963,6 @@ class ConsoleAuthTokensSampleJsonTests(ServersSampleBase): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ConsoleAuthTokensSampleXmlTests(ConsoleAuthTokensSampleJsonTests): - ctype = 'xml' - - def _get_console_url(self, data): - return etree.fromstring(data).find('url').text - - class DeferredDeleteSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".deferred_delete.Deferred_delete") @@ -2252,11 +1990,6 @@ class DeferredDeleteSampleJsonTests(ServersSampleBase): self.assertEqual(response.content, '') -@test.skipXmlTest("Nova v2 XML support is disabled") -class DeferredDeleteSampleXmlTests(DeferredDeleteSampleJsonTests): - ctype = 'xml' - - class QuotasSampleJsonTests(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib.quotas.Quotas" @@ -2279,11 +2012,6 @@ class QuotasSampleJsonTests(ApiSampleTestBaseV2): self._verify_response('quotas-update-post-resp', {}, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class QuotasSampleXmlTests(QuotasSampleJsonTests): - ctype = "xml" - - class ExtendedQuotasSampleJsonTests(ApiSampleTestBaseV2): extends_name = "nova.api.openstack.compute.contrib.quotas.Quotas" extension_name = ("nova.api.openstack.compute.contrib" @@ -2304,11 +2032,6 @@ class ExtendedQuotasSampleJsonTests(ApiSampleTestBaseV2): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedQuotasSampleXmlTests(ExtendedQuotasSampleJsonTests): - ctype = "xml" - - class UserQuotasSampleJsonTests(ApiSampleTestBaseV2): extends_name = "nova.api.openstack.compute.contrib.quotas.Quotas" extension_name = ("nova.api.openstack.compute.contrib" @@ -2339,11 +2062,6 @@ class UserQuotasSampleJsonTests(ApiSampleTestBaseV2): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class UserQuotasSampleXmlTests(UserQuotasSampleJsonTests): - ctype = "xml" - - class ExtendedIpsSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".extended_ips.Extended_ips") @@ -2366,11 +2084,6 @@ class ExtendedIpsSampleJsonTests(ServersSampleBase): self._verify_response('servers-detail-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedIpsSampleXmlTests(ExtendedIpsSampleJsonTests): - ctype = 'xml' - - class ExtendedIpsMacSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".extended_ips_mac.Extended_ips_mac") @@ -2397,11 +2110,6 @@ class ExtendedIpsMacSampleJsonTests(ServersSampleBase): self._verify_response('servers-detail-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedIpsMacSampleXmlTests(ExtendedIpsMacSampleJsonTests): - ctype = 'xml' - - class ExtendedStatusSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".extended_status.Extended_status") @@ -2422,11 +2130,6 @@ class ExtendedStatusSampleJsonTests(ServersSampleBase): self._verify_response('servers-detail-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedStatusSampleXmlTests(ExtendedStatusSampleJsonTests): - ctype = 'xml' - - class ExtendedVolumesSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".extended_volumes.Extended_volumes") @@ -2451,11 +2154,6 @@ class ExtendedVolumesSampleJsonTests(ServersSampleBase): self._verify_response('servers-detail-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedVolumesSampleXmlTests(ExtendedVolumesSampleJsonTests): - ctype = 'xml' - - class ServerUsageSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".server_usage.Server_usage") @@ -2476,11 +2174,6 @@ class ServerUsageSampleJsonTests(ServersSampleBase): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerUsageSampleXmlTests(ServerUsageSampleJsonTests): - ctype = 'xml' - - class ExtendedVIFNetSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".extended_virtual_interfaces_net.Extended_virtual_interfaces_net") @@ -2507,11 +2200,6 @@ class ExtendedVIFNetSampleJsonTests(ServersSampleBase): self._verify_response('vifs-list-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedVIFNetSampleXmlTests(ExtendedIpsSampleJsonTests): - ctype = 'xml' - - class FlavorManageSampleJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.flavormanage." "Flavormanage") @@ -2540,11 +2228,6 @@ class FlavorManageSampleJsonTests(ApiSampleTestBaseV2): self.assertEqual(response.content, '') -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorManageSampleXmlTests(FlavorManageSampleJsonTests): - ctype = "xml" - - class ServerPasswordSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.server_password." "Server_password") @@ -2573,11 +2256,6 @@ class ServerPasswordSampleJsonTests(ServersSampleBase): self.assertEqual(response.status_code, 204) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerPasswordSampleXmlTests(ServerPasswordSampleJsonTests): - ctype = "xml" - - class DiskConfigJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.disk_config." "Disk_config") @@ -2641,11 +2319,6 @@ class DiskConfigJsonTest(ServersSampleBase): self._verify_response('image-list-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class DiskConfigXmlTest(DiskConfigJsonTest): - ctype = 'xml' - - class OsNetworksJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.os_tenant_networks" ".Os_tenant_networks") @@ -2683,19 +2356,6 @@ class OsNetworksJsonTests(ApiSampleTestBaseV2): self.assertEqual(response.content, "") -@test.skipXmlTest("Nova v2 XML support is disabled") -class OsNetworksXmlTests(OsNetworksJsonTests): - ctype = 'xml' - - def test_delete_network(self): - response = self._do_post('os-tenant-networks', "networks-post-req", {}) - net = etree.fromstring(response.content) - network_id = net.find('id').text - response = self._do_delete('os-tenant-networks/%s' % network_id) - self.assertEqual(response.status_code, 202) - self.assertEqual(response.content, "") - - class NetworksJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib" ".os_networks.Os_networks") @@ -2752,11 +2412,6 @@ class NetworksJsonTests(ApiSampleTestBaseV2): self.assertEqual(response.content, "") -@test.skipXmlTest("Nova v2 XML support is disabled") -class NetworksXmlTests(NetworksJsonTests): - ctype = 'xml' - - class ExtendedNetworksJsonTests(ApiSampleTestBaseV2): extends_name = ("nova.api.openstack.compute.contrib." "os_networks.Os_networks") @@ -2797,11 +2452,6 @@ class ExtendedNetworksJsonTests(ApiSampleTestBaseV2): self._verify_response('network-create-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedNetworksXmlTests(ExtendedNetworksJsonTests): - ctype = 'xml' - - class NetworksAssociateJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib" ".networks_associate.Networks_associate") @@ -2855,11 +2505,6 @@ class NetworksAssociateJsonTests(ApiSampleTestBaseV2): self.assertEqual(response.content, "") -@test.skipXmlTest("Nova v2 XML support is disabled") -class NetworksAssociateXmlTests(NetworksAssociateJsonTests): - ctype = 'xml' - - class FlavorDisabledSampleJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.flavor_disabled." "Flavor_disabled") @@ -2879,11 +2524,6 @@ class FlavorDisabledSampleJsonTests(ApiSampleTestBaseV2): self._verify_response('flavor-detail-get-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorDisabledSampleXmlTests(FlavorDisabledSampleJsonTests): - ctype = "xml" - - class QuotaClassesSampleJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.quota_classes." "Quota_classes") @@ -2905,11 +2545,6 @@ class QuotaClassesSampleJsonTests(ApiSampleTestBaseV2): {}, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class QuotaClassesSampleXmlTests(QuotaClassesSampleJsonTests): - ctype = "xml" - - class CellsSampleJsonTest(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib.cells.Cells" @@ -2963,11 +2598,6 @@ class CellsSampleJsonTest(ApiSampleTestBaseV2): self._verify_response('cells-get-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class CellsSampleXmlTest(CellsSampleJsonTest): - ctype = 'xml' - - class CellsCapacitySampleJsonTest(ApiSampleTestBaseV2): extends_name = ("nova.api.openstack.compute.contrib.cells.Cells") extension_name = ("nova.api.openstack.compute.contrib." @@ -3012,11 +2642,6 @@ class CellsCapacitySampleJsonTest(ApiSampleTestBaseV2): self.mox.ReplayAll() -@test.skipXmlTest("Nova v2 XML support is disabled") -class CellsCapacitySampleXmlTest(CellsCapacitySampleJsonTest): - ctype = 'xml' - - class BlockDeviceMappingV2BootJsonTest(ServersSampleBase): extension_name = ('nova.api.openstack.compute.contrib.' 'block_device_mapping_v2_boot.' @@ -3037,11 +2662,6 @@ class BlockDeviceMappingV2BootJsonTest(ServersSampleBase): return self._post_server() -@test.skipXmlTest("Nova v2 XML support is disabled") -class BlockDeviceMappingV2BootXmlTest(BlockDeviceMappingV2BootJsonTest): - ctype = 'xml' - - class FloatingIPPoolsSampleJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.floating_ip_pools." "Floating_ip_pools") @@ -3062,11 +2682,6 @@ class FloatingIPPoolsSampleJsonTests(ApiSampleTestBaseV2): self._verify_response('floatingippools-list-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FloatingIPPoolsSampleXmlTests(FloatingIPPoolsSampleJsonTests): - ctype = 'xml' - - class MultinicSampleJsonTest(ServersSampleBase): extension_name = "nova.api.openstack.compute.contrib.multinic.Multinic" @@ -3100,11 +2715,6 @@ class MultinicSampleJsonTest(ServersSampleBase): self.assertEqual(response.status_code, 202) -@test.skipXmlTest("Nova v2 XML support is disabled") -class MultinicSampleXmlTest(MultinicSampleJsonTest): - ctype = "xml" - - class InstanceUsageAuditLogJsonTest(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib." "instance_usage_audit_log.Instance_usage_audit_log") @@ -3125,11 +2735,6 @@ class InstanceUsageAuditLogJsonTest(ApiSampleTestBaseV2): subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class InstanceUsageAuditLogXmlTest(InstanceUsageAuditLogJsonTest): - ctype = "xml" - - class FlavorExtraSpecsSampleJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.flavorextraspecs." "Flavorextraspecs") @@ -3177,11 +2782,6 @@ class FlavorExtraSpecsSampleJsonTests(ApiSampleTestBaseV2): self.assertEqual(response.content, '') -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorExtraSpecsSampleXmlTests(FlavorExtraSpecsSampleJsonTests): - ctype = 'xml' - - class FpingSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.fping.Fping") @@ -3207,11 +2807,6 @@ class FpingSampleJsonTests(ServersSampleBase): self._verify_response('fping-get-details-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FpingSampleXmlTests(FpingSampleJsonTests): - ctype = 'xml' - - class ExtendedAvailabilityZoneJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".extended_availability_zone" @@ -3232,11 +2827,6 @@ class ExtendedAvailabilityZoneJsonTests(ServersSampleBase): self._verify_response('servers-detail-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedAvailabilityZoneXmlTests(ExtendedAvailabilityZoneJsonTests): - ctype = 'xml' - - class EvacuateJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" @@ -3285,11 +2875,6 @@ class EvacuateJsonTest(ServersSampleBase): self._verify_response('server-evacuate-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class EvacuateXmlTest(EvacuateJsonTest): - ctype = 'xml' - - class EvacuateFindHostSampleJsonTest(ServersSampleBase): extends_name = ("nova.api.openstack.compute.contrib" ".evacuate.Evacuate") @@ -3333,11 +2918,6 @@ class EvacuateFindHostSampleJsonTest(ServersSampleBase): host=None) -@test.skipXmlTest("Nova v2 XML support is disabled") -class EvacuateFindHostSampleXmlTests(EvacuateFindHostSampleJsonTest): - ctype = "xml" - - class FloatingIpDNSJsonTest(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.floating_ip_dns." "Floating_ip_dns") @@ -3415,11 +2995,6 @@ class FloatingIpDNSJsonTest(ApiSampleTestBaseV2): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FloatingIpDNSXmlTest(FloatingIpDNSJsonTest): - ctype = 'xml' - - class InstanceActionsSampleJsonTest(ApiSampleTestBaseV2): extension_name = ('nova.api.openstack.compute.contrib.instance_actions.' 'Instance_actions') @@ -3484,11 +3059,6 @@ class InstanceActionsSampleJsonTest(ApiSampleTestBaseV2): response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class InstanceActionsSampleXmlTest(InstanceActionsSampleJsonTest): - ctype = 'xml' - - class ImageSizeSampleJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib" ".image_size.Image_size") @@ -3508,11 +3078,6 @@ class ImageSizeSampleJsonTests(ApiSampleTestBaseV2): self._verify_response('images-details-get-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ImageSizeSampleXmlTests(ImageSizeSampleJsonTests): - ctype = 'xml' - - class ConfigDriveSampleJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.config_drive." "Config_drive") @@ -3544,11 +3109,6 @@ class ConfigDriveSampleJsonTest(ServersSampleBase): subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ConfigDriveSampleXmlTest(ConfigDriveSampleJsonTest): - ctype = 'xml' - - class FlavorAccessSampleJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.flavor_access." "Flavor_access") @@ -3632,11 +3192,6 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBaseV2): exp_subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorAccessSampleXmlTests(FlavorAccessSampleJsonTests): - ctype = 'xml' - - @mock.patch.object(service_group_api.API, "service_is_up", lambda _: True) class HypervisorsSampleJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.hypervisors." @@ -3682,11 +3237,6 @@ class HypervisorsSampleJsonTests(ApiSampleTestBaseV2): self._verify_response('hypervisors-uptime-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class HypervisorsSampleXmlTests(HypervisorsSampleJsonTests): - ctype = "xml" - - class ExtendedHypervisorsJsonTest(ApiSampleTestBaseV2): extends_name = ("nova.api.openstack.compute.contrib." "hypervisors.Hypervisors") @@ -3704,11 +3254,6 @@ class ExtendedHypervisorsJsonTest(ApiSampleTestBaseV2): subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedHypervisorsXmlTest(ExtendedHypervisorsJsonTest): - ctype = "xml" - - class HypervisorStatusJsonTest(ApiSampleTestBaseV2): extends_name = ("nova.api.openstack.compute.contrib." "hypervisors.Hypervisors") @@ -3726,11 +3271,6 @@ class HypervisorStatusJsonTest(ApiSampleTestBaseV2): subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class HypervisorStatusXmlTest(HypervisorStatusJsonTest): - ctype = 'xml' - - @mock.patch("nova.servicegroup.API.service_is_up", return_value=True) class HypervisorsCellsSampleJsonTests(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.hypervisors." @@ -3764,11 +3304,6 @@ class HypervisorsCellsSampleJsonTests(ApiSampleTestBaseV2): self._verify_response('hypervisors-uptime-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class HypervisorsCellsSampleXmlTests(HypervisorsCellsSampleJsonTests): - ctype = "xml" - - class AttachInterfacesSampleJsonTest(ServersSampleBase): extension_name = ('nova.api.openstack.compute.contrib.attach_interfaces.' 'Attach_interfaces') @@ -3914,11 +3449,6 @@ class AttachInterfacesSampleJsonTest(ServersSampleBase): self.assertEqual(response.content, '') -@test.skipXmlTest("Nova v2 XML support is disabled") -class AttachInterfacesSampleXmlTest(AttachInterfacesSampleJsonTest): - ctype = 'xml' - - class SnapshotsSampleJsonTests(ApiSampleTestBaseV2): extension_name = "nova.api.openstack.compute.contrib.volumes.Volumes" @@ -3977,11 +3507,6 @@ class SnapshotsSampleJsonTests(ApiSampleTestBaseV2): self._verify_response('snapshots-show-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class SnapshotsSampleXmlTests(SnapshotsSampleJsonTests): - ctype = "xml" - - class AssistedVolumeSnapshotsJsonTest(ApiSampleTestBaseV2): """Assisted volume snapshots.""" extension_name = ("nova.api.openstack.compute.contrib." @@ -4022,11 +3547,6 @@ class AssistedVolumeSnapshotsJsonTest(ApiSampleTestBaseV2): self.assertEqual(response.content, '') -@test.skipXmlTest("Nova v2 XML support is disabled") -class AssistedVolumeSnapshotsXmlTest(AssistedVolumeSnapshotsJsonTest): - ctype = "xml" - - class VolumeAttachmentsSampleBase(ServersSampleBase): def _stub_db_bdms_get_all_by_instance(self, server_id): @@ -4129,11 +3649,6 @@ class VolumeAttachmentsSampleJsonTest(VolumeAttachmentsSampleBase): self.assertEqual(response.content, '') -@test.skipXmlTest("Nova v2 XML support is disabled") -class VolumeAttachmentsSampleXmlTest(VolumeAttachmentsSampleJsonTest): - ctype = 'xml' - - class VolumeAttachUpdateSampleJsonTest(VolumeAttachmentsSampleBase): extends_name = ("nova.api.openstack.compute.contrib.volumes.Volumes") extension_name = ("nova.api.openstack.compute.contrib." @@ -4159,11 +3674,6 @@ class VolumeAttachUpdateSampleJsonTest(VolumeAttachmentsSampleBase): self.assertEqual(response.content, '') -@test.skipXmlTest("Nova v2 XML support is disabled") -class VolumeAttachUpdateSampleXmlTest(VolumeAttachUpdateSampleJsonTest): - ctype = 'xml' - - class VolumesSampleJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.volumes.Volumes") @@ -4269,11 +3779,6 @@ class VolumesSampleJsonTest(ServersSampleBase): self.assertEqual(response.content, '') -@test.skipXmlTest("Nova v2 XML support is disabled") -class VolumesSampleXmlTest(VolumesSampleJsonTest): - ctype = 'xml' - - class MigrationsSamplesJsonTest(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.migrations." "Migrations") @@ -4328,11 +3833,6 @@ class MigrationsSamplesJsonTest(ApiSampleTestBaseV2): self._verify_response('migrations-get', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class MigrationsSamplesXmlTest(MigrationsSamplesJsonTest): - ctype = 'xml' - - class PreserveEphemeralOnRebuildJsonTest(ServersSampleBase): extension_name = ('nova.api.openstack.compute.contrib.' 'preserve_ephemeral_rebuild.' @@ -4388,11 +3888,6 @@ class PreserveEphemeralOnRebuildJsonTest(ServersSampleBase): self.assertEqual(response.status_code, 202) -@test.skipXmlTest("Nova v2 XML support is disabled") -class PreserveEphemeralOnRebuildXmlTest(PreserveEphemeralOnRebuildJsonTest): - ctype = 'xml' - - class ServerExternalEventsJsonTest(ServersSampleBase): extension_name = ('nova.api.openstack.compute.contrib.' 'server_external_events.Server_external_events') @@ -4412,11 +3907,6 @@ class ServerExternalEventsJsonTest(ServersSampleBase): self._verify_response('event-create-resp', subs, response, 200) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerExternalEventsXmlTest(ServerExternalEventsJsonTest): - ctype = 'xml' - - class ServerGroupsSampleJsonTest(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".server_groups.Server_groups") @@ -4468,22 +3958,11 @@ class ServerGroupsSampleJsonTest(ServersSampleBase): self.assertEqual(response.status_code, 204) -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerGroupsSampleXmlTest(ServerGroupsSampleJsonTest): - ctype = 'xml' - - class ServerGroupQuotas_LimitsSampleJsonTest(LimitsSampleJsonTest): extension_name = ("nova.api.openstack.compute.contrib." "server_group_quotas.Server_group_quotas") -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerGroupQuotas_LimitsSampleXmlTest(LimitsSampleXmlTest): - extension_name = ("nova.api.openstack.compute.contrib." - "server_group_quotas.Server_group_quotas") - - class ServerGroupQuotas_UsedLimitsSamplesJsonTest(UsedLimitsSamplesJsonTest): extension_name = ("nova.api.openstack.compute.contrib." "server_group_quotas.Server_group_quotas") @@ -4491,27 +3970,12 @@ class ServerGroupQuotas_UsedLimitsSamplesJsonTest(UsedLimitsSamplesJsonTest): "Used_limits") -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerGroupQuotas_UsedLimitsSamplesXmlTest(UsedLimitsSamplesXmlTest): - extension_name = ("nova.api.openstack.compute.contrib." - "server_group_quotas.Server_group_quotas") - extends_name = ("nova.api.openstack.compute.contrib.used_limits." - "Used_limits") - - class ServerGroupQuotas_QuotasSampleJsonTests(QuotasSampleJsonTests): extension_name = ("nova.api.openstack.compute.contrib." "server_group_quotas.Server_group_quotas") extends_name = "nova.api.openstack.compute.contrib.quotas.Quotas" -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerGroupQuotas_QuotasSampleXmlTests(QuotasSampleXmlTests): - extension_name = ("nova.api.openstack.compute.contrib." - "server_group_quotas.Server_group_quotas") - extends_name = "nova.api.openstack.compute.contrib.quotas.Quotas" - - class ServerGroupQuotasQuota_ClassesSampleJsonTests( QuotaClassesSampleJsonTests): extension_name = ("nova.api.openstack.compute.contrib." @@ -4520,15 +3984,6 @@ class ServerGroupQuotasQuota_ClassesSampleJsonTests( "Quota_classes") -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerGroupQuotas_QuotaClassesSampleXmlTests( - QuotaClassesSampleXmlTests): - extension_name = ("nova.api.openstack.compute.contrib." - "server_group_quotas.Server_group_quotas") - extends_name = ("nova.api.openstack.compute.contrib.quota_classes." - "Quota_classes") - - class ServerSortKeysJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib.server_sort_keys" ".Server_sort_keys") @@ -4539,8 +3994,3 @@ class ServerSortKeysJsonTests(ServersSampleBase): subs = self._get_regexes() self._verify_response('server-sort-keys-list-resp', subs, response, 200) - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerSortKeysXmlTests(ServerSortKeysJsonTests): - ctype = 'xml' diff --git a/nova/tests/functional/test_xml.py b/nova/tests/functional/test_xml.py deleted file mode 100644 index c0e2ab0d55..0000000000 --- a/nova/tests/functional/test_xml.py +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2011 Justin Santa Barbara -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from lxml import etree - -from nova.api.openstack import common -from nova.api.openstack import xmlutil -from nova.openstack.common import log as logging -from nova import test -from nova.tests.functional import integrated_helpers - - -LOG = logging.getLogger(__name__) - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class XmlTests(integrated_helpers._IntegratedTestBase): - """"Some basic XML sanity checks.""" - - _api_version = 'v2' - - def test_namespace_limits(self): - headers = {} - headers['Accept'] = 'application/xml' - - response = self.api.api_request('/limits', headers=headers) - data = response.content - LOG.debug("data: %s" % data) - root = etree.XML(data) - self.assertEqual(root.nsmap.get(None), xmlutil.XMLNS_COMMON_V10) - - def test_namespace_servers(self): - # /servers should have v1.1 namespace (has changed in 1.1). - headers = {} - headers['Accept'] = 'application/xml' - - response = self.api.api_request('/servers', headers=headers) - data = response.content - LOG.debug("data: %s" % data) - root = etree.XML(data) - self.assertEqual(root.nsmap.get(None), common.XML_NS_V11) diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py b/nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py index e4f0c21074..8e04925bec 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py @@ -14,7 +14,6 @@ import datetime -from lxml import etree from oslo.config import cfg from oslo.serialization import jsonutils import webob @@ -436,62 +435,3 @@ class ServersControllerCreateTestV2(ServersControllerCreateTestV21): # NOTE: v2.0 API does not check this bad request case. # So we skip this test for v2.0 API. pass - - -class AvailabilityZoneSerializerTest(test.NoDBTestCase): - def test_availability_zone_index_detail_serializer(self): - def _verify_zone(zone_dict, tree): - self.assertEqual(tree.tag, 'availabilityZone') - self.assertEqual(zone_dict['zoneName'], tree.get('name')) - self.assertEqual(str(zone_dict['zoneState']['available']), - tree[0].get('available')) - - for _idx, host_child in enumerate(tree[1]): - self.assertIn(host_child.get('name'), zone_dict['hosts']) - svcs = zone_dict['hosts'][host_child.get('name')] - for _idx, svc_child in enumerate(host_child[0]): - self.assertIn(svc_child.get('name'), svcs) - svc = svcs[svc_child.get('name')] - self.assertEqual(len(svc_child), 1) - - self.assertEqual(str(svc['available']), - svc_child[0].get('available')) - self.assertEqual(str(svc['active']), - svc_child[0].get('active')) - self.assertEqual(str(svc['updated_at']), - svc_child[0].get('updated_at')) - - serializer = az_v2.AvailabilityZonesTemplate() - raw_availability_zones = \ - [{'zoneName': 'zone-1', - 'zoneState': {'available': True}, - 'hosts': {'fake_host-1': { - 'nova-compute': {'active': True, 'available': True, - 'updated_at': - datetime.datetime( - 2012, 12, 26, 14, 45, 25)}}}}, - {'zoneName': 'internal', - 'zoneState': {'available': True}, - 'hosts': {'fake_host-1': { - 'nova-sched': {'active': True, 'available': True, - 'updated_at': - datetime.datetime( - 2012, 12, 26, 14, 45, 25)}}, - 'fake_host-2': { - 'nova-network': {'active': True, - 'available': False, - 'updated_at': - datetime.datetime( - 2012, 12, 26, 14, 45, 24)}}}}, - {'zoneName': 'zone-2', - 'zoneState': {'available': False}, - 'hosts': None}] - - text = serializer.serialize( - dict(availabilityZoneInfo=raw_availability_zones)) - tree = etree.fromstring(text) - - self.assertEqual('availabilityZones', tree.tag) - self.assertEqual(len(raw_availability_zones), len(tree)) - for idx, child in enumerate(tree): - _verify_zone(raw_availability_zones[idx], child) diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py b/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py index c312378381..60d90c14fb 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py @@ -390,51 +390,4 @@ class BlockDeviceMappingTestV2(BlockDeviceMappingTestV21): self._test_create({}, override_controller=controller) params = {'block_device_mapping': bdm} - self._test_create(params, override_controller=controller) - - -class TestServerCreateRequestXMLDeserializer(test.TestCase): - - def setUp(self): - super(TestServerCreateRequestXMLDeserializer, self).setUp() - self.deserializer = servers_v2.CreateDeserializer() - - def test_request_with_block_device_mapping(self): - serial_request = """ - - - - - - - """ - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "block_device_mapping": [ - { - "volume_id": "7329b667-50c7-46a6-b913-cb2a09dfeee0", - "device_name": "/dev/vda", - "virtual_name": "root", - "delete_on_termination": False, - }, - { - "snapshot_id": "f31efb24-34d2-43e1-8b44-316052956a39", - "device_name": "/dev/vdb", - "virtual_name": "ephemeral0", - "delete_on_termination": False, - }, - { - "device_name": "/dev/vdc", - "no_device": True, - }, - ] - }} - self.assertEqual(request['body'], expected) + self._test_create(params, override_controller=controller) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_cells.py b/nova/tests/unit/api/openstack/compute/contrib/test_cells.py index ce53fa1fef..a5ef50d077 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_cells.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_cells.py @@ -15,21 +15,18 @@ import copy -from lxml import etree from oslo.utils import timeutils from webob import exc from nova.api.openstack.compute.contrib import cells as cells_ext_v2 from nova.api.openstack.compute.plugins.v3 import cells as cells_ext_v21 from nova.api.openstack import extensions -from nova.api.openstack import xmlutil from nova.cells import rpcapi as cells_rpcapi from nova import context from nova import exception from nova import rpc from nova import test from nova.tests.unit.api.openstack import fakes -from nova.tests.unit import utils class BaseCellsTest(test.NoDBTestCase): @@ -734,88 +731,3 @@ class CellsTestV2(CellsTestV21): req = self._get_request("cells") req.environ['nova.context'] = self.context self.controller.update(req, 'cell1', body=body) - - -class TestCellsXMLSerializer(BaseCellsTest): - def test_multiple_cells(self): - fixture = {'cells': self._get_all_cell_info()} - - serializer = cells_ext_v2.CellsTemplate() - output = serializer.serialize(fixture) - res_tree = etree.XML(output) - - self.assertEqual(res_tree.tag, '{%s}cells' % xmlutil.XMLNS_V10) - self.assertEqual(len(res_tree), 2) - self.assertEqual(res_tree[0].tag, '{%s}cell' % xmlutil.XMLNS_V10) - self.assertEqual(res_tree[1].tag, '{%s}cell' % xmlutil.XMLNS_V10) - - def test_single_cell_with_caps(self): - cell = {'id': 1, - 'name': 'darksecret', - 'username': 'meow', - 'capabilities': {'cap1': 'a;b', - 'cap2': 'c;d'}} - fixture = {'cell': cell} - - serializer = cells_ext_v2.CellTemplate() - output = serializer.serialize(fixture) - res_tree = etree.XML(output) - - self.assertEqual(res_tree.tag, '{%s}cell' % xmlutil.XMLNS_V10) - self.assertEqual(res_tree.get('name'), 'darksecret') - self.assertEqual(res_tree.get('username'), 'meow') - self.assertIsNone(res_tree.get('password')) - self.assertEqual(len(res_tree), 1) - - child = res_tree[0] - self.assertEqual(child.tag, - '{%s}capabilities' % xmlutil.XMLNS_V10) - for elem in child: - self.assertIn(elem.tag, ('{%s}cap1' % xmlutil.XMLNS_V10, - '{%s}cap2' % xmlutil.XMLNS_V10)) - if elem.tag == '{%s}cap1' % xmlutil.XMLNS_V10: - self.assertEqual(elem.text, 'a;b') - elif elem.tag == '{%s}cap2' % xmlutil.XMLNS_V10: - self.assertEqual(elem.text, 'c;d') - - def test_single_cell_without_caps(self): - cell = {'id': 1, - 'username': 'woof', - 'name': 'darksecret'} - fixture = {'cell': cell} - - serializer = cells_ext_v2.CellTemplate() - output = serializer.serialize(fixture) - res_tree = etree.XML(output) - - self.assertEqual(res_tree.tag, '{%s}cell' % xmlutil.XMLNS_V10) - self.assertEqual(res_tree.get('name'), 'darksecret') - self.assertEqual(res_tree.get('username'), 'woof') - self.assertIsNone(res_tree.get('password')) - self.assertEqual(len(res_tree), 0) - - -class TestCellsXMLDeserializer(test.NoDBTestCase): - def test_cell_deserializer(self): - caps_dict = {'cap1': 'a;b', - 'cap2': 'c;d'} - caps_xml = ("a;b" - "c;d") - expected = {'cell': {'name': 'testcell1', - 'type': 'child', - 'rpc_host': 'localhost', - 'capabilities': caps_dict}} - intext = ("\n" - "testcell1child" - "localhost" - "%s") % caps_xml - deserializer = cells_ext_v2.CellDeserializer() - result = deserializer.deserialize(intext) - self.assertEqual(dict(body=expected), result) - - def test_with_corrupt_xml(self): - deserializer = cells_ext_v2.CellDeserializer() - self.assertRaises( - exception.MalformedRequestBody, - deserializer.deserialize, - utils.killer_xml_body()) diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_certificates.py b/nova/tests/unit/api/openstack/compute/contrib/test_certificates.py index eafa7cd045..b8384577ca 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_certificates.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_certificates.py @@ -14,7 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree import mock from mox3 import mox from webob import exc @@ -121,20 +120,4 @@ class CertificatesTestV2(CertificatesTestV21): certificates = certificates_v2 url = '/v2/fake/os-certificates' certificate_show_extension = 'compute_extension:certificates' - certificate_create_extension = 'compute_extension:certificates' - - -class CertificatesSerializerTest(test.NoDBTestCase): - def test_index_serializer(self): - serializer = certificates_v2.CertificateTemplate() - text = serializer.serialize(dict( - certificate=dict( - data='fakecert', - private_key='fakepk'), - )) - - tree = etree.fromstring(text) - - self.assertEqual('certificate', tree.tag) - self.assertEqual('fakepk', tree.get('private_key')) - self.assertEqual('fakecert', tree.get('data')) + certificate_create_extension = 'compute_extension:certificates' \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py index ab3b1a58cc..1906744e77 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py @@ -15,14 +15,12 @@ import uuid as uuid_lib -from lxml import etree from oslo.config import cfg from oslo.utils import timeutils from webob import exc from nova.api.openstack.compute.contrib import cloudpipe as cloudpipe_v2 from nova.api.openstack.compute.plugins.v3 import cloudpipe as cloudpipe_v21 -from nova.api.openstack import wsgi from nova.compute import utils as compute_utils from nova import exception from nova import test @@ -162,49 +160,4 @@ class CloudpipeTestV2(CloudpipeTestV21): cloudpipe = cloudpipe_v2 def test_cloudpipe_create_with_bad_project_id_failed(self): - pass - - -class CloudpipesXMLSerializerTestV2(test.NoDBTestCase): - def test_default_serializer(self): - serializer = cloudpipe_v2.CloudpipeTemplate() - exemplar = dict(cloudpipe=dict(instance_id='1234-1234-1234-1234')) - text = serializer.serialize(exemplar) - tree = etree.fromstring(text) - self.assertEqual('cloudpipe', tree.tag) - for child in tree: - self.assertIn(child.tag, exemplar['cloudpipe']) - self.assertEqual(child.text, exemplar['cloudpipe'][child.tag]) - - def test_index_serializer(self): - serializer = cloudpipe_v2.CloudpipesTemplate() - exemplar = dict(cloudpipes=[ - dict( - project_id='1234', - public_ip='1.2.3.4', - public_port='321', - instance_id='1234-1234-1234-1234', - created_at=timeutils.isotime(), - state='running'), - dict( - project_id='4321', - public_ip='4.3.2.1', - public_port='123', - state='pending')]) - text = serializer.serialize(exemplar) - tree = etree.fromstring(text) - self.assertEqual('cloudpipes', tree.tag) - self.assertEqual(len(exemplar['cloudpipes']), len(tree)) - for idx, cl_pipe in enumerate(tree): - kp_data = exemplar['cloudpipes'][idx] - for child in cl_pipe: - self.assertIn(child.tag, kp_data) - self.assertEqual(child.text, kp_data[child.tag]) - - def test_deserializer(self): - deserializer = wsgi.XMLDeserializer() - exemplar = dict(cloudpipe=dict(project_id='4321')) - intext = ("\n" - '4321') - result = deserializer.deserialize(intext)['body'] - self.assertEqual(result, exemplar) + pass \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py b/nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py index 690826a2eb..393bba7de5 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py @@ -14,7 +14,6 @@ # under the License. import base64 -from xml.dom import minidom from oslo.serialization import jsonutils import webob @@ -143,46 +142,6 @@ class CreateserverextTest(test.TestCase): req.body = jsonutils.dumps(body_dict) return req - def _format_xml_request_body(self, body_dict): - server = body_dict['server'] - body_parts = [] - body_parts.extend([ - '', - '' % ( - server['name'], server['imageRef'], server['flavorRef'])]) - if 'metadata' in server: - metadata = server['metadata'] - body_parts.append('') - for item in metadata.iteritems(): - body_parts.append('%s' % item) - body_parts.append('') - if 'personality' in server: - personalities = server['personality'] - body_parts.append('') - for file in personalities: - item = (file['path'], file['contents']) - body_parts.append('%s' % item) - body_parts.append('') - if 'networks' in server: - networks = server['networks'] - body_parts.append('') - for network in networks: - item = (network['uuid'], network['fixed_ip']) - body_parts.append('' - % item) - body_parts.append('') - body_parts.append('') - return ''.join(body_parts) - - def _get_create_request_xml(self, body_dict): - req = webob.Request.blank('/v2/fake/os-create-server-ext') - req.content_type = 'application/xml' - req.accept = 'application/xml' - req.method = 'POST' - req.body = self._format_xml_request_body(body_dict) - return req - def _create_instance_with_networks_json(self, networks): body_dict = self._create_networks_request_dict(networks) request = self._get_create_request_json(body_dict) @@ -197,65 +156,30 @@ class CreateserverextTest(test.TestCase): init_only=('servers', 'os-create-server-ext'))) return request, response, self.user_data - def _create_instance_with_networks_xml(self, networks): - body_dict = self._create_networks_request_dict(networks) - request = self._get_create_request_xml(body_dict) - response = request.get_response(fakes.wsgi_app( - init_only=('servers', 'os-create-server-ext'))) - return request, response, self.networks - def test_create_instance_with_no_networks(self): _create_inst = self._create_instance_with_networks_json request, response, networks = _create_inst(networks=None) self.assertEqual(response.status_int, 202) self.assertIsNone(networks) - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_create_instance_with_no_networks_xml(self): - _create_inst = self._create_instance_with_networks_xml - request, response, networks = _create_inst(networks=None) - self.assertEqual(response.status_int, 202) - self.assertIsNone(networks) - def test_create_instance_with_one_network(self): _create_inst = self._create_instance_with_networks_json request, response, networks = _create_inst([FAKE_NETWORKS[0]]) self.assertEqual(response.status_int, 202) self.assertEqual([FAKE_NETWORKS[0]], networks.as_tuples()) - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_create_instance_with_one_network_xml(self): - _create_inst = self._create_instance_with_networks_xml - request, response, networks = _create_inst([FAKE_NETWORKS[0]]) - self.assertEqual(response.status_int, 202) - self.assertEqual([FAKE_NETWORKS[0]], networks.as_tuples()) - def test_create_instance_with_two_networks(self): _create_inst = self._create_instance_with_networks_json request, response, networks = _create_inst(FAKE_NETWORKS) self.assertEqual(response.status_int, 202) self.assertEqual(FAKE_NETWORKS, networks.as_tuples()) - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_create_instance_with_two_networks_xml(self): - _create_inst = self._create_instance_with_networks_xml - request, response, networks = _create_inst(FAKE_NETWORKS) - self.assertEqual(response.status_int, 202) - self.assertEqual(FAKE_NETWORKS, networks.as_tuples()) - def test_create_instance_with_duplicate_networks(self): _create_inst = self._create_instance_with_networks_json request, response, networks = _create_inst(DUPLICATE_NETWORKS) self.assertEqual(response.status_int, 400) self.assertIsNone(networks) - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_create_instance_with_duplicate_networks_xml(self): - _create_inst = self._create_instance_with_networks_xml - request, response, networks = _create_inst(DUPLICATE_NETWORKS) - self.assertEqual(response.status_int, 400) - self.assertIsNone(networks) - def test_create_instance_with_network_no_id(self): body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]]) del body_dict['server']['networks'][0]['uuid'] @@ -265,28 +189,12 @@ class CreateserverextTest(test.TestCase): self.assertEqual(response.status_int, 400) self.assertIsNone(self.networks) - def test_create_instance_with_network_no_id_xml(self): - body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]]) - request = self._get_create_request_xml(body_dict) - uuid = ' uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"' - request.body = request.body.replace(uuid, '') - response = request.get_response(fakes.wsgi_app( - init_only=('servers', 'os-create-server-ext'))) - self.assertEqual(response.status_int, 400) - self.assertIsNone(self.networks) - def test_create_instance_with_network_invalid_id(self): _create_inst = self._create_instance_with_networks_json request, response, networks = _create_inst(INVALID_NETWORKS) self.assertEqual(response.status_int, 400) self.assertIsNone(networks) - def test_create_instance_with_network_invalid_id_xml(self): - _create_inst = self._create_instance_with_networks_xml - request, response, networks = _create_inst(INVALID_NETWORKS) - self.assertEqual(response.status_int, 400) - self.assertIsNone(networks) - def test_create_instance_with_network_empty_fixed_ip(self): networks = [('1', '')] _create_inst = self._create_instance_with_networks_json @@ -301,13 +209,6 @@ class CreateserverextTest(test.TestCase): self.assertEqual(response.status_int, 400) self.assertIsNone(networks) - def test_create_instance_with_network_empty_fixed_ip_xml(self): - networks = [('1', '')] - _create_inst = self._create_instance_with_networks_xml - request, response, networks = _create_inst(networks) - self.assertEqual(response.status_int, 400) - self.assertIsNone(networks) - def test_create_instance_with_network_no_fixed_ip(self): body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]]) del body_dict['server']['networks'][0]['fixed_ip'] @@ -318,17 +219,6 @@ class CreateserverextTest(test.TestCase): self.assertEqual([('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', None)], self.networks.as_tuples()) - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_create_instance_with_network_no_fixed_ip_xml(self): - body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]]) - request = self._get_create_request_xml(body_dict) - request.body = request.body.replace(' fixed_ip="10.0.1.12"', '') - response = request.get_response(fakes.wsgi_app( - init_only=('servers', 'os-create-server-ext'))) - self.assertEqual(response.status_int, 202) - self.assertEqual([('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', None)], - self.networks.as_tuples()) - def test_create_instance_with_userdata(self): user_data_contents = '#!/bin/bash\necho "Oh no!"\n' user_data_contents = base64.b64encode(user_data_contents) @@ -375,19 +265,4 @@ class CreateserverextTest(test.TestCase): res_dict = jsonutils.loads(response.body) expected_security_group = [{"name": "test"}] self.assertEqual(res_dict['server'].get('security_groups'), - expected_security_group) - - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_get_server_by_id_verify_security_groups_xml(self): - self.stubs.Set(db, 'instance_get', fakes.fake_instance_get()) - self.stubs.Set(db, 'instance_get_by_uuid', fakes.fake_instance_get()) - req = webob.Request.blank('/v2/fake/os-create-server-ext/1') - req.headers['Accept'] = 'application/xml' - response = req.get_response(fakes.wsgi_app( - init_only=('os-create-server-ext', 'servers'))) - self.assertEqual(response.status_int, 200) - dom = minidom.parseString(response.body) - server = dom.childNodes[0] - sec_groups = server.getElementsByTagName('security_groups')[0] - sec_group = sec_groups.getElementsByTagName('security_group')[0] - self.assertEqual('test', sec_group.getAttribute("name")) + expected_security_group) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py index 281d73216c..2705e3f4a2 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py @@ -13,11 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob -from nova.api.openstack.compute.contrib import extended_availability_zone from nova import availability_zones from nova import compute from nova.compute import vm_states @@ -169,17 +167,4 @@ class ExtendedAvailabilityZoneTestV2(ExtendedAvailabilityZoneTestV21): req = webob.Request.blank(url) req.headers['Accept'] = self.content_type res = req.get_response(fakes.wsgi_app(init_only=('servers',))) - return res - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedAvailabilityZoneXmlTestV2(ExtendedAvailabilityZoneTestV2): - content_type = 'application/xml' - prefix = '{%s}' % extended_availability_zone.\ - Extended_availability_zone.namespace - - def _get_server(self, body): - return etree.XML(body) - - def _get_servers(self, body): - return etree.XML(body).getchildren() + return res \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py index 96ca710ed1..fb4076cbb1 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py @@ -13,12 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob -from nova.api.openstack.compute.contrib import extended_ips -from nova.api.openstack import xmlutil from nova import compute from nova import objects from nova.objects import instance as instance_obj @@ -170,21 +167,4 @@ class ExtendedIpsTestV2(ExtendedIpsTestV21): req = webob.Request.blank(url) req.headers['Accept'] = self.content_type res = req.get_response(fakes.wsgi_app(init_only=('servers',))) - return res - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedIpsXmlTest(ExtendedIpsTestV2): - content_type = 'application/xml' - prefix = '{%s}' % extended_ips.Extended_ips.namespace - - def _get_server(self, body): - return etree.XML(body) - - def _get_servers(self, body): - return etree.XML(body).getchildren() - - def _get_ips(self, server): - for network in server.find('{%s}addresses' % xmlutil.XMLNS_V11): - for ip in network: - yield ip + return res \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py index 3293d55a94..b62ee903ab 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py @@ -13,12 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_ips_mac -from nova.api.openstack import xmlutil from nova import compute from nova import objects from nova.objects import instance as instance_obj @@ -177,21 +175,4 @@ class ExtendedIpsMacTestV2(ExtendedIpsMacTestV21): req = webob.Request.blank(url) req.headers['Accept'] = self.content_type res = req.get_response(fakes.wsgi_app(init_only=('servers',))) - return res - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedIpsMacXmlTest(ExtendedIpsMacTestV2): - content_type = 'application/xml' - prefix = '{%s}' % extended_ips_mac.Extended_ips_mac.namespace - - def _get_server(self, body): - return etree.XML(body) - - def _get_servers(self, body): - return etree.XML(body).getchildren() - - def _get_ips(self, server): - for network in server.find('{%s}addresses' % xmlutil.XMLNS_V11): - for ip in network: - yield ip + return res \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py index 38e52bd354..d1af1e3732 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py @@ -13,12 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.config import cfg from oslo.serialization import jsonutils import webob -from nova.api.openstack.compute.contrib import extended_server_attributes from nova import compute from nova import db from nova import exception @@ -132,17 +130,4 @@ class ExtendedServerAttributesTestV2(ExtendedServerAttributesTestV21): req = webob.Request.blank(url) req.headers['Accept'] = self.content_type res = req.get_response(fakes.wsgi_app(init_only=('servers',))) - return res - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedServerAttributesXmlTest(ExtendedServerAttributesTestV2): - content_type = 'application/xml' - ext = extended_server_attributes - prefix = '{%s}' % ext.Extended_server_attributes.namespace - - def _get_server(self, body): - return etree.XML(body) - - def _get_servers(self, body): - return etree.XML(body).getchildren() + return res \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py index 81ca6ed2b5..5f9f281c0c 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py @@ -13,11 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob -from nova.api.openstack.compute.contrib import extended_status from nova import compute from nova import db from nova import exception @@ -134,16 +132,4 @@ class ExtendedStatusTestV2(ExtendedStatusTestV21): req = webob.Request.blank(url) req.headers['Accept'] = self.content_type res = req.get_response(fakes.wsgi_app(init_only=('servers',))) - return res - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedStatusXmlTest(ExtendedStatusTestV2): - content_type = 'application/xml' - prefix = '{%s}' % extended_status.Extended_status.namespace - - def _get_server(self, body): - return etree.XML(body) - - def _get_servers(self, body): - return etree.XML(body).getchildren() + return res \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py index e6625be4a8..ab1cf0a1d3 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py @@ -13,12 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_virtual_interfaces_net -from nova.api.openstack import wsgi from nova import compute from nova import network from nova import test @@ -101,24 +99,4 @@ class ExtendedServerVIFNetTest(test.NoDBTestCase): res = self._make_request('/v2/fake/servers/abcd/os-virtual-interfaces') self.assertEqual(res.status_int, 200) - self.assertVIFs(self._get_vifs(res.body)) - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedServerVIFNetSerializerXmlTest(ExtendedServerVIFNetTest): - content_type = 'application/xml' - prefix = "{%s}" % extended_virtual_interfaces_net. \ - Extended_virtual_interfaces_net.namespace - - def setUp(self): - super(ExtendedServerVIFNetSerializerXmlTest, self).setUp() - self.namespace = wsgi.XMLNS_V11 - self.serializer = extended_virtual_interfaces_net. \ - ExtendedVirtualInterfaceNetTemplate() - - def _get_vifs(self, body): - return etree.XML(body).getchildren() - - def _get_net_id(self, vifs): - for vif in vifs: - yield vif.attrib['%snet_id' % self.prefix] + self.assertVIFs(self._get_vifs(res.body)) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py index 3cbfafcfdc..0fc4126bfe 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py @@ -13,11 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob -from nova.api.openstack.compute.contrib import extended_volumes from nova import compute from nova import db from nova import objects @@ -91,11 +89,7 @@ class ExtendedVolumesTest(test.TestCase): self.assertEqual(res.status_int, 200) server = self._get_server(res.body) exp_volumes = [{'id': UUID1}, {'id': UUID2}] - if self.content_type == 'application/json': - actual = server.get('%svolumes_attached' % self.prefix) - elif self.content_type == 'application/xml': - actual = [dict(elem.items()) for elem in - server.findall('%svolume_attached' % self.prefix)] + actual = server.get('%svolumes_attached' % self.prefix) self.assertEqual(exp_volumes, actual) def test_detail(self): @@ -105,21 +99,5 @@ class ExtendedVolumesTest(test.TestCase): self.assertEqual(res.status_int, 200) exp_volumes = [{'id': UUID1}, {'id': UUID2}] for i, server in enumerate(self._get_servers(res.body)): - if self.content_type == 'application/json': - actual = server.get('%svolumes_attached' % self.prefix) - elif self.content_type == 'application/xml': - actual = [dict(elem.items()) for elem in - server.findall('%svolume_attached' % self.prefix)] - self.assertEqual(exp_volumes, actual) - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ExtendedVolumesXmlTest(ExtendedVolumesTest): - content_type = 'application/xml' - prefix = '{%s}' % extended_volumes.Extended_volumes.namespace - - def _get_server(self, body): - return etree.XML(body) - - def _get_servers(self, body): - return etree.XML(body).getchildren() + actual = server.get('%svolumes_attached' % self.prefix) + self.assertEqual(exp_volumes, actual) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_access.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_access.py index 8f25767262..248d4057d2 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_access.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_access.py @@ -15,7 +15,6 @@ import datetime -from lxml import etree from webob import exc from nova.api.openstack import api_version_request as api_version @@ -381,24 +380,3 @@ class FlavorAccessTestV20(FlavorAccessTestV21): FlavorActionController = flavor_access_v2.FlavorActionController _prefix = "/v2/fake" validation_ex = exc.HTTPBadRequest - - -class FlavorAccessSerializerTest(test.NoDBTestCase): - def test_serializer_empty(self): - serializer = flavor_access_v2.FlavorAccessTemplate() - text = serializer.serialize(dict(flavor_access=[])) - tree = etree.fromstring(text) - self.assertEqual(len(tree), 0) - - def test_serializer(self): - expected = ("\n" - '' - '' - '' - '') - access_list = [{'flavor_id': '2', 'tenant_id': 'proj2'}, - {'flavor_id': '2', 'tenant_id': 'proj3'}] - - serializer = flavor_access_v2.FlavorAccessTemplate() - text = serializer.serialize(dict(flavor_access=access_list)) - self.assertEqual(text, expected) diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py index e1d73df59b..f87221dab0 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py @@ -12,11 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob -from nova.api.openstack.compute.contrib import flavor_disabled from nova.compute import flavors from nova import test from nova.tests.unit.api.openstack import fakes @@ -113,16 +111,4 @@ class FlavorDisabledTestV2(FlavorDisabledTestV21): req = webob.Request.blank(url) req.headers['Accept'] = self.content_type res = req.get_response(fakes.wsgi_app()) - return res - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorDisabledXmlTest(FlavorDisabledTestV2): - content_type = 'application/xml' - prefix = '{%s}' % flavor_disabled.Flavor_disabled.namespace - - def _get_flavor(self, body): - return etree.XML(body) - - def _get_flavors(self, body): - return etree.XML(body).getchildren() + return res \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py index d0e7b5bfea..26435c9b8b 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob @@ -114,15 +113,4 @@ class FlavorRxtxTestV21(test.NoDBTestCase): class FlavorRxtxTestV20(FlavorRxtxTestV21): def _get_app(self): - return fakes.wsgi_app() - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorRxtxXmlTest(FlavorRxtxTestV20): - content_type = 'application/xml' - - def _get_flavor(self, body): - return etree.XML(body) - - def _get_flavors(self, body): - return etree.XML(body).getchildren() + return fakes.wsgi_app() \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py index 942741dee0..14adfeedf3 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob @@ -113,15 +112,4 @@ class FlavorSwapTestV2(FlavorSwapTestV21): req = webob.Request.blank(url) req.headers['Accept'] = self.content_type res = req.get_response(fakes.wsgi_app()) - return res - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class FlavorSwapXmlTest(FlavorSwapTestV2): - content_type = 'application/xml' - - def _get_flavor(self, body): - return etree.XML(body) - - def _get_flavors(self, body): - return etree.XML(body).getchildren() + return res \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavors_extra_specs.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavors_extra_specs.py index 8a6f4814a8..fff517b3a7 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_flavors_extra_specs.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavors_extra_specs.py @@ -374,30 +374,4 @@ class FlavorsExtraSpecsTestV21(test.TestCase): class FlavorsExtraSpecsTestV2(FlavorsExtraSpecsTestV21): bad_request = webob.exc.HTTPBadRequest - flavorextraspecs = flavorextraspecs_v2 - - -class FlavorsExtraSpecsXMLSerializerTest(test.TestCase): - def test_serializer(self): - serializer = flavorextraspecs_v2.ExtraSpecsTemplate() - expected = ("\n" - 'value1') - text = serializer.serialize(dict(extra_specs={"key1": "value1"})) - self.assertEqual(text, expected) - - def test_show_update_serializer(self): - serializer = flavorextraspecs_v2.ExtraSpecTemplate() - expected = ("\n" - 'value1') - text = serializer.serialize(dict({"key1": "value1"})) - self.assertEqual(text, expected) - - def test_serializer_with_colon_tagname(self): - # Our test object to serialize - obj = {'extra_specs': {'foo:bar': '999'}} - serializer = flavorextraspecs_v2.ExtraSpecsTemplate() - expected_xml = (("\n" - '999' - '')) - result = serializer.serialize(obj) - self.assertEqual(expected_xml, result) + flavorextraspecs = flavorextraspecs_v2 \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_dns.py b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_dns.py index 0deeec8bcb..6c51c13bdf 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_dns.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_dns.py @@ -16,7 +16,6 @@ import urllib -from lxml import etree import mock import webob @@ -397,78 +396,4 @@ class FloatingIpDNSTestV2(FloatingIpDNSTestV21): self.assertEqual(expected_status, res.status_int) def _bad_request(self): - return webob.exc.HTTPUnprocessableEntity - - -class FloatingIpDNSSerializerTestV2(test.TestCase): - floating_ip_dns = fipdns_v2 - - def test_domains(self): - serializer = self.floating_ip_dns.DomainsTemplate() - text = serializer.serialize(dict( - domain_entries=[ - dict(domain=domain, scope='public', project='testproject'), - dict(domain=domain2, scope='private', - availability_zone='avzone')])) - - tree = etree.fromstring(text) - self.assertEqual('domain_entries', tree.tag) - self.assertEqual(2, len(tree)) - self.assertEqual(domain, tree[0].get('domain')) - self.assertEqual(domain2, tree[1].get('domain')) - self.assertEqual('avzone', tree[1].get('availability_zone')) - - def test_domain_serializer(self): - serializer = self.floating_ip_dns.DomainTemplate() - text = serializer.serialize(dict( - domain_entry=dict(domain=domain, - scope='public', - project='testproject'))) - - tree = etree.fromstring(text) - self.assertEqual('domain_entry', tree.tag) - self.assertEqual(domain, tree.get('domain')) - self.assertEqual('testproject', tree.get('project')) - - def test_entries_serializer(self): - serializer = self.floating_ip_dns.FloatingIPDNSsTemplate() - text = serializer.serialize(dict( - dns_entries=[ - dict(ip=test_ipv4_address, - type='A', - domain=domain, - name=name), - dict(ip=test_ipv4_address2, - type='C', - domain=domain, - name=name2)])) - - tree = etree.fromstring(text) - self.assertEqual('dns_entries', tree.tag) - self.assertEqual(2, len(tree)) - self.assertEqual('dns_entry', tree[0].tag) - self.assertEqual('dns_entry', tree[1].tag) - self.assertEqual(test_ipv4_address, tree[0].get('ip')) - self.assertEqual('A', tree[0].get('type')) - self.assertEqual(domain, tree[0].get('domain')) - self.assertEqual(name, tree[0].get('name')) - self.assertEqual(test_ipv4_address2, tree[1].get('ip')) - self.assertEqual('C', tree[1].get('type')) - self.assertEqual(domain, tree[1].get('domain')) - self.assertEqual(name2, tree[1].get('name')) - - def test_entry_serializer(self): - serializer = self.floating_ip_dns.FloatingIPDNSTemplate() - text = serializer.serialize(dict( - dns_entry=dict( - ip=test_ipv4_address, - type='A', - domain=domain, - name=name))) - - tree = etree.fromstring(text) - - self.assertEqual('dns_entry', tree.tag) - self.assertEqual(test_ipv4_address, tree.get('ip')) - self.assertEqual(domain, tree.get('domain')) - self.assertEqual(name, tree.get('name')) + return webob.exc.HTTPUnprocessableEntity \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_pools.py b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_pools.py index 926e88c6ae..f5b8bbee54 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_pools.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_pools.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree - from nova.api.openstack.compute.contrib import floating_ip_pools as fipp_v2 from nova.api.openstack.compute.plugins.v3 import floating_ip_pools as\ fipp_v21 @@ -59,25 +57,4 @@ class FloatingIpPoolTestV21(test.NoDBTestCase): class FloatingIpPoolTestV2(FloatingIpPoolTestV21): - floating_ip_pools = fipp_v2 - - -class FloatingIpPoolSerializerTestV2(test.NoDBTestCase): - floating_ip_pools = fipp_v2 - - def test_index_serializer(self): - serializer = self.floating_ip_pools.FloatingIPPoolsTemplate() - text = serializer.serialize(dict( - floating_ip_pools=[ - dict(name='nova'), - dict(name='other') - ])) - - tree = etree.fromstring(text) - - self.assertEqual('floating_ip_pools', tree.tag) - self.assertEqual(2, len(tree)) - self.assertEqual('floating_ip_pool', tree[0].tag) - self.assertEqual('floating_ip_pool', tree[1].tag) - self.assertEqual('nova', tree[0].get('name')) - self.assertEqual('other', tree[1].get('name')) + floating_ip_pools = fipp_v2 \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips.py b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips.py index b3acdba352..9a8c64290c 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips.py @@ -17,7 +17,6 @@ import contextlib import uuid -from lxml import etree import mock from oslo.serialization import jsonutils import webob @@ -887,50 +886,3 @@ class ExtendedFloatingIpTestV2(ExtendedFloatingIpTestV21): osapi_compute_extension=[ 'nova.api.openstack.compute.contrib.select_extensions'], osapi_compute_ext_list=['Floating_ips', 'Extended_floating_ips']) - - -class FloatingIpSerializerTestV2(test.TestCase): - def test_default_serializer(self): - serializer = fips_v2.FloatingIPTemplate() - text = serializer.serialize(dict( - floating_ip=dict( - instance_id=1, - ip='10.10.10.10', - fixed_ip='10.0.0.1', - id=1))) - - tree = etree.fromstring(text) - - self.assertEqual('floating_ip', tree.tag) - self.assertEqual('1', tree.get('instance_id')) - self.assertEqual('10.10.10.10', tree.get('ip')) - self.assertEqual('10.0.0.1', tree.get('fixed_ip')) - self.assertEqual('1', tree.get('id')) - - def test_index_serializer(self): - serializer = fips_v2.FloatingIPsTemplate() - text = serializer.serialize(dict( - floating_ips=[ - dict(instance_id=1, - ip='10.10.10.10', - fixed_ip='10.0.0.1', - id=1), - dict(instance_id=None, - ip='10.10.10.11', - fixed_ip=None, - id=2)])) - - tree = etree.fromstring(text) - - self.assertEqual('floating_ips', tree.tag) - self.assertEqual(2, len(tree)) - self.assertEqual('floating_ip', tree[0].tag) - self.assertEqual('floating_ip', tree[1].tag) - self.assertEqual('1', tree[0].get('instance_id')) - self.assertEqual('None', tree[1].get('instance_id')) - self.assertEqual('10.10.10.10', tree[0].get('ip')) - self.assertEqual('10.10.10.11', tree[1].get('ip')) - self.assertEqual('10.0.0.1', tree[0].get('fixed_ip')) - self.assertEqual('None', tree[1].get('fixed_ip')) - self.assertEqual('1', tree[0].get('id')) - self.assertEqual('2', tree[1].get('id')) diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py b/nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py index 76c3101b8b..a140940c88 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py @@ -15,11 +15,9 @@ import itertools -from lxml import etree from oslo.serialization import jsonutils import webob -from nova.api.openstack import wsgi from nova import compute from nova.compute import vm_states from nova import db @@ -150,24 +148,4 @@ class HideServerAddressesTestV2(HideServerAddressesTestV21): osapi_compute_extension=[ 'nova.api.openstack.compute.contrib.select_extensions'], osapi_compute_ext_list=['Hide_server_addresses']) - self.wsgi_app = fakes.wsgi_app(init_only=('servers',)) - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class HideAddressesXmlTest(HideServerAddressesTestV2): - content_type = 'application/xml' - - @staticmethod - def _get_server(body): - return etree.XML(body) - - @staticmethod - def _get_servers(body): - return etree.XML(body).getchildren() - - @staticmethod - def _get_addresses(server): - addresses = server.find('{%s}addresses' % wsgi.XMLNS_V11) - if addresses is None: - return SENTINEL - return addresses + self.wsgi_app = fakes.wsgi_app(init_only=('servers',)) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_hosts.py b/nova/tests/unit/api/openstack/compute/contrib/test_hosts.py index b57ba0f235..6e1ef2770e 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_hosts.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_hosts.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree import testtools import webob.exc @@ -27,7 +26,6 @@ from nova import exception from nova import test from nova.tests.unit.api.openstack import fakes from nova.tests.unit import fake_hosts -from nova.tests.unit import utils def stub_service_get_all(context, disabled=None): @@ -414,89 +412,3 @@ class HostTestCaseV20(HostTestCaseV21): def test_list_hosts_with_invalid_service(self): pass - - -class HostSerializerTest(test.TestCase): - def setUp(self): - super(HostSerializerTest, self).setUp() - self.deserializer = os_hosts_v2.HostUpdateDeserializer() - - def test_index_serializer(self): - serializer = os_hosts_v2.HostIndexTemplate() - text = serializer.serialize(fake_hosts.OS_API_HOST_LIST) - - tree = etree.fromstring(text) - - self.assertEqual('hosts', tree.tag) - self.assertEqual(len(fake_hosts.HOST_LIST), len(tree)) - for i in range(len(fake_hosts.HOST_LIST)): - self.assertEqual('host', tree[i].tag) - self.assertEqual(fake_hosts.HOST_LIST[i]['host_name'], - tree[i].get('host_name')) - self.assertEqual(fake_hosts.HOST_LIST[i]['service'], - tree[i].get('service')) - self.assertEqual(fake_hosts.HOST_LIST[i]['zone'], - tree[i].get('zone')) - - def test_update_serializer_with_status(self): - exemplar = dict(host='host_c1', status='enabled') - serializer = os_hosts_v2.HostUpdateTemplate() - text = serializer.serialize(exemplar) - - tree = etree.fromstring(text) - - self.assertEqual('host', tree.tag) - for key, value in exemplar.items(): - self.assertEqual(value, tree.get(key)) - - def test_update_serializer_with_maintenance_mode(self): - exemplar = dict(host='host_c1', maintenance_mode='enabled') - serializer = os_hosts_v2.HostUpdateTemplate() - text = serializer.serialize(exemplar) - - tree = etree.fromstring(text) - - self.assertEqual('host', tree.tag) - for key, value in exemplar.items(): - self.assertEqual(value, tree.get(key)) - - def test_update_serializer_with_maintenance_mode_and_status(self): - exemplar = dict(host='host_c1', - maintenance_mode='enabled', - status='enabled') - serializer = os_hosts_v2.HostUpdateTemplate() - text = serializer.serialize(exemplar) - - tree = etree.fromstring(text) - - self.assertEqual('host', tree.tag) - for key, value in exemplar.items(): - self.assertEqual(value, tree.get(key)) - - def test_action_serializer(self): - exemplar = dict(host='host_c1', power_action='reboot') - serializer = os_hosts_v2.HostActionTemplate() - text = serializer.serialize(exemplar) - - tree = etree.fromstring(text) - - self.assertEqual('host', tree.tag) - for key, value in exemplar.items(): - self.assertEqual(value, tree.get(key)) - - def test_update_deserializer(self): - exemplar = dict(status='enabled', maintenance_mode='disable') - intext = """ - - enabled - disable - """ - result = self.deserializer.deserialize(intext) - - self.assertEqual(dict(body=exemplar), result) - - def test_corrupt_xml(self): - self.assertRaises( - exception.MalformedRequestBody, - self.deserializer.deserialize, - utils.killer_xml_body()) diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py b/nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py index 33e53fe47d..701195ae37 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py @@ -15,7 +15,6 @@ import copy -from lxml import etree import mock from webob import exc @@ -416,185 +415,3 @@ class HypervisorsTestV2(HypervisorsTestV21): self.ext_mgr = extensions.ExtensionManager() self.ext_mgr.extensions = {} self.controller = hypervisors_v2.HypervisorsController(self.ext_mgr) - - -class HypervisorsSerializersTest(test.NoDBTestCase): - def compare_to_exemplar(self, exemplar, hyper): - # Check attributes - for key, value in exemplar.items(): - if key in ('service', 'servers'): - # These turn into child elements and get tested - # separately below... - continue - - self.assertEqual(str(value), hyper.get(key)) - - # Check child elements - required_children = set([child for child in ('service', 'servers') - if child in exemplar]) - for child in hyper: - self.assertIn(child.tag, required_children) - required_children.remove(child.tag) - - # Check the node... - if child.tag == 'service': - for key, value in exemplar['service'].items(): - self.assertEqual(str(value), child.get(key)) - elif child.tag == 'servers': - for idx, grandchild in enumerate(child): - self.assertEqual('server', grandchild.tag) - for key, value in exemplar['servers'][idx].items(): - self.assertEqual(str(value), grandchild.get(key)) - - # Are they all accounted for? - self.assertEqual(len(required_children), 0) - - def test_index_serializer(self): - serializer = hypervisors_v2.HypervisorIndexTemplate() - exemplar = dict(hypervisors=[ - dict(hypervisor_hostname="hyper1", - id=1), - dict(hypervisor_hostname="hyper2", - id=2)]) - text = serializer.serialize(exemplar) - tree = etree.fromstring(text) - - self.assertEqual('hypervisors', tree.tag) - self.assertEqual(len(exemplar['hypervisors']), len(tree)) - for idx, hyper in enumerate(tree): - self.assertEqual('hypervisor', hyper.tag) - self.compare_to_exemplar(exemplar['hypervisors'][idx], hyper) - - def test_detail_serializer(self): - serializer = hypervisors_v2.HypervisorDetailTemplate() - exemplar = dict(hypervisors=[ - dict(hypervisor_hostname="hyper1", - id=1, - vcpus=4, - memory_mb=10 * 1024, - local_gb=500, - vcpus_used=2, - memory_mb_used=5 * 1024, - local_gb_used=250, - hypervisor_type='xen', - hypervisor_version=3, - free_ram_mb=5 * 1024, - free_disk_gb=250, - current_workload=2, - running_vms=2, - cpu_info="json data", - disk_available_least=100, - host_ip='1.1.1.1', - service=dict(id=1, host="compute1")), - dict(hypervisor_hostname="hyper2", - id=2, - vcpus=4, - memory_mb=10 * 1024, - local_gb=500, - vcpus_used=2, - memory_mb_used=5 * 1024, - local_gb_used=250, - hypervisor_type='xen', - hypervisor_version=3, - free_ram_mb=5 * 1024, - free_disk_gb=250, - current_workload=2, - running_vms=2, - cpu_info="json data", - disk_available_least=100, - host_ip='2.2.2.2', - service=dict(id=2, host="compute2"))]) - text = serializer.serialize(exemplar) - tree = etree.fromstring(text) - - self.assertEqual('hypervisors', tree.tag) - self.assertEqual(len(exemplar['hypervisors']), len(tree)) - for idx, hyper in enumerate(tree): - self.assertEqual('hypervisor', hyper.tag) - self.compare_to_exemplar(exemplar['hypervisors'][idx], hyper) - - def test_show_serializer(self): - serializer = hypervisors_v2.HypervisorTemplate() - exemplar = dict(hypervisor=dict( - hypervisor_hostname="hyper1", - id=1, - vcpus=4, - memory_mb=10 * 1024, - local_gb=500, - vcpus_used=2, - memory_mb_used=5 * 1024, - local_gb_used=250, - hypervisor_type='xen', - hypervisor_version=3, - free_ram_mb=5 * 1024, - free_disk_gb=250, - current_workload=2, - running_vms=2, - cpu_info="json data", - disk_available_least=100, - host_ip='1.1.1.1', - service=dict(id=1, host="compute1"))) - text = serializer.serialize(exemplar) - tree = etree.fromstring(text) - - self.assertEqual('hypervisor', tree.tag) - self.compare_to_exemplar(exemplar['hypervisor'], tree) - - def test_uptime_serializer(self): - serializer = hypervisors_v2.HypervisorUptimeTemplate() - exemplar = dict(hypervisor=dict( - hypervisor_hostname="hyper1", - id=1, - uptime='fake uptime')) - text = serializer.serialize(exemplar) - tree = etree.fromstring(text) - - self.assertEqual('hypervisor', tree.tag) - self.compare_to_exemplar(exemplar['hypervisor'], tree) - - def test_servers_serializer(self): - serializer = hypervisors_v2.HypervisorServersTemplate() - exemplar = dict(hypervisors=[ - dict(hypervisor_hostname="hyper1", - id=1, - servers=[ - dict(name="inst1", - uuid="uuid1"), - dict(name="inst2", - uuid="uuid2")]), - dict(hypervisor_hostname="hyper2", - id=2, - servers=[ - dict(name="inst3", - uuid="uuid3"), - dict(name="inst4", - uuid="uuid4")])]) - text = serializer.serialize(exemplar) - tree = etree.fromstring(text) - - self.assertEqual('hypervisors', tree.tag) - self.assertEqual(len(exemplar['hypervisors']), len(tree)) - for idx, hyper in enumerate(tree): - self.assertEqual('hypervisor', hyper.tag) - self.compare_to_exemplar(exemplar['hypervisors'][idx], hyper) - - def test_statistics_serializer(self): - serializer = hypervisors_v2.HypervisorStatisticsTemplate() - exemplar = dict(hypervisor_statistics=dict( - count=2, - vcpus=8, - memory_mb=20 * 1024, - local_gb=500, - vcpus_used=4, - memory_mb_used=10 * 1024, - local_gb_used=250, - free_ram_mb=10 * 1024, - free_disk_gb=250, - current_workload=4, - running_vms=4, - disk_available_least=200)) - text = serializer.serialize(exemplar) - tree = etree.fromstring(text) - - self.assertEqual('hypervisor_statistics', tree.tag) - self.compare_to_exemplar(exemplar['hypervisor_statistics'], tree) diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_image_size.py b/nova/tests/unit/api/openstack/compute/contrib/test_image_size.py index 9c7d198e76..c59bdbee5e 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_image_size.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_image_size.py @@ -13,11 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob -from nova.api.openstack.compute.contrib import image_size from nova.image import glance from nova import test from nova.tests.unit.api.openstack import fakes @@ -121,19 +119,4 @@ class ImageSizeTestV21(test.NoDBTestCase): class ImageSizeTestV2(ImageSizeTestV21): def _get_app(self): - return fakes.wsgi_app() - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ImageSizeXmlTest(ImageSizeTestV2): - content_type = 'application/xml' - prefix = '{%s}' % image_size.Image_size.namespace - - def _get_image(self, body): - return etree.XML(body) - - def _get_images(self, body): - return etree.XML(body).getchildren() - - def assertImageSize(self, image, size): - self.assertEqual(int(image.get('%ssize' % self.prefix)), size) + return fakes.wsgi_app() \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_instance_actions.py b/nova/tests/unit/api/openstack/compute/contrib/test_instance_actions.py index a5ea3784e3..83a025cdf7 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_instance_actions.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_instance_actions.py @@ -16,7 +16,6 @@ import copy import uuid -from lxml import etree from webob import exc from nova.api.openstack.compute.contrib import instance_actions \ @@ -254,74 +253,4 @@ class InstanceActionsTestV2(InstanceActionsTestV21): common_policy.parse_rule(''), 'compute_extension:instance_actions:events': common_policy.parse_rule('is_admin:True')} - policy.set_rules(rules) - - -class InstanceActionsSerializerTestV2(test.NoDBTestCase): - def setUp(self): - super(InstanceActionsSerializerTestV2, self).setUp() - self.fake_actions = copy.deepcopy(fake_server_actions.FAKE_ACTIONS) - self.fake_events = copy.deepcopy(fake_server_actions.FAKE_EVENTS) - - def _verify_instance_action_attachment(self, attach, tree): - for key in attach.keys(): - if key != 'events': - self.assertEqual(attach[key], tree.get(key), - '%s did not match' % key) - - def _verify_instance_action_event_attachment(self, attach, tree): - for key in attach.keys(): - self.assertEqual(attach[key], tree.get(key), - '%s did not match' % key) - - def test_instance_action_serializer(self): - serializer = instance_actions_v2.InstanceActionTemplate() - action = self.fake_actions[FAKE_UUID][FAKE_REQUEST_ID] - text = serializer.serialize({'instanceAction': action}) - tree = etree.fromstring(text) - - action = format_action(action) - self.assertEqual('instanceAction', tree.tag) - self._verify_instance_action_attachment(action, tree) - found_events = False - for child in tree: - if child.tag == 'events': - found_events = True - self.assertFalse(found_events) - - def test_instance_action_events_serializer(self): - serializer = instance_actions_v2.InstanceActionTemplate() - action = self.fake_actions[FAKE_UUID][FAKE_REQUEST_ID] - event = self.fake_events[action['id']][0] - action['events'] = [dict(event), dict(event)] - text = serializer.serialize({'instanceAction': action}) - tree = etree.fromstring(text) - - action = format_action(action) - self.assertEqual('instanceAction', tree.tag) - self._verify_instance_action_attachment(action, tree) - - event = format_event(event) - found_events = False - for child in tree: - if child.tag == 'events': - found_events = True - for key in event: - self.assertEqual(event[key], child.get(key)) - self.assertTrue(found_events) - - def test_instance_actions_serializer(self): - serializer = instance_actions_v2.InstanceActionsTemplate() - action_list = self.fake_actions[FAKE_UUID].values() - text = serializer.serialize({'instanceActions': action_list}) - tree = etree.fromstring(text) - - action_list = [format_action(action) for action in action_list] - self.assertEqual('instanceActions', tree.tag) - self.assertEqual(len(action_list), len(tree)) - for idx, child in enumerate(tree): - self.assertEqual('instanceAction', child.tag) - request_id = child.get('request_id') - self._verify_instance_action_attachment( - self.fake_actions[FAKE_UUID][request_id], - child) + policy.set_rules(rules) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py b/nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py index d44ce3e84d..e6a0a9fc9a 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py @@ -13,13 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import keypairs as keypairs_v2 from nova.api.openstack.compute.plugins.v3 import keypairs as keypairs_v21 -from nova.api.openstack import wsgi from nova import db from nova import exception from nova.openstack.common import policy as common_policy @@ -398,64 +396,6 @@ class KeypairPolicyTestV21(test.TestCase): self.assertEqual(202, status_int) -class KeypairsXMLSerializerTest(test.TestCase): - def setUp(self): - super(KeypairsXMLSerializerTest, self).setUp() - self.deserializer = wsgi.XMLDeserializer() - - def test_default_serializer(self): - exemplar = dict(keypair=dict( - public_key='fake_public_key', - private_key='fake_private_key', - fingerprint='fake_fingerprint', - user_id='fake_user_id', - name='fake_key_name')) - serializer = keypairs_v2.KeypairTemplate() - text = serializer.serialize(exemplar) - - tree = etree.fromstring(text) - - self.assertEqual('keypair', tree.tag) - for child in tree: - self.assertIn(child.tag, exemplar['keypair']) - self.assertEqual(child.text, exemplar['keypair'][child.tag]) - - def test_index_serializer(self): - exemplar = dict(keypairs=[ - dict(keypair=dict( - name='key1_name', - public_key='key1_key', - fingerprint='key1_fingerprint')), - dict(keypair=dict( - name='key2_name', - public_key='key2_key', - fingerprint='key2_fingerprint'))]) - serializer = keypairs_v2.KeypairsTemplate() - text = serializer.serialize(exemplar) - - tree = etree.fromstring(text) - - self.assertEqual('keypairs', tree.tag) - self.assertEqual(len(exemplar['keypairs']), len(tree)) - for idx, keypair in enumerate(tree): - self.assertEqual('keypair', keypair.tag) - kp_data = exemplar['keypairs'][idx]['keypair'] - for child in keypair: - self.assertIn(child.tag, kp_data) - self.assertEqual(child.text, kp_data[child.tag]) - - def test_deserializer(self): - exemplar = dict(keypair=dict( - name='key_name', - public_key='public_key')) - intext = ("\n" - 'key_name' - 'public_key') - - result = self.deserializer.deserialize(intext)['body'] - self.assertEqual(result, exemplar) - - class KeypairsTestV2(KeypairsTestV21): validation_error = webob.exc.HTTPBadRequest diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_migrations.py b/nova/tests/unit/api/openstack/compute/contrib/test_migrations.py index 3f59bea28a..042575b496 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_migrations.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_migrations.py @@ -14,7 +14,6 @@ import datetime -from lxml import etree from oslotest import moxstubout from nova.api.openstack.compute.contrib import migrations as migrations_v2 @@ -120,29 +119,4 @@ class MigrationsTestCaseV21(test.NoDBTestCase): class MigrationsTestCaseV2(MigrationsTestCaseV21): - migrations = migrations_v2 - - -class MigrationsTemplateTestV2(test.NoDBTestCase): - migrations = migrations_v2 - - def setUp(self): - super(MigrationsTemplateTestV2, self).setUp() - self.serializer = self.migrations.MigrationsTemplate() - - def test_index_serialization(self): - migrations_out = self.migrations.output(migrations_obj) - res_xml = self.serializer.serialize( - {'migrations': migrations_out}) - - tree = etree.XML(res_xml) - children = tree.findall('migration') - self.assertEqual(tree.tag, 'migrations') - self.assertEqual(2, len(children)) - - for idx, child in enumerate(children): - self.assertEqual(child.tag, 'migration') - migration = migrations_out[idx] - for attr in migration.keys(): - self.assertEqual(str(migration[attr]), - child.get(attr)) + migrations = migrations_v2 \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py b/nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py index 9b880b60a2..356f9864be 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py @@ -14,7 +14,6 @@ # under the License. import uuid -from lxml import etree import mock from neutronclient.common import exceptions as n_exc from neutronclient.neutron import v2_0 as neutronv20 @@ -23,7 +22,6 @@ from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import security_groups -from nova.api.openstack import xmlutil from nova import compute from nova import context import nova.db @@ -479,18 +477,6 @@ class TestNeutronSecurityGroupRulesV21( pass -class TestNeutronSecurityGroupsXMLDeserializer( - test_security_groups.TestSecurityGroupXMLDeserializer, - TestNeutronSecurityGroupsTestCase): - pass - - -class TestNeutronSecurityGroupsXMLSerializer( - test_security_groups.TestSecurityGroupXMLSerializer, - TestNeutronSecurityGroupsTestCase): - pass - - class TestNeutronSecurityGroupsOutputTest(TestNeutronSecurityGroupsTestCase): content_type = 'application/json' @@ -622,45 +608,6 @@ class TestNeutronSecurityGroupsOutputTest(TestNeutronSecurityGroupsTestCase): self.assertEqual(res.status_int, 404) -@test.skipXmlTest("Nova v2 XML support is disabled") -class TestNeutronSecurityGroupsOutputXMLTest( - TestNeutronSecurityGroupsOutputTest): - - content_type = 'application/xml' - - class MinimalCreateServerTemplate(xmlutil.TemplateBuilder): - def construct(self): - root = xmlutil.TemplateElement('server', selector='server') - root.set('name') - root.set('id') - root.set('imageRef') - root.set('flavorRef') - elem = xmlutil.SubTemplateElement(root, 'security_groups') - sg = xmlutil.SubTemplateElement(elem, 'security_group', - selector='security_groups') - sg.set('name') - return xmlutil.MasterTemplate(root, 1, - nsmap={None: xmlutil.XMLNS_V11}) - - def _encode_body(self, body): - serializer = self.MinimalCreateServerTemplate() - return serializer.serialize(body) - - def _get_server(self, body): - return etree.XML(body) - - def _get_servers(self, body): - return etree.XML(body).getchildren() - - def _get_groups(self, server): - # NOTE(vish): we are adding security groups without an extension - # namespace so we don't break people using the existing - # functionality, but that means we need to use find with - # the existing server namespace. - namespace = server.nsmap[None] - return server.find('{%s}security_groups' % namespace).getchildren() - - def get_client(context=None, admin=False): return MockClient() diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_quota_classes.py b/nova/tests/unit/api/openstack/compute/contrib/test_quota_classes.py index 6305dc0640..93a341f571 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_quota_classes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_quota_classes.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree import webob from nova.api.openstack.compute.contrib import quota_classes @@ -21,7 +20,6 @@ from nova.api.openstack.compute import plugins from nova.api.openstack.compute.plugins.v3 import quota_classes \ as quota_classes_v21 from nova.api.openstack import extensions -from nova.api.openstack import wsgi from nova import test from nova.tests.unit.api.openstack import fakes @@ -167,70 +165,4 @@ class QuotaClassSetsTestV2(QuotaClassSetsTestV21): def _setup(self): ext_mgr = extensions.ExtensionManager() ext_mgr.extensions = {} - self.controller = quota_classes.QuotaClassSetsController(ext_mgr) - - -class QuotaTemplateXMLSerializerTest(test.TestCase): - def setUp(self): - super(QuotaTemplateXMLSerializerTest, self).setUp() - self.serializer = quota_classes.QuotaClassTemplate() - self.deserializer = wsgi.XMLDeserializer() - - def test_serializer(self): - exemplar = dict(quota_class_set=dict( - id='test_class', - metadata_items=10, - injected_file_path_bytes=255, - injected_file_content_bytes=20, - ram=50, - floating_ips=60, - fixed_ips=-1, - instances=70, - injected_files=80, - security_groups=10, - security_group_rules=20, - key_pairs=100, - cores=90)) - text = self.serializer.serialize(exemplar) - - tree = etree.fromstring(text) - - self.assertEqual('quota_class_set', tree.tag) - self.assertEqual('test_class', tree.get('id')) - self.assertEqual(len(exemplar['quota_class_set']) - 1, len(tree)) - for child in tree: - self.assertIn(child.tag, exemplar['quota_class_set']) - self.assertEqual(int(child.text), - exemplar['quota_class_set'][child.tag]) - - def test_deserializer(self): - exemplar = dict(quota_class_set=dict( - metadata_items='10', - injected_file_content_bytes='20', - ram='50', - floating_ips='60', - fixed_ips='-1', - instances='70', - injected_files='80', - security_groups='10', - security_group_rules='20', - key_pairs='100', - cores='90')) - intext = ("\n" - '' - '10' - '20' - '' - '50' - '60' - '-1' - '70' - '80' - '90' - '10' - '20' - '100' - '') - - result = self.deserializer.deserialize(intext)['body'] - self.assertEqual(result, exemplar) + self.controller = quota_classes.QuotaClassSetsController(ext_mgr) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_quotas.py b/nova/tests/unit/api/openstack/compute/contrib/test_quotas.py index 84b173bc15..0fa402ad75 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_quotas.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_quotas.py @@ -16,14 +16,12 @@ import copy -from lxml import etree import mock import webob from nova.api.openstack.compute.contrib import quotas as quotas_v2 from nova.api.openstack.compute.plugins.v3 import quota_sets as quotas_v21 from nova.api.openstack import extensions -from nova.api.openstack import wsgi from nova import context as context_maker from nova import exception from nova import quota @@ -323,71 +321,6 @@ class QuotaSetsTestV21(BaseQuotaSetsTest): self.assertEqual(202, self.get_delete_status_int(res)) -class QuotaXMLSerializerTest(test.TestCase): - def setUp(self): - super(QuotaXMLSerializerTest, self).setUp() - self.serializer = quotas_v2.QuotaTemplate() - self.deserializer = wsgi.XMLDeserializer() - - def test_serializer(self): - exemplar = dict(quota_set=dict( - id='project_id', - metadata_items=10, - injected_file_path_bytes=255, - injected_file_content_bytes=20, - ram=50, - floating_ips=60, - fixed_ips=-1, - instances=70, - injected_files=80, - security_groups=10, - security_group_rules=20, - key_pairs=100, - cores=90)) - text = self.serializer.serialize(exemplar) - - tree = etree.fromstring(text) - - self.assertEqual('quota_set', tree.tag) - self.assertEqual('project_id', tree.get('id')) - self.assertEqual(len(exemplar['quota_set']) - 1, len(tree)) - for child in tree: - self.assertIn(child.tag, exemplar['quota_set']) - self.assertEqual(int(child.text), exemplar['quota_set'][child.tag]) - - def test_deserializer(self): - exemplar = dict(quota_set=dict( - metadata_items='10', - injected_file_content_bytes='20', - ram='50', - floating_ips='60', - fixed_ips='-1', - instances='70', - injected_files='80', - security_groups='10', - security_group_rules='20', - key_pairs='100', - cores='90')) - intext = ("\n" - '' - '10' - '20' - '' - '50' - '60' - '-1' - '70' - '80' - '10' - '20' - '100' - '90' - '') - - result = self.deserializer.deserialize(intext)['body'] - self.assertEqual(result, exemplar) - - class ExtendedQuotasTestV21(BaseQuotaSetsTest): plugin = quotas_v21 diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py b/nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py index bb5fd8c8db..5b50143dfb 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree import mock from oslo.config import cfg import webob @@ -21,7 +20,6 @@ from nova.api.openstack.compute.contrib import \ security_group_default_rules as security_group_default_rules_v2 from nova.api.openstack.compute.plugins.v3 import \ security_group_default_rules as security_group_default_rules_v21 -from nova.api.openstack import wsgi from nova import context import nova.db from nova import exception @@ -370,178 +368,3 @@ class TestSecurityGroupDefaultRulesV21(test.TestCase): class TestSecurityGroupDefaultRulesV2(test.TestCase): controller_cls = (security_group_default_rules_v2. SecurityGroupDefaultRulesController) - - -class TestSecurityGroupDefaultRulesXMLDeserializer(test.TestCase): - def setUp(self): - super(TestSecurityGroupDefaultRulesXMLDeserializer, self).setUp() - deserializer = security_group_default_rules_v2.\ - SecurityGroupDefaultRulesXMLDeserializer() - self.deserializer = deserializer - - def test_create_request(self): - serial_request = """ - - 22 - 22 - TCP - 10.10.10.0/24 -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "security_group_default_rule": { - "from_port": "22", - "to_port": "22", - "ip_protocol": "TCP", - "cidr": "10.10.10.0/24" - }, - } - self.assertEqual(request['body'], expected) - - def test_create_no_to_port_request(self): - serial_request = """ - - 22 - TCP - 10.10.10.0/24 -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "security_group_default_rule": { - "from_port": "22", - "ip_protocol": "TCP", - "cidr": "10.10.10.0/24" - }, - } - self.assertEqual(request['body'], expected) - - def test_create_no_from_port_request(self): - serial_request = """ - - 22 - TCP - 10.10.10.0/24 -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "security_group_default_rule": { - "to_port": "22", - "ip_protocol": "TCP", - "cidr": "10.10.10.0/24" - }, - } - self.assertEqual(request['body'], expected) - - def test_create_no_ip_protocol_request(self): - serial_request = """ - - 22 - 22 - 10.10.10.0/24 -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "security_group_default_rule": { - "from_port": "22", - "to_port": "22", - "cidr": "10.10.10.0/24" - }, - } - self.assertEqual(request['body'], expected) - - def test_create_no_cidr_request(self): - serial_request = """ - - 22 - 22 - TCP -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "security_group_default_rule": { - "from_port": "22", - "to_port": "22", - "ip_protocol": "TCP", - }, - } - self.assertEqual(request['body'], expected) - - -class TestSecurityGroupDefaultRuleXMLSerializer(test.TestCase): - def setUp(self): - super(TestSecurityGroupDefaultRuleXMLSerializer, self).setUp() - self.namespace = wsgi.XMLNS_V11 - self.rule_serializer =\ - security_group_default_rules_v2.SecurityGroupDefaultRuleTemplate() - self.index_serializer =\ - security_group_default_rules_v2.SecurityGroupDefaultRulesTemplate() - - def _tag(self, elem): - tagname = elem.tag - self.assertEqual(tagname[0], '{') - tmp = tagname.partition('}') - namespace = tmp[0][1:] - self.assertEqual(namespace, self.namespace) - return tmp[2] - - def _verify_security_group_default_rule(self, raw_rule, tree): - self.assertEqual(raw_rule['id'], tree.get('id')) - - seen = set() - expected = set(['ip_protocol', 'from_port', 'to_port', 'ip_range', - 'ip_range/cidr']) - - for child in tree: - child_tag = self._tag(child) - seen.add(child_tag) - if child_tag == 'ip_range': - for gr_child in child: - gr_child_tag = self._tag(gr_child) - self.assertIn(gr_child_tag, raw_rule[child_tag]) - seen.add('%s/%s' % (child_tag, gr_child_tag)) - self.assertEqual(gr_child.text, - raw_rule[child_tag][gr_child_tag]) - else: - self.assertEqual(child.text, raw_rule[child_tag]) - self.assertEqual(seen, expected) - - def test_rule_serializer(self): - raw_rule = dict(id='123', - ip_protocol='TCP', - from_port='22', - to_port='22', - ip_range=dict(cidr='10.10.10.0/24')) - rule = dict(security_group_default_rule=raw_rule) - text = self.rule_serializer.serialize(rule) - - tree = etree.fromstring(text) - - self.assertEqual('security_group_default_rule', self._tag(tree)) - self._verify_security_group_default_rule(raw_rule, tree) - - def test_index_serializer(self): - rules = [dict(id='123', - ip_protocol='TCP', - from_port='22', - to_port='22', - ip_range=dict(cidr='10.10.10.0/24')), - dict(id='234', - ip_protocol='UDP', - from_port='23456', - to_port='234567', - ip_range=dict(cidr='10.12.0.0/18')), - dict(id='345', - ip_protocol='tcp', - from_port='3456', - to_port='4567', - ip_range=dict(cidr='192.168.1.0/32'))] - - rules_dict = dict(security_group_default_rules=rules) - - text = self.index_serializer.serialize(rules_dict) - - tree = etree.fromstring(text) - self.assertEqual('security_group_default_rules', self._tag(tree)) - self.assertEqual(len(rules), len(tree)) - for idx, child in enumerate(tree): - self._verify_security_group_default_rule(rules[idx], child) diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py index a70c16fefd..682bf0d2fb 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree import mock from mox3 import mox from oslo.config import cfg @@ -23,8 +22,6 @@ import webob from nova.api.openstack.compute.contrib import security_groups as secgroups_v2 from nova.api.openstack.compute.plugins.v3 import security_groups as \ secgroups_v21 -from nova.api.openstack import wsgi -from nova.api.openstack import xmlutil from nova import compute from nova.compute import power_state from nova import context as context_maker @@ -36,7 +33,6 @@ from nova import quota from nova import test from nova.tests.unit.api.openstack import fakes from nova.tests.unit import fake_instance -from nova.tests.unit import utils CONF = cfg.CONF FAKE_UUID1 = 'a47ae74e-ab08-447f-8eee-ffd43fc46c16' @@ -1324,279 +1320,6 @@ class TestSecurityGroupRulesV2(TestSecurityGroupRulesV21): secgrp_ctl_cls = secgroups_v2.SecurityGroupRulesController -class TestSecurityGroupRulesXMLDeserializer(test.TestCase): - - def setUp(self): - super(TestSecurityGroupRulesXMLDeserializer, self).setUp() - self.deserializer = secgroups_v2.SecurityGroupRulesXMLDeserializer() - - def test_create_request(self): - serial_request = """ - - 12 - 22 - 22 - - tcp - 10.0.0.0/24 -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "security_group_rule": { - "parent_group_id": "12", - "from_port": "22", - "to_port": "22", - "ip_protocol": "tcp", - "group_id": "", - "cidr": "10.0.0.0/24", - }, - } - self.assertEqual(request['body'], expected) - - def test_create_no_protocol_request(self): - serial_request = """ - - 12 - 22 - 22 - - 10.0.0.0/24 -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "security_group_rule": { - "parent_group_id": "12", - "from_port": "22", - "to_port": "22", - "group_id": "", - "cidr": "10.0.0.0/24", - }, - } - self.assertEqual(request['body'], expected) - - def test_corrupt_xml(self): - """Should throw a 400 error on corrupt xml.""" - self.assertRaises( - exception.MalformedRequestBody, - self.deserializer.deserialize, - utils.killer_xml_body()) - - -class TestSecurityGroupXMLDeserializer(test.TestCase): - - def setUp(self): - super(TestSecurityGroupXMLDeserializer, self).setUp() - self.deserializer = secgroups_v2.SecurityGroupXMLDeserializer() - - def test_create_request(self): - serial_request = """ - - test -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "security_group": { - "name": "test", - "description": "test", - }, - } - self.assertEqual(request['body'], expected) - - def test_create_no_description_request(self): - serial_request = """ - -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "security_group": { - "name": "test", - }, - } - self.assertEqual(request['body'], expected) - - def test_create_no_name_request(self): - serial_request = """ - -test -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "security_group": { - "description": "test", - }, - } - self.assertEqual(request['body'], expected) - - def test_corrupt_xml(self): - """Should throw a 400 error on corrupt xml.""" - self.assertRaises( - exception.MalformedRequestBody, - self.deserializer.deserialize, - utils.killer_xml_body()) - - -class TestSecurityGroupXMLSerializer(test.TestCase): - def setUp(self): - super(TestSecurityGroupXMLSerializer, self).setUp() - self.namespace = wsgi.XMLNS_V11 - self.rule_serializer = secgroups_v2.SecurityGroupRuleTemplate() - self.index_serializer = secgroups_v2.SecurityGroupsTemplate() - self.default_serializer = secgroups_v2.SecurityGroupTemplate() - - def _tag(self, elem): - tagname = elem.tag - self.assertEqual(tagname[0], '{') - tmp = tagname.partition('}') - namespace = tmp[0][1:] - self.assertEqual(namespace, self.namespace) - return tmp[2] - - def _verify_security_group_rule(self, raw_rule, tree): - self.assertEqual(raw_rule['id'], tree.get('id')) - self.assertEqual(raw_rule['parent_group_id'], - tree.get('parent_group_id')) - - seen = set() - expected = set(['ip_protocol', 'from_port', 'to_port', - 'group', 'group/name', 'group/tenant_id', - 'ip_range', 'ip_range/cidr']) - - for child in tree: - child_tag = self._tag(child) - self.assertIn(child_tag, raw_rule) - seen.add(child_tag) - if child_tag in ('group', 'ip_range'): - for gr_child in child: - gr_child_tag = self._tag(gr_child) - self.assertIn(gr_child_tag, raw_rule[child_tag]) - seen.add('%s/%s' % (child_tag, gr_child_tag)) - self.assertEqual(gr_child.text, - raw_rule[child_tag][gr_child_tag]) - else: - self.assertEqual(child.text, raw_rule[child_tag]) - self.assertEqual(seen, expected) - - def _verify_security_group(self, raw_group, tree): - rules = raw_group['rules'] - self.assertEqual('security_group', self._tag(tree)) - self.assertEqual(raw_group['id'], tree.get('id')) - self.assertEqual(raw_group['tenant_id'], tree.get('tenant_id')) - self.assertEqual(raw_group['name'], tree.get('name')) - self.assertEqual(2, len(tree)) - for child in tree: - child_tag = self._tag(child) - if child_tag == 'rules': - self.assertEqual(2, len(child)) - for idx, gr_child in enumerate(child): - self.assertEqual(self._tag(gr_child), 'rule') - self._verify_security_group_rule(rules[idx], gr_child) - else: - self.assertEqual('description', child_tag) - self.assertEqual(raw_group['description'], child.text) - - def test_rule_serializer(self): - raw_rule = dict( - id='123', - parent_group_id='456', - ip_protocol='tcp', - from_port='789', - to_port='987', - group=dict(name='group', tenant_id='tenant'), - ip_range=dict(cidr='10.0.0.0/8')) - rule = dict(security_group_rule=raw_rule) - text = self.rule_serializer.serialize(rule) - - tree = etree.fromstring(text) - - self.assertEqual('security_group_rule', self._tag(tree)) - self._verify_security_group_rule(raw_rule, tree) - - def test_group_serializer(self): - rules = [dict( - id='123', - parent_group_id='456', - ip_protocol='tcp', - from_port='789', - to_port='987', - group=dict(name='group1', tenant_id='tenant1'), - ip_range=dict(cidr='10.55.44.0/24')), - dict( - id='654', - parent_group_id='321', - ip_protocol='udp', - from_port='234', - to_port='567', - group=dict(name='group2', tenant_id='tenant2'), - ip_range=dict(cidr='10.44.55.0/24'))] - raw_group = dict( - id='890', - description='description', - name='name', - tenant_id='tenant', - rules=rules) - sg_group = dict(security_group=raw_group) - text = self.default_serializer.serialize(sg_group) - - tree = etree.fromstring(text) - - self._verify_security_group(raw_group, tree) - - def test_groups_serializer(self): - rules = [dict( - id='123', - parent_group_id='1234', - ip_protocol='tcp', - from_port='12345', - to_port='123456', - group=dict(name='group1', tenant_id='tenant1'), - ip_range=dict(cidr='10.123.0.0/24')), - dict( - id='234', - parent_group_id='2345', - ip_protocol='udp', - from_port='23456', - to_port='234567', - group=dict(name='group2', tenant_id='tenant2'), - ip_range=dict(cidr='10.234.0.0/24')), - dict( - id='345', - parent_group_id='3456', - ip_protocol='tcp', - from_port='34567', - to_port='345678', - group=dict(name='group3', tenant_id='tenant3'), - ip_range=dict(cidr='10.345.0.0/24')), - dict( - id='456', - parent_group_id='4567', - ip_protocol='udp', - from_port='45678', - to_port='456789', - group=dict(name='group4', tenant_id='tenant4'), - ip_range=dict(cidr='10.456.0.0/24'))] - groups = [dict( - id='567', - description='description1', - name='name1', - tenant_id='tenant1', - rules=rules[0:2]), - dict( - id='678', - description='description2', - name='name2', - tenant_id='tenant2', - rules=rules[2:4])] - sg_groups = dict(security_groups=groups) - text = self.index_serializer.serialize(sg_groups) - - tree = etree.fromstring(text) - - self.assertEqual('security_groups', self._tag(tree)) - self.assertEqual(len(groups), len(tree)) - for idx, child in enumerate(tree): - self._verify_security_group(groups[idx], child) - - UUID1 = '00000000-0000-0000-0000-000000000001' UUID2 = '00000000-0000-0000-0000-000000000002' UUID3 = '00000000-0000-0000-0000-000000000003' @@ -1732,37 +1455,4 @@ class SecurityGroupsOutputTestV21(test.TestCase): class SecurityGroupsOutputTestV2(SecurityGroupsOutputTestV21): def _setup_app(self): - return fakes.wsgi_app(init_only=('servers',)) - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class SecurityGroupsOutputXmlTest(SecurityGroupsOutputTestV2): - content_type = 'application/xml' - - class MinimalCreateServerTemplate(xmlutil.TemplateBuilder): - def construct(self): - root = xmlutil.TemplateElement('server', selector='server') - root.set('name') - root.set('id') - root.set('imageRef') - root.set('flavorRef') - return xmlutil.MasterTemplate(root, 1, - nsmap={None: xmlutil.XMLNS_V11}) - - def _encode_body(self, body): - serializer = self.MinimalCreateServerTemplate() - return serializer.serialize(body) - - def _get_server(self, body): - return etree.XML(body) - - def _get_servers(self, body): - return etree.XML(body).getchildren() - - def _get_groups(self, server): - # NOTE(vish): we are adding security groups without an extension - # namespace so we don't break people using the existing - # functionality, but that means we need to use find with - # the existing server namespace. - namespace = server.nsmap[None] - return server.find('{%s}security_groups' % namespace).getchildren() + return fakes.wsgi_app(init_only=('servers',)) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py index 1396e2d113..aa9648b4b7 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py @@ -12,13 +12,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from lxml import etree + import mock from oslo.serialization import jsonutils from nova.api.openstack import compute -from nova.api.openstack.compute.contrib import server_diagnostics -from nova.api.openstack import wsgi from nova.compute import api as compute_api from nova import exception from nova import test @@ -99,30 +97,4 @@ class ServerDiagnosticsTestV2(ServerDiagnosticsTestV21): 'nova.api.openstack.compute.contrib.select_extensions'], osapi_compute_ext_list=['Server_diagnostics']) - self.router = compute.APIRouter(init_only=('servers', 'diagnostics')) - - -class TestServerDiagnosticsXMLSerializer(test.NoDBTestCase): - namespace = wsgi.XMLNS_V11 - - def _tag(self, elem): - tagname = elem.tag - self.assertEqual(tagname[0], '{') - tmp = tagname.partition('}') - namespace = tmp[0][1:] - self.assertEqual(namespace, self.namespace) - return tmp[2] - - def test_index_serializer(self): - serializer = server_diagnostics.ServerDiagnosticsTemplate() - exemplar = dict(diag1='foo', diag2='bar') - text = serializer.serialize(exemplar) - - tree = etree.fromstring(text) - - self.assertEqual('diagnostics', self._tag(tree)) - self.assertEqual(len(tree), len(exemplar)) - for child in tree: - tag = self._tag(child) - self.assertIn(tag, exemplar) - self.assertEqual(child.text, exemplar[tag]) + self.router = compute.APIRouter(init_only=('servers', 'diagnostics')) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py index 6c602897fb..4c65b8c0f7 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py @@ -13,13 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree import webob from nova.api.openstack.compute.contrib import server_groups from nova.api.openstack.compute.plugins.v3 import server_groups as sg_v3 from nova.api.openstack import extensions -from nova.api.openstack import wsgi from nova import context import nova.db from nova import exception @@ -27,7 +25,6 @@ from nova import objects from nova.openstack.common import uuidutils from nova import test from nova.tests.unit.api.openstack import fakes -from nova.tests.unit import utils FAKE_UUID1 = 'a47ae74e-ab08-447f-8eee-ffd43fc46c16' FAKE_UUID2 = 'c6e6430a-6563-4efa-9542-5e93c9e97d18' @@ -345,144 +342,4 @@ class ServerGroupTestV2(ServerGroupTestV21): def _setup_controller(self): ext_mgr = extensions.ExtensionManager() ext_mgr.extensions = {} - self.controller = server_groups.ServerGroupController(ext_mgr) - - -class TestServerGroupXMLDeserializer(test.TestCase): - - def setUp(self): - super(TestServerGroupXMLDeserializer, self).setUp() - self.deserializer = server_groups.ServerGroupXMLDeserializer() - - def test_create_request(self): - serial_request = """ - -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server_group": { - "name": "test", - "policies": [] - }, - } - self.assertEqual(request['body'], expected) - - def test_update_request(self): - serial_request = """ - - -policy-1 -policy-2 - -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server_group": { - "name": 'test', - "policies": ['policy-1', 'policy-2'] - }, - } - self.assertEqual(request['body'], expected) - - def test_create_request_no_name(self): - serial_request = """ - -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server_group": { - "policies": [] - }, - } - self.assertEqual(request['body'], expected) - - def test_corrupt_xml(self): - """Should throw a 400 error on corrupt xml.""" - self.assertRaises( - exception.MalformedRequestBody, - self.deserializer.deserialize, - utils.killer_xml_body()) - - -class TestServerGroupXMLSerializer(test.TestCase): - def setUp(self): - super(TestServerGroupXMLSerializer, self).setUp() - self.namespace = wsgi.XMLNS_V11 - self.index_serializer = server_groups.ServerGroupsTemplate() - self.default_serializer = server_groups.ServerGroupTemplate() - - def _tag(self, elem): - tagname = elem.tag - self.assertEqual(tagname[0], '{') - tmp = tagname.partition('}') - namespace = tmp[0][1:] - self.assertEqual(namespace, self.namespace) - return tmp[2] - - def _verify_server_group(self, raw_group, tree): - policies = raw_group['policies'] - members = raw_group['members'] - self.assertEqual('server_group', self._tag(tree)) - self.assertEqual(raw_group['id'], tree.get('id')) - self.assertEqual(raw_group['name'], tree.get('name')) - self.assertEqual(3, len(tree)) - for child in tree: - child_tag = self._tag(child) - if child_tag == 'policies': - self.assertEqual(len(policies), len(child)) - for idx, gr_child in enumerate(child): - self.assertEqual(self._tag(gr_child), 'policy') - self.assertEqual(policies[idx], - gr_child.text) - elif child_tag == 'members': - self.assertEqual(len(members), len(child)) - for idx, gr_child in enumerate(child): - self.assertEqual(self._tag(gr_child), 'member') - self.assertEqual(members[idx], - gr_child.text) - elif child_tag == 'metadata': - self.assertEqual(0, len(child)) - - def _verify_server_group_brief(self, raw_group, tree): - self.assertEqual('server_group', self._tag(tree)) - self.assertEqual(raw_group['id'], tree.get('id')) - self.assertEqual(raw_group['name'], tree.get('name')) - - def test_group_serializer(self): - policies = ["policy-1", "policy-2"] - members = ["1", "2"] - raw_group = dict( - id='890', - name='name', - policies=policies, - members=members) - sg_group = dict(server_group=raw_group) - text = self.default_serializer.serialize(sg_group) - - tree = etree.fromstring(text) - - self._verify_server_group(raw_group, tree) - - def test_groups_serializer(self): - policies = ["policy-1", "policy-2", - "policy-3"] - members = ["1", "2", "3"] - groups = [dict( - id='890', - name='test', - policies=policies[0:2], - members=members[0:2]), - dict( - id='123', - name='default', - policies=policies[2:], - members=members[2:])] - sg_groups = dict(server_groups=groups) - text = self.index_serializer.serialize(sg_groups) - - tree = etree.fromstring(text) - - self.assertEqual('server_groups', self._tag(tree)) - self.assertEqual(len(groups), len(tree)) - for idx, child in enumerate(tree): - self._verify_server_group_brief(groups[idx], child) + self.controller = server_groups.ServerGroupController(ext_mgr) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_server_password.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_password.py index 789416d1d1..364932aeaa 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_server_password.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_password.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.config import cfg from nova.api.openstack.compute.contrib import server_password \ @@ -74,13 +73,4 @@ class ServerPasswordTestV21(test.TestCase): class ServerPasswordTestV2(ServerPasswordTestV21): server_password = server_password_v2 - delete_call = 'self.controller.delete' - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerPasswordXmlTestV2(ServerPasswordTestV2): - content_type = 'application/xml' - - def _get_pass(self, body): - # NOTE(vish): first element is password - return etree.XML(body).text or '' + delete_call = 'self.controller.delete' \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py index 192309a219..f3547a5d5e 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py @@ -15,11 +15,9 @@ import datetime -from lxml import etree from oslo.serialization import jsonutils from oslo.utils import timeutils -from nova.api.openstack.compute.contrib import server_usage from nova import compute from nova import db from nova import exception @@ -145,16 +143,4 @@ class ServerUsageTestV20(ServerUsageTestV21): osapi_compute_ext_list=['Server_usage']) def _get_app(self): - return fakes.wsgi_app(init_only=('servers',)) - - -@test.skipXmlTest("Nova v2 XML support is disabled") -class ServerUsageXmlTest(ServerUsageTestV20): - content_type = 'application/xml' - prefix = '{%s}' % server_usage.Server_usage.namespace - - def _get_server(self, body): - return etree.XML(body) - - def _get_servers(self, body): - return etree.XML(body).getchildren() + return fakes.wsgi_app(init_only=('servers',)) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py index 07b947534d..a0adc42dc2 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py @@ -15,7 +15,6 @@ import datetime -from lxml import etree import mock from oslo.utils import timeutils import webob @@ -268,173 +267,6 @@ class SimpleTenantUsageTestV2(SimpleTenantUsageTestV21): controller = simple_tenant_usage_v2.SimpleTenantUsageController() -class SimpleTenantUsageSerializerTest(test.TestCase): - def _verify_server_usage(self, raw_usage, tree): - self.assertEqual('server_usage', tree.tag) - - # Figure out what fields we expect - not_seen = set(raw_usage.keys()) - - for child in tree: - self.assertIn(child.tag, not_seen) - not_seen.remove(child.tag) - self.assertEqual(str(raw_usage[child.tag]), child.text) - - self.assertEqual(len(not_seen), 0) - - def _verify_tenant_usage(self, raw_usage, tree): - self.assertEqual('tenant_usage', tree.tag) - - # Figure out what fields we expect - not_seen = set(raw_usage.keys()) - - for child in tree: - self.assertIn(child.tag, not_seen) - not_seen.remove(child.tag) - if child.tag == 'server_usages': - for idx, gr_child in enumerate(child): - self._verify_server_usage(raw_usage['server_usages'][idx], - gr_child) - else: - self.assertEqual(str(raw_usage[child.tag]), child.text) - - self.assertEqual(len(not_seen), 0) - - def test_serializer_show(self): - serializer = simple_tenant_usage_v2.SimpleTenantUsageTemplate() - today = timeutils.utcnow() - yesterday = today - datetime.timedelta(days=1) - raw_usage = dict( - tenant_id='tenant', - total_local_gb_usage=789, - total_vcpus_usage=456, - total_memory_mb_usage=123, - total_hours=24, - start=yesterday, - stop=today, - server_usages=[dict( - instance_id='00000000-0000-0000-0000-0000000000000000', - name='test', - hours=24, - memory_mb=1024, - local_gb=50, - vcpus=1, - tenant_id='tenant', - flavor='m1.small', - started_at=yesterday, - ended_at=today, - state='terminated', - uptime=86400), - dict( - instance_id='00000000-0000-0000-0000-0000000000000002', - name='test2', - hours=12, - memory_mb=512, - local_gb=25, - vcpus=2, - tenant_id='tenant', - flavor='m1.tiny', - started_at=yesterday, - ended_at=today, - state='terminated', - uptime=43200), - ], - ) - tenant_usage = dict(tenant_usage=raw_usage) - text = serializer.serialize(tenant_usage) - - tree = etree.fromstring(text) - - self._verify_tenant_usage(raw_usage, tree) - - def test_serializer_index(self): - serializer = simple_tenant_usage_v2.SimpleTenantUsagesTemplate() - today = timeutils.utcnow() - yesterday = today - datetime.timedelta(days=1) - raw_usages = [dict( - tenant_id='tenant1', - total_local_gb_usage=1024, - total_vcpus_usage=23, - total_memory_mb_usage=512, - total_hours=24, - start=yesterday, - stop=today, - server_usages=[dict( - instance_id='00000000-0000-0000-0000-0000000000000001', - name='test1', - hours=24, - memory_mb=1024, - local_gb=50, - vcpus=2, - tenant_id='tenant1', - flavor='m1.small', - started_at=yesterday, - ended_at=today, - state='terminated', - uptime=86400), - dict( - instance_id='00000000-0000-0000-0000-0000000000000002', - name='test2', - hours=42, - memory_mb=4201, - local_gb=25, - vcpus=1, - tenant_id='tenant1', - flavor='m1.tiny', - started_at=today, - ended_at=yesterday, - state='terminated', - uptime=43200), - ], - ), - dict( - tenant_id='tenant2', - total_local_gb_usage=512, - total_vcpus_usage=32, - total_memory_mb_usage=1024, - total_hours=42, - start=today, - stop=yesterday, - server_usages=[dict( - instance_id='00000000-0000-0000-0000-0000000000000003', - name='test3', - hours=24, - memory_mb=1024, - local_gb=50, - vcpus=2, - tenant_id='tenant2', - flavor='m1.small', - started_at=yesterday, - ended_at=today, - state='terminated', - uptime=86400), - dict( - instance_id='00000000-0000-0000-0000-0000000000000002', - name='test2', - hours=42, - memory_mb=4201, - local_gb=25, - vcpus=1, - tenant_id='tenant4', - flavor='m1.tiny', - started_at=today, - ended_at=yesterday, - state='terminated', - uptime=43200), - ], - ), - ] - tenant_usages = dict(tenant_usages=raw_usages) - text = serializer.serialize(tenant_usages) - - tree = etree.fromstring(text) - - self.assertEqual('tenant_usages', tree.tag) - self.assertEqual(len(raw_usages), len(tree)) - for idx, child in enumerate(tree): - self._verify_tenant_usage(raw_usages[idx], child) - - class SimpleTenantUsageControllerTestV21(test.TestCase): controller = simple_tenant_usage_v21.SimpleTenantUsageController() diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_snapshots.py b/nova/tests/unit/api/openstack/compute/contrib/test_snapshots.py index 74bb1948e6..7b8c1f05ce 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_snapshots.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_snapshots.py @@ -13,12 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils -from oslo.utils import timeutils import webob -from nova.api.openstack.compute.contrib import volumes from nova import context from nova import test from nova.tests.unit.api.openstack import fakes @@ -151,59 +148,4 @@ class SnapshotApiTest(test.NoDBTestCase): self.assertEqual(len(resp_snapshots), 3) resp_snapshot = resp_snapshots.pop() - self.assertEqual(resp_snapshot['id'], 102) - - -class SnapshotSerializerTest(test.NoDBTestCase): - def _verify_snapshot(self, snap, tree): - self.assertEqual(tree.tag, 'snapshot') - - for attr in ('id', 'status', 'size', 'createdAt', - 'displayName', 'displayDescription', 'volumeId'): - self.assertEqual(str(snap[attr]), tree.get(attr)) - - def test_snapshot_show_create_serializer(self): - serializer = volumes.SnapshotTemplate() - raw_snapshot = dict( - id='snap_id', - status='snap_status', - size=1024, - createdAt=timeutils.utcnow(), - displayName='snap_name', - displayDescription='snap_desc', - volumeId='vol_id', - ) - text = serializer.serialize(dict(snapshot=raw_snapshot)) - - tree = etree.fromstring(text) - - self._verify_snapshot(raw_snapshot, tree) - - def test_snapshot_index_detail_serializer(self): - serializer = volumes.SnapshotsTemplate() - raw_snapshots = [dict( - id='snap1_id', - status='snap1_status', - size=1024, - createdAt=timeutils.utcnow(), - displayName='snap1_name', - displayDescription='snap1_desc', - volumeId='vol1_id', - ), - dict( - id='snap2_id', - status='snap2_status', - size=1024, - createdAt=timeutils.utcnow(), - displayName='snap2_name', - displayDescription='snap2_desc', - volumeId='vol2_id', - )] - text = serializer.serialize(dict(snapshots=raw_snapshots)) - - tree = etree.fromstring(text) - - self.assertEqual('snapshots', tree.tag) - self.assertEqual(len(raw_snapshots), len(tree)) - for idx, child in enumerate(tree): - self._verify_snapshot(raw_snapshots[idx], child) + self.assertEqual(resp_snapshot['id'], 102) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_used_limits.py b/nova/tests/unit/api/openstack/compute/contrib/test_used_limits.py index ee2b0d703b..4f2ba140b3 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_used_limits.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_used_limits.py @@ -14,7 +14,6 @@ # under the License. from nova.api.openstack.compute.contrib import used_limits as used_limits_v2 -from nova.api.openstack.compute import limits from nova.api.openstack.compute.plugins.v3 import used_limits as \ used_limits_v21 from nova.api.openstack import extensions @@ -270,37 +269,4 @@ class UsedLimitsTestCaseV2(UsedLimitsTestCaseV21): class UsedLimitsTestCaseV2WithoutServerGroupQuotas(UsedLimitsTestCaseV2): used_limit_extension = "compute_extension:used_limits_for_admin" - include_server_group_quotas = False - - -class UsedLimitsTestCaseXml(test.NoDBTestCase): - def setUp(self): - """Run before each test.""" - super(UsedLimitsTestCaseXml, self).setUp() - self.ext_mgr = self.mox.CreateMock(extensions.ExtensionManager) - self.controller = used_limits_v2.UsedLimitsController(self.ext_mgr) - self.fake_context = nova.context.RequestContext('fake', 'fake') - - def test_used_limits_xmlns(self): - fake_req = FakeRequest(self.fake_context) - obj = { - "limits": { - "rate": [], - "absolute": {}, - }, - } - res = wsgi.ResponseObject(obj, xml=limits.LimitsTemplate) - res.preserialize('xml') - - def stub_get_project_quotas(context, project_id, usages=True): - return {} - - self.ext_mgr.is_loaded('os-used-limits-for-admin').AndReturn(False) - self.stubs.Set(quota.QUOTAS, "get_project_quotas", - stub_get_project_quotas) - self.ext_mgr.is_loaded('os-server-group-quotas').AndReturn(False) - self.mox.ReplayAll() - - self.controller.index(fake_req, res) - response = res.serialize(None, 'xml') - self.assertIn(used_limits_v2.XMLNS, response.body) + include_server_group_quotas = False \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_virtual_interfaces.py b/nova/tests/unit/api/openstack/compute/contrib/test_virtual_interfaces.py index e418a9f1de..7ed1c67a25 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_virtual_interfaces.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_virtual_interfaces.py @@ -13,12 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree import webob from nova.api.openstack.compute.contrib import virtual_interfaces as vi20 from nova.api.openstack.compute.plugins.v3 import virtual_interfaces as vi21 -from nova.api.openstack import wsgi from nova import compute from nova.compute import api as compute_api from nova import context @@ -91,39 +89,4 @@ class ServerVirtualInterfaceTestV21(test.NoDBTestCase): class ServerVirtualInterfaceTestV20(ServerVirtualInterfaceTestV21): def _set_controller(self): - self.controller = vi20.ServerVirtualInterfaceController() - - -class ServerVirtualInterfaceSerializerTestV20(test.NoDBTestCase): - def setUp(self): - super(ServerVirtualInterfaceSerializerTestV20, self).setUp() - self.namespace = wsgi.XMLNS_V11 - self.serializer = vi20.VirtualInterfaceTemplate() - - def _tag(self, elem): - tagname = elem.tag - self.assertEqual(tagname[0], '{') - tmp = tagname.partition('}') - namespace = tmp[0][1:] - self.assertEqual(namespace, self.namespace) - return tmp[2] - - def test_serializer(self): - raw_vifs = [dict( - id='uuid1', - mac_address='aa:bb:cc:dd:ee:ff'), - dict( - id='uuid2', - mac_address='bb:aa:dd:cc:ff:ee')] - vifs = dict(virtual_interfaces=raw_vifs) - text = self.serializer.serialize(vifs) - - tree = etree.fromstring(text) - - self.assertEqual('virtual_interfaces', self._tag(tree)) - self.assertEqual(len(raw_vifs), len(tree)) - for idx, child in enumerate(tree): - self.assertEqual('virtual_interface', self._tag(child)) - self.assertEqual(raw_vifs[idx]['id'], child.get('id')) - self.assertEqual(raw_vifs[idx]['mac_address'], - child.get('mac_address')) + self.controller = vi20.ServerVirtualInterfaceController() \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_volumes.py b/nova/tests/unit/api/openstack/compute/contrib/test_volumes.py index c711dfeb06..5f4058d0a0 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_volumes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_volumes.py @@ -16,11 +16,9 @@ import datetime -from lxml import etree import mock from oslo.config import cfg from oslo.serialization import jsonutils -from oslo.utils import timeutils import webob from webob import exc @@ -678,280 +676,6 @@ class VolumeAttachTestsV2(VolumeAttachTestsV21): pass -class VolumeSerializerTest(test.TestCase): - def _verify_volume_attachment(self, attach, tree): - for attr in ('id', 'volumeId', 'serverId', 'device'): - self.assertEqual(str(attach[attr]), tree.get(attr)) - - def _verify_volume(self, vol, tree): - self.assertEqual(tree.tag, 'volume') - - for attr in ('id', 'status', 'size', 'availabilityZone', 'createdAt', - 'displayName', 'displayDescription', 'volumeType', - 'snapshotId'): - self.assertEqual(str(vol[attr]), tree.get(attr)) - - for child in tree: - self.assertIn(child.tag, ('attachments', 'metadata')) - if child.tag == 'attachments': - self.assertEqual(1, len(child)) - self.assertEqual('attachment', child[0].tag) - self._verify_volume_attachment(vol['attachments'][0], child[0]) - elif child.tag == 'metadata': - not_seen = set(vol['metadata'].keys()) - for gr_child in child: - self.assertIn(gr_child.get("key"), not_seen) - self.assertEqual(str(vol['metadata'][gr_child.get("key")]), - gr_child.text) - not_seen.remove(gr_child.get("key")) - self.assertEqual(0, len(not_seen)) - - def test_attach_show_create_serializer(self): - serializer = volumes.VolumeAttachmentTemplate() - raw_attach = dict( - id='vol_id', - volumeId='vol_id', - serverId='instance_uuid', - device='/foo') - text = serializer.serialize(dict(volumeAttachment=raw_attach)) - - tree = etree.fromstring(text) - - self.assertEqual('volumeAttachment', tree.tag) - self._verify_volume_attachment(raw_attach, tree) - - def test_attach_index_serializer(self): - serializer = volumes.VolumeAttachmentsTemplate() - raw_attaches = [dict( - id='vol_id1', - volumeId='vol_id1', - serverId='instance1_uuid', - device='/foo1'), - dict( - id='vol_id2', - volumeId='vol_id2', - serverId='instance2_uuid', - device='/foo2')] - text = serializer.serialize(dict(volumeAttachments=raw_attaches)) - - tree = etree.fromstring(text) - - self.assertEqual('volumeAttachments', tree.tag) - self.assertEqual(len(raw_attaches), len(tree)) - for idx, child in enumerate(tree): - self.assertEqual('volumeAttachment', child.tag) - self._verify_volume_attachment(raw_attaches[idx], child) - - def test_volume_show_create_serializer(self): - serializer = volumes.VolumeTemplate() - raw_volume = dict( - id='vol_id', - status='vol_status', - size=1024, - availabilityZone='vol_availability', - createdAt=timeutils.utcnow(), - attachments=[dict( - id='vol_id', - volumeId='vol_id', - serverId='instance_uuid', - device='/foo')], - displayName='vol_name', - displayDescription='vol_desc', - volumeType='vol_type', - snapshotId='snap_id', - metadata=dict( - foo='bar', - baz='quux', - ), - ) - text = serializer.serialize(dict(volume=raw_volume)) - - tree = etree.fromstring(text) - - self._verify_volume(raw_volume, tree) - - def test_volume_index_detail_serializer(self): - serializer = volumes.VolumesTemplate() - raw_volumes = [dict( - id='vol1_id', - status='vol1_status', - size=1024, - availabilityZone='vol1_availability', - createdAt=timeutils.utcnow(), - attachments=[dict( - id='vol1_id', - volumeId='vol1_id', - serverId='instance_uuid', - device='/foo1')], - displayName='vol1_name', - displayDescription='vol1_desc', - volumeType='vol1_type', - snapshotId='snap1_id', - metadata=dict( - foo='vol1_foo', - bar='vol1_bar', - ), - ), - dict( - id='vol2_id', - status='vol2_status', - size=1024, - availabilityZone='vol2_availability', - createdAt=timeutils.utcnow(), - attachments=[dict( - id='vol2_id', - volumeId='vol2_id', - serverId='instance_uuid', - device='/foo2')], - displayName='vol2_name', - displayDescription='vol2_desc', - volumeType='vol2_type', - snapshotId='snap2_id', - metadata=dict( - foo='vol2_foo', - bar='vol2_bar', - ), - )] - text = serializer.serialize(dict(volumes=raw_volumes)) - - tree = etree.fromstring(text) - - self.assertEqual('volumes', tree.tag) - self.assertEqual(len(raw_volumes), len(tree)) - for idx, child in enumerate(tree): - self._verify_volume(raw_volumes[idx], child) - - -class TestVolumeCreateRequestXMLDeserializer(test.TestCase): - - def setUp(self): - super(TestVolumeCreateRequestXMLDeserializer, self).setUp() - self.deserializer = volumes.CreateDeserializer() - - def test_minimal_volume(self): - self_request = """ -""" - request = self.deserializer.deserialize(self_request) - expected = { - "volume": { - "size": "1", - }, - } - self.assertEqual(request['body'], expected) - - def test_display_name(self): - self_request = """ -""" - request = self.deserializer.deserialize(self_request) - expected = { - "volume": { - "size": "1", - "display_name": "Volume-xml", - }, - } - self.assertEqual(request['body'], expected) - - def test_display_description(self): - self_request = """ -""" - request = self.deserializer.deserialize(self_request) - expected = { - "volume": { - "size": "1", - "display_name": "Volume-xml", - "display_description": "description", - }, - } - self.assertEqual(request['body'], expected) - - def test_volume_type(self): - self_request = """ -""" - request = self.deserializer.deserialize(self_request) - expected = { - "volume": { - "size": "1", - "display_name": "Volume-xml", - "display_description": "description", - "volume_type": "289da7f8-6440-407c-9fb4-7db01ec49164", - }, - } - self.assertEqual(request['body'], expected) - - def test_availability_zone(self): - self_request = """ -""" - request = self.deserializer.deserialize(self_request) - expected = { - "volume": { - "size": "1", - "display_name": "Volume-xml", - "display_description": "description", - "volume_type": "289da7f8-6440-407c-9fb4-7db01ec49164", - "availability_zone": "us-east1", - }, - } - self.assertEqual(request['body'], expected) - - def test_metadata(self): - self_request = """ - - work""" - request = self.deserializer.deserialize(self_request) - expected = { - "volume": { - "display_name": "Volume-xml", - "size": "1", - "metadata": { - "Type": "work", - }, - }, - } - self.assertEqual(request['body'], expected) - - def test_full_volume(self): - self_request = """ - - work""" - request = self.deserializer.deserialize(self_request) - expected = { - "volume": { - "size": "1", - "display_name": "Volume-xml", - "display_description": "description", - "volume_type": "289da7f8-6440-407c-9fb4-7db01ec49164", - "availability_zone": "us-east1", - "metadata": { - "Type": "work", - }, - }, - } - self.maxDiff = None - self.assertEqual(request['body'], expected) - - class CommonBadRequestTestCase(object): resource = None diff --git a/nova/tests/unit/api/openstack/compute/schemas/__init__.py b/nova/tests/unit/api/openstack/compute/schemas/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nova/tests/unit/api/openstack/compute/schemas/test_schemas.py b/nova/tests/unit/api/openstack/compute/schemas/test_schemas.py deleted file mode 100644 index c6ce82057e..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/test_schemas.py +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 2012 OpenStack Foundation -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import glob -import os - -import lxml.etree - -from nova import test - -SCHEMAS = "nova/api/openstack/compute/schemas" - - -class RelaxNGSchemaTestCase(test.NoDBTestCase): - """various validation tasks for the RelaxNG schemas - - lxml.etree has no built-in way to validate an entire namespace - (i.e., multiple RelaxNG schema files defining elements in the same - namespace), so we define a few tests that should hopefully reduce - the risk of an inconsistent namespace - """ - - def _load_schema(self, schemafile): - return lxml.etree.RelaxNG(lxml.etree.parse(schemafile)) - - def _load_test_cases(self, path): - """load test cases from the given path.""" - rv = dict(valid=[], invalid=[]) - path = os.path.join(os.path.dirname(__file__), path) - for ctype in rv.keys(): - for cfile in glob.glob(os.path.join(path, ctype, "*.xml")): - rv[ctype].append(lxml.etree.parse(cfile)) - return rv - - def _validate_schema(self, schemafile): - """validate a single RelaxNG schema file.""" - try: - self._load_schema(schemafile) - except lxml.etree.RelaxNGParseError as err: - self.fail("%s is not a valid RelaxNG schema: %s" % - (schemafile, err)) - - def _api_versions(self): - """get a list of API versions.""" - return [''] + [os.path.basename(v) - for v in glob.glob(os.path.join(SCHEMAS, "v*"))] - - def _schema_files(self, api_version): - return glob.glob(os.path.join(SCHEMAS, api_version, "*.rng")) - - def test_schema_validity(self): - for api_version in self._api_versions(): - for schema in self._schema_files(api_version): - self._validate_schema(schema) - - def test_schema_duplicate_elements(self): - for api_version in self._api_versions(): - elements = dict() - duplicates = dict() - for schemafile in self._schema_files(api_version): - schema = lxml.etree.parse(schemafile) - fname = os.path.basename(schemafile) - if schema.getroot().tag != "element": - # we don't do any sort of validation on grammars - # yet - continue - el_name = schema.getroot().get("name") - if el_name in elements: - duplicates.setdefault(el_name, - [elements[el_name]]).append(fname) - else: - elements[el_name] = fname - self.assertEqual(len(duplicates), 0, - "Duplicate element definitions found: %s" % - "; ".join("%s in %s" % dup - for dup in duplicates.items())) - - def test_schema_explicit_cases(self): - cases = {'v1.1/flavors.rng': self._load_test_cases("v1.1/flavors"), - 'v1.1/images.rng': self._load_test_cases("v1.1/images"), - 'v1.1/servers.rng': self._load_test_cases("v1.1/servers")} - - for schemafile, caselists in cases.items(): - schema = self._load_schema(os.path.join(SCHEMAS, schemafile)) - for case in caselists['valid']: - self.assertTrue(schema.validate(case), - "Schema validation failed against %s: %s\n%s" % - (schemafile, schema.error_log, case)) - - for case in caselists['invalid']: - self.assertFalse( - schema.validate(case), - "Schema validation succeeded unexpectedly against %s: %s" - "\n%s" % (schemafile, schema.error_log, case)) diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/mixed.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/mixed.xml deleted file mode 100644 index df4368bf41..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/mixed.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/partial.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/partial.xml deleted file mode 100644 index 3343a7be59..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/partial.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/partial2.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/partial2.xml deleted file mode 100644 index f67c5a82fe..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/invalid/partial2.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/empty.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/empty.xml deleted file mode 100644 index 36aa3936e7..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/empty.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/full.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/full.xml deleted file mode 100644 index 59eafc8608..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/full.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/refs.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/refs.xml deleted file mode 100644 index 751b626258..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/flavors/valid/refs.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/mixed.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/mixed.xml deleted file mode 100644 index 8f7bf208ae..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/mixed.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/no-metadata.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/no-metadata.xml deleted file mode 100644 index 435294e27c..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/no-metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/partial.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/partial.xml deleted file mode 100644 index 5637cce787..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/partial.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/partial2.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/partial2.xml deleted file mode 100644 index db5e974621..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/invalid/partial2.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/empty.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/empty.xml deleted file mode 100644 index 05e0b8241c..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/empty.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/full.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/full.xml deleted file mode 100644 index 4f148db625..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/full.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - baz - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/refs.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/refs.xml deleted file mode 100644 index 1dfedd2c77..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/images/valid/refs.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/mixed.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/mixed.xml deleted file mode 100644 index c941472beb..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/mixed.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial.xml deleted file mode 100644 index 721ce84327..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial2.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial2.xml deleted file mode 100644 index 474b3a084e..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial2.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial3.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial3.xml deleted file mode 100644 index 6455fe899a..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/invalid/partial3.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/detailed.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/detailed.xml deleted file mode 100644 index 97f5ee44e6..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/detailed.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - fault -
fault
- - - bar - - - - - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/empty.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/empty.xml deleted file mode 100644 index b2f3666245..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/empty.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/full.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/full.xml deleted file mode 100644 index fbd6202a76..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/full.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - diff --git a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/refs.xml b/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/refs.xml deleted file mode 100644 index e1212e985f..0000000000 --- a/nova/tests/unit/api/openstack/compute/schemas/v1.1/servers/valid/refs.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nova/tests/unit/api/openstack/compute/test_api.py b/nova/tests/unit/api/openstack/compute/test_api.py index 376d4a24a2..7165f1b4d5 100644 --- a/nova/tests/unit/api/openstack/compute/test_api.py +++ b/nova/tests/unit/api/openstack/compute/test_api.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from oslo.serialization import jsonutils import webob import webob.dec @@ -62,19 +61,6 @@ class APITest(test.NoDBTestCase): jsonutils.loads(res.body) - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_vendor_content_type_xml(self): - ctype = 'application/vnd.openstack.compute+xml' - - req = webob.Request.blank('/') - req.headers['Accept'] = ctype - - res = req.get_response(fakes.wsgi_app()) - self.assertEqual(res.status_int, 200) - self.assertEqual(res.content_type, ctype) - - etree.XML(res.body) - def test_exceptions_are_converted_to_faults_webob_exc(self): @webob.dec.wsgify def raise_webob_exc(req): @@ -108,18 +94,6 @@ class APITest(test.NoDBTestCase): self.assertIn('{"computeFault', resp.body) self.assertEqual(resp.status_int, 500, resp.body) - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_exceptions_are_converted_to_faults_exception_xml(self): - @webob.dec.wsgify - def fail(req): - raise Exception("Threw an exception") - - # api.application = fail - api = self._wsgi_app(fail) - resp = webob.Request.blank('/.xml').get_response(api) - self.assertIn('= len(self.ext_list)) - - # Make sure that at least Fox in Sox is correct. - (fox_ext, ) = [x for x in exts if x.get('alias') == 'FOXNSOX'] - self.assertEqual(fox_ext.get('name'), 'Fox In Socks') - self.assertEqual(fox_ext.get('namespace'), - 'http://www.fox.in.socks/api/ext/pie/v1.0') - self.assertEqual(fox_ext.get('updated'), '2011-01-22T13:25:27-06:00') - self.assertEqual(fox_ext.findtext('{0}description'.format(NS)), - 'The Fox In Socks Extension.') - - xmlutil.validate_schema(root, 'extensions') - - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_get_extension_xml(self): - app = compute.APIRouter(init_only=('servers', 'flavors', 'extensions')) - request = webob.Request.blank("/fake/extensions/FOXNSOX") - request.accept = "application/xml" - response = request.get_response(app) - self.assertEqual(200, response.status_int) - xml = response.body - - root = etree.XML(xml) - self.assertEqual(root.tag.split('extension')[0], NS) - self.assertEqual(root.get('alias'), 'FOXNSOX') - self.assertEqual(root.get('name'), 'Fox In Socks') - self.assertEqual(root.get('namespace'), - 'http://www.fox.in.socks/api/ext/pie/v1.0') - self.assertEqual(root.get('updated'), '2011-01-22T13:25:27-06:00') - self.assertEqual(root.findtext('{0}description'.format(NS)), - 'The Fox In Socks Extension.') - - xmlutil.validate_schema(root, 'extension') - class ResourceExtensionTest(ExtensionTestCase): @@ -640,87 +591,6 @@ class ControllerExtensionTest(ExtensionTestCase): self.assertEqual(extension_body, response.body) -class ExtensionsXMLSerializerTest(test.TestCase): - - def test_serialize_extension(self): - serializer = base_extensions.ExtensionTemplate() - data = {'extension': { - 'name': 'ext1', - 'namespace': 'http://docs.rack.com/servers/api/ext/pie/v1.0', - 'alias': 'RS-PIE', - 'updated': '2011-01-22T13:25:27-06:00', - 'description': 'Adds the capability to share an image.', - 'links': [{'rel': 'describedby', - 'type': 'application/pdf', - 'href': 'http://docs.rack.com/servers/api/ext/cs.pdf'}, - {'rel': 'describedby', - 'type': 'application/vnd.sun.wadl+xml', - 'href': 'http://docs.rack.com/servers/api/ext/cs.wadl'}]}} - - xml = serializer.serialize(data) - root = etree.XML(xml) - ext_dict = data['extension'] - self.assertEqual(root.findtext('{0}description'.format(NS)), - ext_dict['description']) - - for key in ['name', 'namespace', 'alias', 'updated']: - self.assertEqual(root.get(key), ext_dict[key]) - - link_nodes = root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(ext_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - xmlutil.validate_schema(root, 'extension') - - def test_serialize_extensions(self): - serializer = base_extensions.ExtensionsTemplate() - data = {"extensions": [{ - "name": "Public Image Extension", - "namespace": "http://foo.com/api/ext/pie/v1.0", - "alias": "RS-PIE", - "updated": "2011-01-22T13:25:27-06:00", - "description": "Adds the capability to share an image.", - "links": [{"rel": "describedby", - "type": "application/pdf", - "href": "http://foo.com/api/ext/cs-pie.pdf"}, - {"rel": "describedby", - "type": "application/vnd.sun.wadl+xml", - "href": "http://foo.com/api/ext/cs-pie.wadl"}]}, - {"name": "Cloud Block Storage", - "namespace": "http://foo.com/api/ext/cbs/v1.0", - "alias": "RS-CBS", - "updated": "2011-01-12T11:22:33-06:00", - "description": "Allows mounting cloud block storage.", - "links": [{"rel": "describedby", - "type": "application/pdf", - "href": "http://foo.com/api/ext/cs-cbs.pdf"}, - {"rel": "describedby", - "type": "application/vnd.sun.wadl+xml", - "href": "http://foo.com/api/ext/cs-cbs.wadl"}]}]} - - xml = serializer.serialize(data) - root = etree.XML(xml) - ext_elems = root.findall('{0}extension'.format(NS)) - self.assertEqual(len(ext_elems), 2) - for i, ext_elem in enumerate(ext_elems): - ext_dict = data['extensions'][i] - self.assertEqual(ext_elem.findtext('{0}description'.format(NS)), - ext_dict['description']) - - for key in ['name', 'namespace', 'alias', 'updated']: - self.assertEqual(ext_elem.get(key), ext_dict[key]) - - link_nodes = ext_elem.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(ext_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - xmlutil.validate_schema(root, 'extensions') - - class ExtensionControllerIdFormatTest(test.TestCase): def _bounce_id(self, test_id): diff --git a/nova/tests/unit/api/openstack/compute/test_flavors.py b/nova/tests/unit/api/openstack/compute/test_flavors.py index 265b50ac85..9f33216bf2 100644 --- a/nova/tests/unit/api/openstack/compute/test_flavors.py +++ b/nova/tests/unit/api/openstack/compute/test_flavors.py @@ -13,14 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree import six.moves.urllib.parse as urlparse import webob from nova.api.openstack import common from nova.api.openstack.compute import flavors as flavors_v2 from nova.api.openstack.compute.plugins.v3 import flavors as flavors_v3 -from nova.api.openstack import xmlutil import nova.compute.flavors from nova import context from nova import db @@ -571,241 +569,6 @@ class FlavorsTestV20(FlavorsTestV21): pass -class FlavorsXMLSerializationTest(test.TestCase): - - def test_xml_declaration(self): - serializer = flavors_v2.FlavorTemplate() - - fixture = { - "flavor": { - "id": "12", - "name": "asdf", - "ram": "256", - "disk": "10", - "vcpus": "", - "links": [ - { - "rel": "self", - "href": "http://localhost/v2/fake/flavors/12", - }, - { - "rel": "bookmark", - "href": "http://localhost/fake/flavors/12", - }, - ], - }, - } - - output = serializer.serialize(fixture) - has_dec = output.startswith("") - self.assertTrue(has_dec) - - def test_show(self): - serializer = flavors_v2.FlavorTemplate() - - fixture = { - "flavor": { - "id": "12", - "name": "asdf", - "ram": "256", - "disk": "10", - "vcpus": "", - "links": [ - { - "rel": "self", - "href": "http://localhost/v2/fake/flavors/12", - }, - { - "rel": "bookmark", - "href": "http://localhost/fake/flavors/12", - }, - ], - }, - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'flavor') - flavor_dict = fixture['flavor'] - - for key in ['name', 'id', 'ram', 'disk']: - self.assertEqual(root.get(key), str(flavor_dict[key])) - - link_nodes = root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(flavor_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_show_handles_integers(self): - serializer = flavors_v2.FlavorTemplate() - - fixture = { - "flavor": { - "id": 12, - "name": "asdf", - "ram": 256, - "disk": 10, - "vcpus": "", - "links": [ - { - "rel": "self", - "href": "http://localhost/v2/fake/flavors/12", - }, - { - "rel": "bookmark", - "href": "http://localhost/fake/flavors/12", - }, - ], - }, - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'flavor') - flavor_dict = fixture['flavor'] - - for key in ['name', 'id', 'ram', 'disk']: - self.assertEqual(root.get(key), str(flavor_dict[key])) - - link_nodes = root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(flavor_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_detail(self): - serializer = flavors_v2.FlavorsTemplate() - - fixture = { - "flavors": [ - { - "id": "23", - "name": "flavor 23", - "ram": "512", - "disk": "20", - "vcpus": "", - "links": [ - { - "rel": "self", - "href": "http://localhost/v2/fake/flavors/23", - }, - { - "rel": "bookmark", - "href": "http://localhost/fake/flavors/23", - }, - ], - }, - { - "id": "13", - "name": "flavor 13", - "ram": "256", - "disk": "10", - "vcpus": "", - "links": [ - { - "rel": "self", - "href": "http://localhost/v2/fake/flavors/13", - }, - { - "rel": "bookmark", - "href": "http://localhost/fake/flavors/13", - }, - ], - }, - ], - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'flavors') - flavor_elems = root.findall('{0}flavor'.format(NS)) - self.assertEqual(len(flavor_elems), 2) - for i, flavor_elem in enumerate(flavor_elems): - flavor_dict = fixture['flavors'][i] - - for key in ['name', 'id', 'ram', 'disk']: - self.assertEqual(flavor_elem.get(key), str(flavor_dict[key])) - - link_nodes = flavor_elem.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(flavor_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_index(self): - serializer = flavors_v2.MinimalFlavorsTemplate() - - fixture = { - "flavors": [ - { - "id": "23", - "name": "flavor 23", - "ram": "512", - "disk": "20", - "vcpus": "", - "links": [ - { - "rel": "self", - "href": "http://localhost/v2/fake/flavors/23", - }, - { - "rel": "bookmark", - "href": "http://localhost/fake/flavors/23", - }, - ], - }, - { - "id": "13", - "name": "flavor 13", - "ram": "256", - "disk": "10", - "vcpus": "", - "links": [ - { - "rel": "self", - "href": "http://localhost/v2/fake/flavors/13", - }, - { - "rel": "bookmark", - "href": "http://localhost/fake/flavors/13", - }, - ], - }, - ], - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'flavors') - flavor_elems = root.findall('{0}flavor'.format(NS)) - self.assertEqual(len(flavor_elems), 2) - for i, flavor_elem in enumerate(flavor_elems): - flavor_dict = fixture['flavors'][i] - - for key in ['name', 'id']: - self.assertEqual(flavor_elem.get(key), str(flavor_dict[key])) - - link_nodes = flavor_elem.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(flavor_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_index_empty(self): - serializer = flavors_v2.MinimalFlavorsTemplate() - - fixture = { - "flavors": [], - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'flavors') - flavor_elems = root.findall('{0}flavor'.format(NS)) - self.assertEqual(len(flavor_elems), 0) - - class DisabledFlavorsWithRealDBTestV21(test.TestCase): """Tests that disabled flavors should not be shown nor listed.""" Controller = flavors_v3.FlavorsController diff --git a/nova/tests/unit/api/openstack/compute/test_images.py b/nova/tests/unit/api/openstack/compute/test_images.py index ad55f9a86e..56bdc6e900 100644 --- a/nova/tests/unit/api/openstack/compute/test_images.py +++ b/nova/tests/unit/api/openstack/compute/test_images.py @@ -20,14 +20,12 @@ and as a WSGI layer import copy -from lxml import etree import mock import webob from nova.api.openstack.compute import images from nova.api.openstack.compute.plugins.v3 import images as images_v21 from nova.api.openstack.compute.views import images as images_view -from nova.api.openstack import xmlutil from nova import exception from nova.image import glance from nova import test @@ -391,656 +389,4 @@ class ImagesControllerTestV2(ImagesControllerTestV21): http_request = fakes.HTTPRequest def _check_response(self, controller_method, response, expected_code): - self.assertEqual(expected_code, response.status_int) - - -class ImageXMLSerializationTest(test.NoDBTestCase): - - TIMESTAMP = "2010-10-11T10:30:22Z" - SERVER_UUID = 'aa640691-d1a7-4a67-9d3c-d35ee6b3cc74' - SERVER_HREF = 'http://localhost/v2/fake/servers/' + SERVER_UUID - SERVER_BOOKMARK = 'http://localhost/fake/servers/' + SERVER_UUID - IMAGE_HREF = 'http://localhost/v2/fake/images/%s' - IMAGE_NEXT = 'http://localhost/v2/fake/images?limit=%s&marker=%s' - IMAGE_BOOKMARK = 'http://localhost/fake/images/%s' - - def test_xml_declaration(self): - serializer = images.ImageTemplate() - - fixture = { - 'image': { - 'id': 1, - 'name': 'Image1', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - 'status': 'ACTIVE', - 'progress': 80, - 'server': { - 'id': self.SERVER_UUID, - 'links': [ - { - 'href': self.SERVER_HREF, - 'rel': 'self', - }, - { - 'href': self.SERVER_BOOKMARK, - 'rel': 'bookmark', - }, - ], - }, - 'metadata': { - 'key1': 'value1', - }, - 'links': [ - { - 'href': self.IMAGE_HREF % 1, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 1, - 'rel': 'bookmark', - }, - ], - }, - } - - output = serializer.serialize(fixture) - has_dec = output.startswith("") - self.assertTrue(has_dec) - - def test_show(self): - serializer = images.ImageTemplate() - - fixture = { - 'image': { - 'id': 1, - 'name': 'Image1', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - 'status': 'ACTIVE', - 'progress': 80, - 'minRam': 10, - 'minDisk': 100, - 'server': { - 'id': self.SERVER_UUID, - 'links': [ - { - 'href': self.SERVER_HREF, - 'rel': 'self', - }, - { - 'href': self.SERVER_BOOKMARK, - 'rel': 'bookmark', - }, - ], - }, - 'metadata': { - 'key1': 'value1', - }, - 'links': [ - { - 'href': self.IMAGE_HREF % 1, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 1, - 'rel': 'bookmark', - }, - ], - }, - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'image') - image_dict = fixture['image'] - - for key in ['name', 'id', 'updated', 'created', 'status', 'progress']: - self.assertEqual(root.get(key), str(image_dict[key])) - - link_nodes = root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - metadata_root = root.find('{0}metadata'.format(NS)) - metadata_elems = metadata_root.findall('{0}meta'.format(NS)) - self.assertEqual(len(metadata_elems), 1) - for i, metadata_elem in enumerate(metadata_elems): - (meta_key, meta_value) = image_dict['metadata'].items()[i] - self.assertEqual(str(metadata_elem.get('key')), str(meta_key)) - self.assertEqual(str(metadata_elem.text).strip(), str(meta_value)) - - server_root = root.find('{0}server'.format(NS)) - self.assertEqual(server_root.get('id'), image_dict['server']['id']) - link_nodes = server_root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['server']['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_show_zero_metadata(self): - serializer = images.ImageTemplate() - - fixture = { - 'image': { - 'id': 1, - 'name': 'Image1', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - 'status': 'ACTIVE', - 'server': { - 'id': self.SERVER_UUID, - 'links': [ - { - 'href': self.SERVER_HREF, - 'rel': 'self', - }, - { - 'href': self.SERVER_BOOKMARK, - 'rel': 'bookmark', - }, - ], - }, - 'metadata': {}, - 'links': [ - { - 'href': self.IMAGE_HREF % 1, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 1, - 'rel': 'bookmark', - }, - ], - }, - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'image') - image_dict = fixture['image'] - - for key in ['name', 'id', 'updated', 'created', 'status']: - self.assertEqual(root.get(key), str(image_dict[key])) - - link_nodes = root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - meta_nodes = root.findall('{0}meta'.format(ATOMNS)) - self.assertEqual(len(meta_nodes), 0) - - server_root = root.find('{0}server'.format(NS)) - self.assertEqual(server_root.get('id'), image_dict['server']['id']) - link_nodes = server_root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['server']['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_show_image_no_metadata_key(self): - serializer = images.ImageTemplate() - - fixture = { - 'image': { - 'id': 1, - 'name': 'Image1', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - 'status': 'ACTIVE', - 'server': { - 'id': self.SERVER_UUID, - 'links': [ - { - 'href': self.SERVER_HREF, - 'rel': 'self', - }, - { - 'href': self.SERVER_BOOKMARK, - 'rel': 'bookmark', - }, - ], - }, - 'links': [ - { - 'href': self.IMAGE_HREF % 1, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 1, - 'rel': 'bookmark', - }, - ], - }, - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'image') - image_dict = fixture['image'] - - for key in ['name', 'id', 'updated', 'created', 'status']: - self.assertEqual(root.get(key), str(image_dict[key])) - - link_nodes = root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - meta_nodes = root.findall('{0}meta'.format(ATOMNS)) - self.assertEqual(len(meta_nodes), 0) - - server_root = root.find('{0}server'.format(NS)) - self.assertEqual(server_root.get('id'), image_dict['server']['id']) - link_nodes = server_root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['server']['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_show_no_server(self): - serializer = images.ImageTemplate() - - fixture = { - 'image': { - 'id': 1, - 'name': 'Image1', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - 'status': 'ACTIVE', - 'metadata': { - 'key1': 'value1', - }, - 'links': [ - { - 'href': self.IMAGE_HREF % 1, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 1, - 'rel': 'bookmark', - }, - ], - }, - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'image') - image_dict = fixture['image'] - - for key in ['name', 'id', 'updated', 'created', 'status']: - self.assertEqual(root.get(key), str(image_dict[key])) - - link_nodes = root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - metadata_root = root.find('{0}metadata'.format(NS)) - metadata_elems = metadata_root.findall('{0}meta'.format(NS)) - self.assertEqual(len(metadata_elems), 1) - for i, metadata_elem in enumerate(metadata_elems): - (meta_key, meta_value) = image_dict['metadata'].items()[i] - self.assertEqual(str(metadata_elem.get('key')), str(meta_key)) - self.assertEqual(str(metadata_elem.text).strip(), str(meta_value)) - - server_root = root.find('{0}server'.format(NS)) - self.assertIsNone(server_root) - - def test_show_with_min_ram(self): - serializer = images.ImageTemplate() - - fixture = { - 'image': { - 'id': 1, - 'name': 'Image1', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - 'status': 'ACTIVE', - 'progress': 80, - 'minRam': 256, - 'server': { - 'id': self.SERVER_UUID, - 'links': [ - { - 'href': self.SERVER_HREF, - 'rel': 'self', - }, - { - 'href': self.SERVER_BOOKMARK, - 'rel': 'bookmark', - }, - ], - }, - 'metadata': { - 'key1': 'value1', - }, - 'links': [ - { - 'href': self.IMAGE_HREF % 1, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 1, - 'rel': 'bookmark', - }, - ], - }, - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'image') - image_dict = fixture['image'] - - for key in ['name', 'id', 'updated', 'created', 'status', 'progress', - 'minRam']: - self.assertEqual(root.get(key), str(image_dict[key])) - - link_nodes = root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - metadata_root = root.find('{0}metadata'.format(NS)) - metadata_elems = metadata_root.findall('{0}meta'.format(NS)) - self.assertEqual(len(metadata_elems), 1) - for i, metadata_elem in enumerate(metadata_elems): - (meta_key, meta_value) = image_dict['metadata'].items()[i] - self.assertEqual(str(metadata_elem.get('key')), str(meta_key)) - self.assertEqual(str(metadata_elem.text).strip(), str(meta_value)) - - server_root = root.find('{0}server'.format(NS)) - self.assertEqual(server_root.get('id'), image_dict['server']['id']) - link_nodes = server_root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['server']['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_show_with_min_disk(self): - serializer = images.ImageTemplate() - - fixture = { - 'image': { - 'id': 1, - 'name': 'Image1', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - 'status': 'ACTIVE', - 'progress': 80, - 'minDisk': 5, - 'server': { - 'id': self.SERVER_UUID, - 'links': [ - { - 'href': self.SERVER_HREF, - 'rel': 'self', - }, - { - 'href': self.SERVER_BOOKMARK, - 'rel': 'bookmark', - }, - ], - }, - 'metadata': { - 'key1': 'value1', - }, - 'links': [ - { - 'href': self.IMAGE_HREF % 1, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 1, - 'rel': 'bookmark', - }, - ], - }, - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'image') - image_dict = fixture['image'] - - for key in ['name', 'id', 'updated', 'created', 'status', 'progress', - 'minDisk']: - self.assertEqual(root.get(key), str(image_dict[key])) - - link_nodes = root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - metadata_root = root.find('{0}metadata'.format(NS)) - metadata_elems = metadata_root.findall('{0}meta'.format(NS)) - self.assertEqual(len(metadata_elems), 1) - for i, metadata_elem in enumerate(metadata_elems): - (meta_key, meta_value) = image_dict['metadata'].items()[i] - self.assertEqual(str(metadata_elem.get('key')), str(meta_key)) - self.assertEqual(str(metadata_elem.text).strip(), str(meta_value)) - - server_root = root.find('{0}server'.format(NS)) - self.assertEqual(server_root.get('id'), image_dict['server']['id']) - link_nodes = server_root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['server']['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_index(self): - serializer = images.MinimalImagesTemplate() - - fixture = { - 'images': [ - { - 'id': 1, - 'name': 'Image1', - 'links': [ - { - 'href': self.IMAGE_HREF % 1, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 1, - 'rel': 'bookmark', - }, - ], - }, - { - 'id': 2, - 'name': 'Image2', - 'links': [ - { - 'href': self.IMAGE_HREF % 2, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 2, - 'rel': 'bookmark', - }, - ], - }, - ] - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'images') - image_elems = root.findall('{0}image'.format(NS)) - self.assertEqual(len(image_elems), 2) - for i, image_elem in enumerate(image_elems): - image_dict = fixture['images'][i] - - for key in ['name', 'id']: - self.assertEqual(image_elem.get(key), str(image_dict[key])) - - link_nodes = image_elem.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_index_with_links(self): - serializer = images.MinimalImagesTemplate() - - fixture = { - 'images': [ - { - 'id': 1, - 'name': 'Image1', - 'links': [ - { - 'href': self.IMAGE_HREF % 1, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 1, - 'rel': 'bookmark', - }, - ], - }, - { - 'id': 2, - 'name': 'Image2', - 'links': [ - { - 'href': self.IMAGE_HREF % 2, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 2, - 'rel': 'bookmark', - }, - ], - }, - ], - 'images_links': [ - { - 'rel': 'next', - 'href': self.IMAGE_NEXT % (2, 2), - } - ], - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'images') - image_elems = root.findall('{0}image'.format(NS)) - self.assertEqual(len(image_elems), 2) - for i, image_elem in enumerate(image_elems): - image_dict = fixture['images'][i] - - for key in ['name', 'id']: - self.assertEqual(image_elem.get(key), str(image_dict[key])) - - link_nodes = image_elem.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - # Check images_links - images_links = root.findall('{0}link'.format(ATOMNS)) - for i, link in enumerate(fixture['images_links']): - for key, value in link.items(): - self.assertEqual(images_links[i].get(key), value) - - def test_index_zero_images(self): - serializer = images.MinimalImagesTemplate() - - fixtures = { - 'images': [], - } - - output = serializer.serialize(fixtures) - root = etree.XML(output) - xmlutil.validate_schema(root, 'images') - image_elems = root.findall('{0}image'.format(NS)) - self.assertEqual(len(image_elems), 0) - - def test_detail(self): - serializer = images.ImagesTemplate() - - fixture = { - 'images': [ - { - 'id': 1, - 'name': 'Image1', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - 'status': 'ACTIVE', - 'server': { - 'id': self.SERVER_UUID, - 'links': [ - { - 'href': self.SERVER_HREF, - 'rel': 'self', - }, - { - 'href': self.SERVER_BOOKMARK, - 'rel': 'bookmark', - }, - ], - }, - 'links': [ - { - 'href': self.IMAGE_HREF % 1, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 1, - 'rel': 'bookmark', - }, - ], - }, - { - 'id': '2', - 'name': 'Image2', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - 'status': 'SAVING', - 'progress': 80, - 'metadata': { - 'key1': 'value1', - }, - 'links': [ - { - 'href': self.IMAGE_HREF % 2, - 'rel': 'self', - }, - { - 'href': self.IMAGE_BOOKMARK % 2, - 'rel': 'bookmark', - }, - ], - }, - ] - } - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'images') - image_elems = root.findall('{0}image'.format(NS)) - self.assertEqual(len(image_elems), 2) - for i, image_elem in enumerate(image_elems): - image_dict = fixture['images'][i] - - for key in ['name', 'id', 'updated', 'created', 'status']: - self.assertEqual(image_elem.get(key), str(image_dict[key])) - - link_nodes = image_elem.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(image_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) + self.assertEqual(expected_code, response.status_int) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/test_limits.py b/nova/tests/unit/api/openstack/compute/test_limits.py index d1b5c3fe3a..29f15fe3b9 100644 --- a/nova/tests/unit/api/openstack/compute/test_limits.py +++ b/nova/tests/unit/api/openstack/compute/test_limits.py @@ -19,9 +19,7 @@ Tests dealing with HTTP rate-limiting. import httplib import StringIO -from xml.dom import minidom -from lxml import etree import mock from oslo.serialization import jsonutils import six @@ -31,7 +29,6 @@ from nova.api.openstack.compute import limits from nova.api.openstack.compute.plugins.v3 import limits as limits_v3 from nova.api.openstack.compute import views from nova.api.openstack import wsgi -from nova.api.openstack import xmlutil import nova.context from nova import test from nova.tests.unit.api.openstack import fakes @@ -402,31 +399,6 @@ class LimitMiddlewareTest(BaseLimitTestSuite): retryAfter = body["overLimit"]["retryAfter"] self.assertEqual(retryAfter, "60") - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_limited_request_xml(self): - # Test a rate-limited (429) response as XML. - request = webob.Request.blank("/") - response = request.get_response(self.app) - self.assertEqual(200, response.status_int) - - request = webob.Request.blank("/") - request.accept = "application/xml" - response = request.get_response(self.app) - self.assertEqual(response.status_int, 429) - - root = minidom.parseString(response.body).childNodes[0] - expected = "Only 1 GET request(s) can be made to * every minute." - - self.assertIsNotNone(root.attributes.getNamedItem("retryAfter")) - retryAfter = root.attributes.getNamedItem("retryAfter").value - self.assertEqual(retryAfter, "60") - - details = root.getElementsByTagName("details") - self.assertEqual(details.length, 1) - - value = details.item(0).firstChild.data.strip() - self.assertEqual(value, expected) - class LimitTest(BaseLimitTestSuite): """Tests for the `limits.Limit` class.""" @@ -930,88 +902,3 @@ class LimitsViewBuilderTest(test.NoDBTestCase): rate_limits = [] output = self.view_builder.build(rate_limits, abs_limits) self.assertThat(output, matchers.DictMatches(expected_limits)) - - -class LimitsXMLSerializationTest(test.NoDBTestCase): - def test_xml_declaration(self): - serializer = limits.LimitsTemplate() - - fixture = {"limits": { - "rate": [], - "absolute": {}}} - - output = serializer.serialize(fixture) - has_dec = output.startswith("") - self.assertTrue(has_dec) - - def test_index(self): - serializer = limits.LimitsTemplate() - fixture = { - "limits": { - "rate": [{ - "uri": "*", - "regex": ".*", - "limit": [{ - "value": 10, - "verb": "POST", - "remaining": 2, - "unit": "MINUTE", - "next-available": "2011-12-15T22:42:45Z"}]}, - {"uri": "*/servers", - "regex": "^/servers", - "limit": [{ - "value": 50, - "verb": "POST", - "remaining": 10, - "unit": "DAY", - "next-available": "2011-12-15T22:42:45Z"}]}], - "absolute": {"maxServerMeta": 1, - "maxImageMeta": 1, - "maxPersonality": 5, - "maxPersonalitySize": 10240}}} - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'limits') - - # verify absolute limits - absolutes = root.xpath('ns:absolute/ns:limit', namespaces=NS) - self.assertEqual(len(absolutes), 4) - for limit in absolutes: - name = limit.get('name') - value = limit.get('value') - self.assertEqual(value, str(fixture['limits']['absolute'][name])) - - # verify rate limits - rates = root.xpath('ns:rates/ns:rate', namespaces=NS) - self.assertEqual(len(rates), 2) - for i, rate in enumerate(rates): - for key in ['uri', 'regex']: - self.assertEqual(rate.get(key), - str(fixture['limits']['rate'][i][key])) - rate_limits = rate.xpath('ns:limit', namespaces=NS) - self.assertEqual(len(rate_limits), 1) - for j, limit in enumerate(rate_limits): - for key in ['verb', 'value', 'remaining', 'unit', - 'next-available']: - self.assertEqual(limit.get(key), - str(fixture['limits']['rate'][i]['limit'][j][key])) - - def test_index_no_limits(self): - serializer = limits.LimitsTemplate() - - fixture = {"limits": { - "rate": [], - "absolute": {}}} - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'limits') - - # verify absolute limits - absolutes = root.xpath('ns:absolute/ns:limit', namespaces=NS) - self.assertEqual(len(absolutes), 0) - - # verify rate limits - rates = root.xpath('ns:rates/ns:rate', namespaces=NS) - self.assertEqual(len(rates), 0) diff --git a/nova/tests/unit/api/openstack/compute/test_server_actions.py b/nova/tests/unit/api/openstack/compute/test_server_actions.py index 940400d526..0bb1316d8b 100644 --- a/nova/tests/unit/api/openstack/compute/test_server_actions.py +++ b/nova/tests/unit/api/openstack/compute/test_server_actions.py @@ -37,8 +37,6 @@ from nova.tests.unit.api.openstack import fakes from nova.tests.unit import fake_block_device from nova.tests.unit import fake_instance from nova.tests.unit.image import fake -from nova.tests.unit import matchers -from nova.tests.unit import utils CONF = cfg.CONF CONF.import_opt('password_length', 'nova.utils') @@ -1328,228 +1326,4 @@ class ServerActionsControllerTest(test.TestCase): req = fakes.HTTPRequest.blank(self.url) self.assertRaises(webob.exc.HTTPConflict, self.controller._action_create_image, - req, FAKE_UUID, body) - - -class TestServerActionXMLDeserializer(test.TestCase): - - def setUp(self): - super(TestServerActionXMLDeserializer, self).setUp() - self.deserializer = servers.ActionDeserializer() - - def test_create_image(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "createImage": { - "name": "new-server-test", - }, - } - self.assertEqual(request['body'], expected) - - def test_create_image_with_metadata(self): - serial_request = """ - - - value1 - -""" - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "createImage": { - "name": "new-server-test", - "metadata": {"key1": "value1"}, - }, - } - self.assertEqual(request['body'], expected) - - def test_change_pass(self): - serial_request = """ - """ - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "changePassword": { - "adminPass": "1234pass", - }, - } - self.assertEqual(request['body'], expected) - - def test_change_pass_no_pass(self): - serial_request = """ - """ - self.assertRaises(AttributeError, - self.deserializer.deserialize, - serial_request, - 'action') - - def test_change_pass_empty_pass(self): - serial_request = """ - """ - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "changePassword": { - "adminPass": "", - }, - } - self.assertEqual(request['body'], expected) - - def test_reboot(self): - serial_request = """ - """ - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "reboot": { - "type": "HARD", - }, - } - self.assertEqual(request['body'], expected) - - def test_reboot_no_type(self): - serial_request = """ - """ - self.assertRaises(AttributeError, - self.deserializer.deserialize, - serial_request, - 'action') - - def test_resize(self): - serial_request = """ - """ - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "resize": {"flavorRef": "http://localhost/flavors/3"}, - } - self.assertEqual(request['body'], expected) - - def test_resize_no_flavor_ref(self): - serial_request = """ - """ - self.assertRaises(AttributeError, - self.deserializer.deserialize, - serial_request, - 'action') - - def test_confirm_resize(self): - serial_request = """ - """ - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "confirmResize": None, - } - self.assertEqual(request['body'], expected) - - def test_revert_resize(self): - serial_request = """ - """ - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "revertResize": None, - } - self.assertEqual(request['body'], expected) - - def test_rebuild(self): - serial_request = """ - - - Apache1 - - - Mg== - - """ - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "rebuild": { - "name": "new-server-test", - "imageRef": "http://localhost/images/1", - "metadata": { - "My Server Name": "Apache1", - }, - "personality": [ - {"path": "/etc/banner.txt", "contents": "Mg=="}, - ], - }, - } - self.assertThat(request['body'], matchers.DictMatches(expected)) - - def test_rebuild_minimum(self): - serial_request = """ - """ - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "rebuild": { - "imageRef": "http://localhost/images/1", - }, - } - self.assertThat(request['body'], matchers.DictMatches(expected)) - - def test_rebuild_no_imageRef(self): - serial_request = """ - - - Apache1 - - - Mg== - - """ - self.assertRaises(AttributeError, - self.deserializer.deserialize, - serial_request, - 'action') - - def test_rebuild_blank_name(self): - serial_request = """ - """ - self.assertRaises(AttributeError, - self.deserializer.deserialize, - serial_request, - 'action') - - def test_rebuild_preserve_ephemeral_passed(self): - serial_request = """ - """ - request = self.deserializer.deserialize(serial_request, 'action') - expected = { - "rebuild": { - "imageRef": "http://localhost/images/1", - "preserve_ephemeral": True, - }, - } - self.assertThat(request['body'], matchers.DictMatches(expected)) - - def test_corrupt_xml(self): - """Should throw a 400 error on corrupt xml.""" - self.assertRaises( - exception.MalformedRequestBody, - self.deserializer.deserialize, - utils.killer_xml_body()) + req, FAKE_UUID, body) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/compute/test_servers.py b/nova/tests/unit/api/openstack/compute/test_servers.py index 9ad635dc6c..5c08d1649c 100644 --- a/nova/tests/unit/api/openstack/compute/test_servers.py +++ b/nova/tests/unit/api/openstack/compute/test_servers.py @@ -22,22 +22,18 @@ import urllib import uuid import iso8601 -from lxml import etree import mock from oslo.config import cfg from oslo.serialization import jsonutils from oslo.utils import timeutils -import six import six.moves.urllib.parse as urlparse import testtools import webob -from nova.api.openstack import compute from nova.api.openstack.compute import ips from nova.api.openstack.compute import servers from nova.api.openstack.compute import views from nova.api.openstack import extensions -from nova.api.openstack import xmlutil from nova.compute import api as compute_api from nova.compute import delete_types from nova.compute import flavors @@ -62,7 +58,6 @@ from nova.tests.unit import fake_network from nova.tests.unit.image import fake from nova.tests.unit import matchers from nova.tests.unit.objects import test_keypair -from nova.tests.unit import utils from nova import utils as nova_utils CONF = cfg.CONF @@ -2882,659 +2877,6 @@ class ServersControllerCreateTestWithMock(test.TestCase): self._test_create_extra, {}) -class TestServerCreateRequestXMLDeserializer(test.TestCase): - - def setUp(self): - super(TestServerCreateRequestXMLDeserializer, self).setUp() - self.deserializer = servers.CreateDeserializer() - - def test_minimal_request(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "2", - }, - } - self.assertEqual(request['body'], expected) - - def test_request_with_alternate_namespace_prefix(self): - serial_request = """ - - world - - """ - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "2", - 'metadata': {"hello": "world"}, - }, - } - self.assertEqual(request['body'], expected) - - def test_request_with_scheduler_hints_and_alternate_namespace_prefix(self): - serial_request = """ - - world - - xen - eb999657-dd6b-464e-8713-95c532ac3b18 - - - """ - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - 'OS-SCH-HNT:scheduler_hints': { - 'hypervisor': ['xen'], - 'near': ['eb999657-dd6b-464e-8713-95c532ac3b18'] - }, - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "2", - "metadata": { - "hello": "world" - } - } - } - self.assertEqual(request['body'], expected) - - def test_access_ipv4(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "2", - "accessIPv4": "1.2.3.4", - }, - } - self.assertEqual(request['body'], expected) - - def test_access_ipv6(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "2", - "accessIPv6": "fead::1234", - }, - } - self.assertEqual(request['body'], expected) - - def test_access_ip(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "2", - "accessIPv4": "1.2.3.4", - "accessIPv6": "fead::1234", - }, - } - self.assertEqual(request['body'], expected) - - def test_admin_pass(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "2", - "adminPass": "1234", - }, - } - self.assertEqual(request['body'], expected) - - def test_image_link(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "http://localhost:8774/v2/images/2", - "flavorRef": "3", - }, - } - self.assertEqual(request['body'], expected) - - def test_flavor_link(self): - serial_request = """ -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "http://localhost:8774/v2/flavors/3", - }, - } - self.assertEqual(request['body'], expected) - - def test_empty_metadata_personality(self): - serial_request = """ - - - -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "2", - "metadata": {}, - "personality": [], - }, - } - self.assertEqual(request['body'], expected) - - def test_multiple_metadata_items(self): - serial_request = """ - - - two - snack - -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "2", - "metadata": {"one": "two", "open": "snack"}, - }, - } - self.assertEqual(request['body'], expected) - - def test_multiple_personality_files(self): - serial_request = """ - - - MQ== - Mg== - -""" - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "2", - "personality": [ - {"path": "/etc/banner.txt", "contents": "MQ=="}, - {"path": "/etc/hosts", "contents": "Mg=="}, - ], - }, - } - self.assertThat(request['body'], matchers.DictMatches(expected)) - - def test_spec_request(self): - image_bookmark_link = ("http://servers.api.openstack.org/1234/" - "images/52415800-8b69-11e0-9b19-734f6f006e54") - serial_request = """ - - - Apache1 - - - Mg== - -""" % (image_bookmark_link) - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "new-server-test", - "imageRef": ("http://servers.api.openstack.org/1234/" - "images/52415800-8b69-11e0-9b19-734f6f006e54"), - "flavorRef": "52415800-8b69-11e0-9b19-734f1195ff37", - "metadata": {"My Server Name": "Apache1"}, - "personality": [ - { - "path": "/etc/banner.txt", - "contents": "Mg==", - }, - ], - }, - } - self.assertEqual(request['body'], expected) - - def test_request_with_empty_networks(self): - serial_request = """ - - -""" - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "networks": [], - }} - self.assertEqual(request['body'], expected) - - def test_request_with_one_network(self): - serial_request = """ - - - - -""" - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "networks": [{"uuid": "1", "fixed_ip": "10.0.1.12"}], - }} - self.assertEqual(request['body'], expected) - - def test_request_with_two_networks(self): - serial_request = """ - - - - - -""" - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "networks": [{"uuid": "1", "fixed_ip": "10.0.1.12"}, - {"uuid": "2", "fixed_ip": "10.0.2.12"}], - }} - self.assertEqual(request['body'], expected) - - def test_request_with_second_network_node_ignored(self): - serial_request = """ - - - - - - - -""" - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "networks": [{"uuid": "1", "fixed_ip": "10.0.1.12"}], - }} - self.assertEqual(request['body'], expected) - - def test_request_with_one_network_missing_id(self): - serial_request = """ - - - - -""" - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "networks": [{"fixed_ip": "10.0.1.12"}], - }} - self.assertEqual(request['body'], expected) - - def test_request_with_one_network_missing_fixed_ip(self): - serial_request = """ - - - - -""" - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "networks": [{"uuid": "1"}], - }} - self.assertEqual(request['body'], expected) - - def test_request_with_one_network_empty_id(self): - serial_request = """ - - - - - """ - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "networks": [{"uuid": "", "fixed_ip": "10.0.1.12"}], - }} - self.assertEqual(request['body'], expected) - - def test_request_with_one_network_empty_fixed_ip(self): - serial_request = """ - - - - - """ - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "networks": [{"uuid": "1", "fixed_ip": ""}], - }} - self.assertEqual(request['body'], expected) - - def test_request_with_networks_duplicate_ids(self): - serial_request = """ - - - - - - """ - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "networks": [{"uuid": "1", "fixed_ip": "10.0.1.12"}, - {"uuid": "1", "fixed_ip": "10.0.2.12"}], - }} - self.assertEqual(request['body'], expected) - - def test_request_with_availability_zone(self): - serial_request = """ - - """ - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "availability_zone": "some_zone:some_host", - }} - self.assertEqual(request['body'], expected) - - def test_request_with_multiple_create_args(self): - serial_request = """ - - """ - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "min_count": "1", - "max_count": "3", - "return_reservation_id": True, - }} - self.assertEqual(request['body'], expected) - - def test_request_with_disk_config(self): - serial_request = """ - - """ - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "OS-DCF:diskConfig": "AUTO", - }} - self.assertEqual(request['body'], expected) - - def test_request_with_scheduler_hints(self): - serial_request = """ - - - - 7329b667-50c7-46a6-b913-cb2a09dfeee0 - - - f31efb24-34d2-43e1-8b44-316052956a39 - - - """ - request = self.deserializer.deserialize(serial_request) - expected = {"server": { - "name": "new-server-test", - "imageRef": "1", - "flavorRef": "1", - "OS-SCH-HNT:scheduler_hints": { - "different_host": [ - "7329b667-50c7-46a6-b913-cb2a09dfeee0", - "f31efb24-34d2-43e1-8b44-316052956a39", - ] - } - }} - self.assertEqual(request['body'], expected) - - def test_request_with_config_drive(self): - serial_request = """ - """ - request = self.deserializer.deserialize(serial_request) - expected = { - "server": { - "name": "config_drive_test", - "imageRef": "1", - "flavorRef": "1", - "config_drive": "true" - }, - } - self.assertEqual(request['body'], expected) - - def test_corrupt_xml(self): - """Should throw a 400 error on corrupt xml.""" - self.assertRaises( - exception.MalformedRequestBody, - self.deserializer.deserialize, - utils.killer_xml_body()) - - -class TestServerActionRequestXMLDeserializer(test.TestCase): - - def setUp(self): - super(TestServerActionRequestXMLDeserializer, self).setUp() - self.deserializer = servers.ActionDeserializer() - - def _generate_request(self, action, disk_cfg, ref): - return """ -<%(action)s xmlns="http://docs.openstack.org/compute/api/v1.1" - xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" - %(disk_config)s="MANUAL" %(ref)s="1"/>""" % ( - {'action': action, 'disk_config': disk_cfg, 'ref': ref}) - - def _generate_expected(self, action, ref): - return { - "%s" % action: { - "%s" % ref: "1", - "OS-DCF:diskConfig": "MANUAL", - }, - } - - def test_rebuild_request(self): - serial_request = self._generate_request("rebuild", "OS-DCF:diskConfig", - "imageRef") - request = self.deserializer.deserialize(serial_request) - expected = self._generate_expected("rebuild", "imageRef") - self.assertEqual(request['body'], expected) - - def test_rebuild_request_auto_disk_config_compat(self): - serial_request = self._generate_request("rebuild", "auto_disk_config", - "imageRef") - request = self.deserializer.deserialize(serial_request) - expected = self._generate_expected("rebuild", "imageRef") - self.assertEqual(request['body'], expected) - - def test_resize_request(self): - serial_request = self._generate_request("resize", "OS-DCF:diskConfig", - "flavorRef") - request = self.deserializer.deserialize(serial_request) - expected = self._generate_expected("resize", "flavorRef") - self.assertEqual(request['body'], expected) - - def test_resize_request_auto_disk_config_compat(self): - serial_request = self._generate_request("resize", "auto_disk_config", - "flavorRef") - request = self.deserializer.deserialize(serial_request) - expected = self._generate_expected("resize", "flavorRef") - self.assertEqual(request['body'], expected) - - -class TestAddressesXMLSerialization(test.TestCase): - - index_serializer = ips.AddressesTemplate() - show_serializer = ips.NetworkTemplate() - - def _serializer_test_data(self): - return { - 'network_2': [ - {'addr': '192.168.0.1', 'version': 4}, - {'addr': 'fe80::beef', 'version': 6}, - ], - } - - def test_xml_declaration(self): - output = self.show_serializer.serialize(self._serializer_test_data()) - has_dec = output.startswith("") - self.assertTrue(has_dec) - - def test_show(self): - output = self.show_serializer.serialize(self._serializer_test_data()) - root = etree.XML(output) - network = self._serializer_test_data()['network_2'] - self.assertEqual(str(root.get('id')), 'network_2') - ip_elems = root.findall('{0}ip'.format(NS)) - for z, ip_elem in enumerate(ip_elems): - ip = network[z] - self.assertEqual(str(ip_elem.get('version')), - str(ip['version'])) - self.assertEqual(str(ip_elem.get('addr')), - str(ip['addr'])) - - def test_index(self): - fixture = { - 'addresses': { - 'network_1': [ - {'addr': '192.168.0.3', 'version': 4}, - {'addr': '192.168.0.5', 'version': 4}, - ], - 'network_2': [ - {'addr': '192.168.0.1', 'version': 4}, - {'addr': 'fe80::beef', 'version': 6}, - ], - }, - } - output = self.index_serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'addresses') - addresses_dict = fixture['addresses'] - network_elems = root.findall('{0}network'.format(NS)) - self.assertEqual(len(network_elems), 2) - for i, network_elem in enumerate(network_elems): - network = addresses_dict.items()[i] - self.assertEqual(str(network_elem.get('id')), str(network[0])) - ip_elems = network_elem.findall('{0}ip'.format(NS)) - for z, ip_elem in enumerate(ip_elems): - ip = network[1][z] - self.assertEqual(str(ip_elem.get('version')), - str(ip['version'])) - self.assertEqual(str(ip_elem.get('addr')), - str(ip['addr'])) - - class ServersViewBuilderTest(test.TestCase): image_bookmark = "http://localhost/fake/images/5" @@ -3817,611 +3159,3 @@ class ServersViewBuilderTest(test.TestCase): output = self.view_builder.show(self.request, self.instance) self.assertThat(output, matchers.DictMatches(self.expected_detailed_server)) - - -class ServerXMLSerializationTest(test.TestCase): - - TIMESTAMP = "2010-10-11T10:30:22Z" - SERVER_HREF = 'http://localhost/v2/servers/%s' % FAKE_UUID - SERVER_NEXT = 'http://localhost/v2/servers?limit=%s&marker=%s' - SERVER_BOOKMARK = 'http://localhost/servers/%s' % FAKE_UUID - IMAGE_BOOKMARK = 'http://localhost/images/5' - FLAVOR_BOOKMARK = 'http://localhost/flavors/1' - USERS_ATTRIBUTES = ['name', 'id', 'created', 'accessIPv4', - 'updated', 'progress', 'status', 'hostId', - 'accessIPv6'] - ADMINS_ATTRIBUTES = USERS_ATTRIBUTES + ['adminPass'] - - def setUp(self): - super(ServerXMLSerializationTest, self).setUp() - self.body = { - "server": { - 'id': FAKE_UUID, - 'user_id': 'fake_user_id', - 'tenant_id': 'fake_tenant_id', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - "progress": 0, - "name": "test_server-" + u'\u89e3\u7801', - "status": "BUILD", - "hostId": 'e4d909c290d0fb1ca068ffaddf22cbd0', - "accessIPv4": "1.2.3.4", - "accessIPv6": "fead::1234", - "image": { - "id": "5", - "links": [ - { - "rel": "bookmark", - "href": self.IMAGE_BOOKMARK, - }, - ], - }, - "flavor": { - "id": "1", - "links": [ - { - "rel": "bookmark", - "href": self.FLAVOR_BOOKMARK, - }, - ], - }, - "addresses": { - "network_one": [ - { - "version": 4, - "addr": "67.23.10.138", - }, - { - "version": 6, - "addr": "::babe:67.23.10.138", - }, - ], - "network_two": [ - { - "version": 4, - "addr": "67.23.10.139", - }, - { - "version": 6, - "addr": "::babe:67.23.10.139", - }, - ], - }, - "metadata": { - "Open": "Stack", - "Number": "1", - }, - 'links': [ - { - 'href': self.SERVER_HREF, - 'rel': 'self', - }, - { - 'href': self.SERVER_BOOKMARK, - 'rel': 'bookmark', - }, - ], - } - } - - def _validate_xml(self, root, server_dict): - - link_nodes = root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(server_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - metadata_root = root.find('{0}metadata'.format(NS)) - metadata_elems = metadata_root.findall('{0}meta'.format(NS)) - self.assertEqual(len(metadata_elems), 2) - for i, metadata_elem in enumerate(metadata_elems): - (meta_key, meta_value) = server_dict['metadata'].items()[i] - self.assertEqual(str(metadata_elem.get('key')), str(meta_key)) - self.assertEqual(str(metadata_elem.text).strip(), str(meta_value)) - - image_root = root.find('{0}image'.format(NS)) - self.assertEqual(image_root.get('id'), server_dict['image']['id']) - link_nodes = image_root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 1) - for i, link in enumerate(server_dict['image']['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - flavor_root = root.find('{0}flavor'.format(NS)) - self.assertEqual(flavor_root.get('id'), server_dict['flavor']['id']) - link_nodes = flavor_root.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 1) - for i, link in enumerate(server_dict['flavor']['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - addresses_root = root.find('{0}addresses'.format(NS)) - addresses_dict = server_dict['addresses'] - network_elems = addresses_root.findall('{0}network'.format(NS)) - self.assertEqual(len(network_elems), 2) - for i, network_elem in enumerate(network_elems): - network = addresses_dict.items()[i] - self.assertEqual(str(network_elem.get('id')), str(network[0])) - ip_elems = network_elem.findall('{0}ip'.format(NS)) - for z, ip_elem in enumerate(ip_elems): - ip = network[1][z] - self.assertEqual(str(ip_elem.get('version')), - str(ip['version'])) - self.assertEqual(str(ip_elem.get('addr')), - str(ip['addr'])) - - def _validate_required_attributes(self, root, server_dict, attributes): - for key in attributes: - expected = server_dict[key] - if not isinstance(expected, six.text_type): - expected = str(expected) - self.assertEqual(expected, root.get(key)) - - def test_xml_declaration(self): - serializer = servers.ServerTemplate() - - output = serializer.serialize(self.body) - has_dec = output.startswith("") - self.assertTrue(has_dec) - - def test_show(self): - serializer = servers.ServerTemplate() - - output = serializer.serialize(self.body) - root = etree.XML(output) - xmlutil.validate_schema(root, 'server') - - server_dict = self.body['server'] - - self._validate_required_attributes(root, server_dict, - self.USERS_ATTRIBUTES) - self._validate_xml(root, server_dict) - - def test_create(self): - serializer = servers.FullServerTemplate() - - self.body["server"]["adminPass"] = "test_password" - - output = serializer.serialize(self.body) - root = etree.XML(output) - xmlutil.validate_schema(root, 'server') - - server_dict = self.body['server'] - - self._validate_required_attributes(root, server_dict, - self.ADMINS_ATTRIBUTES) - self._validate_xml(root, server_dict) - - def test_index(self): - serializer = servers.MinimalServersTemplate() - - uuid1 = fakes.get_fake_uuid(1) - uuid2 = fakes.get_fake_uuid(2) - expected_server_href = 'http://localhost/v2/servers/%s' % uuid1 - expected_server_bookmark = 'http://localhost/servers/%s' % uuid1 - expected_server_href_2 = 'http://localhost/v2/servers/%s' % uuid2 - expected_server_bookmark_2 = 'http://localhost/servers/%s' % uuid2 - fixture = {"servers": [ - { - "id": fakes.get_fake_uuid(1), - "name": "test_server", - 'links': [ - { - 'href': expected_server_href, - 'rel': 'self', - }, - { - 'href': expected_server_bookmark, - 'rel': 'bookmark', - }, - ], - }, - { - "id": fakes.get_fake_uuid(2), - "name": "test_server_2", - 'links': [ - { - 'href': expected_server_href_2, - 'rel': 'self', - }, - { - 'href': expected_server_bookmark_2, - 'rel': 'bookmark', - }, - ], - }, - ]} - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'servers') - server_elems = root.findall('{0}server'.format(NS)) - self.assertEqual(len(server_elems), 2) - for i, server_elem in enumerate(server_elems): - server_dict = fixture['servers'][i] - for key in ['name', 'id']: - self.assertEqual(server_elem.get(key), str(server_dict[key])) - - link_nodes = server_elem.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(server_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - def test_index_with_servers_links(self): - serializer = servers.MinimalServersTemplate() - - uuid1 = fakes.get_fake_uuid(1) - uuid2 = fakes.get_fake_uuid(2) - expected_server_href = 'http://localhost/v2/servers/%s' % uuid1 - expected_server_next = self.SERVER_NEXT % (2, 2) - expected_server_bookmark = 'http://localhost/servers/%s' % uuid1 - expected_server_href_2 = 'http://localhost/v2/servers/%s' % uuid2 - expected_server_bookmark_2 = 'http://localhost/servers/%s' % uuid2 - fixture = {"servers": [ - { - "id": fakes.get_fake_uuid(1), - "name": "test_server", - 'links': [ - { - 'href': expected_server_href, - 'rel': 'self', - }, - { - 'href': expected_server_bookmark, - 'rel': 'bookmark', - }, - ], - }, - { - "id": fakes.get_fake_uuid(2), - "name": "test_server_2", - 'links': [ - { - 'href': expected_server_href_2, - 'rel': 'self', - }, - { - 'href': expected_server_bookmark_2, - 'rel': 'bookmark', - }, - ], - }, - ], - "servers_links": [ - { - 'rel': 'next', - 'href': expected_server_next, - }, - ]} - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'servers') - server_elems = root.findall('{0}server'.format(NS)) - self.assertEqual(len(server_elems), 2) - for i, server_elem in enumerate(server_elems): - server_dict = fixture['servers'][i] - for key in ['name', 'id']: - self.assertEqual(server_elem.get(key), str(server_dict[key])) - - link_nodes = server_elem.findall('{0}link'.format(ATOMNS)) - self.assertEqual(len(link_nodes), 2) - for i, link in enumerate(server_dict['links']): - for key, value in link.items(): - self.assertEqual(link_nodes[i].get(key), value) - - # Check servers_links - servers_links = root.findall('{0}link'.format(ATOMNS)) - for i, link in enumerate(fixture['servers_links']): - for key, value in link.items(): - self.assertEqual(servers_links[i].get(key), value) - - def test_detail(self): - serializer = servers.ServersTemplate() - - uuid1 = fakes.get_fake_uuid(1) - expected_server_href = 'http://localhost/v2/servers/%s' % uuid1 - expected_server_bookmark = 'http://localhost/servers/%s' % uuid1 - expected_image_bookmark = self.IMAGE_BOOKMARK - expected_flavor_bookmark = self.FLAVOR_BOOKMARK - - uuid2 = fakes.get_fake_uuid(2) - expected_server_href_2 = 'http://localhost/v2/servers/%s' % uuid2 - expected_server_bookmark_2 = 'http://localhost/servers/%s' % uuid2 - fixture = {"servers": [ - { - "id": fakes.get_fake_uuid(1), - "user_id": "fake", - "tenant_id": "fake", - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - "progress": 0, - "name": "test_server", - "status": "BUILD", - "accessIPv4": "1.2.3.4", - "accessIPv6": "fead::1234", - "hostId": 'e4d909c290d0fb1ca068ffaddf22cbd0', - "image": { - "id": "5", - "links": [ - { - "rel": "bookmark", - "href": expected_image_bookmark, - }, - ], - }, - "flavor": { - "id": "1", - "links": [ - { - "rel": "bookmark", - "href": expected_flavor_bookmark, - }, - ], - }, - "addresses": { - "network_one": [ - { - "version": 4, - "addr": "67.23.10.138", - }, - { - "version": 6, - "addr": "::babe:67.23.10.138", - }, - ], - "network_two": [ - { - "version": 4, - "addr": "67.23.10.139", - }, - { - "version": 6, - "addr": "::babe:67.23.10.139", - }, - ], - }, - "metadata": { - "Open": "Stack", - "Number": "1", - }, - "links": [ - { - "href": expected_server_href, - "rel": "self", - }, - { - "href": expected_server_bookmark, - "rel": "bookmark", - }, - ], - }, - { - "id": fakes.get_fake_uuid(2), - "user_id": 'fake', - "tenant_id": 'fake', - 'created': self.TIMESTAMP, - 'updated': self.TIMESTAMP, - "progress": 100, - "name": "test_server_2", - "status": "ACTIVE", - "accessIPv4": "1.2.3.4", - "accessIPv6": "fead::1234", - "hostId": 'e4d909c290d0fb1ca068ffaddf22cbd0', - "image": { - "id": "5", - "links": [ - { - "rel": "bookmark", - "href": expected_image_bookmark, - }, - ], - }, - "flavor": { - "id": "1", - "links": [ - { - "rel": "bookmark", - "href": expected_flavor_bookmark, - }, - ], - }, - "addresses": { - "network_one": [ - { - "version": 4, - "addr": "67.23.10.138", - }, - { - "version": 6, - "addr": "::babe:67.23.10.138", - }, - ], - "network_two": [ - { - "version": 4, - "addr": "67.23.10.139", - }, - { - "version": 6, - "addr": "::babe:67.23.10.139", - }, - ], - }, - "metadata": { - "Open": "Stack", - "Number": "2", - }, - "links": [ - { - "href": expected_server_href_2, - "rel": "self", - }, - { - "href": expected_server_bookmark_2, - "rel": "bookmark", - }, - ], - }, - ]} - - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'servers') - server_elems = root.findall('{0}server'.format(NS)) - self.assertEqual(len(server_elems), 2) - for i, server_elem in enumerate(server_elems): - server_dict = fixture['servers'][i] - self._validate_required_attributes(server_elem, server_dict, - self.USERS_ATTRIBUTES) - self._validate_xml(server_elem, server_dict) - - def test_update(self): - serializer = servers.ServerTemplate() - - self.body["server"]["fault"] = { - "code": 500, - "created": self.TIMESTAMP, - "message": "Error Message", - "details": "Fault details", - } - output = serializer.serialize(self.body) - root = etree.XML(output) - xmlutil.validate_schema(root, 'server') - - server_dict = self.body['server'] - - self._validate_required_attributes(root, server_dict, - self.USERS_ATTRIBUTES) - - self._validate_xml(root, server_dict) - fault_root = root.find('{0}fault'.format(NS)) - fault_dict = server_dict['fault'] - self.assertEqual(fault_root.get("code"), str(fault_dict["code"])) - self.assertEqual(fault_root.get("created"), fault_dict["created"]) - msg_elem = fault_root.find('{0}message'.format(NS)) - self.assertEqual(msg_elem.text, fault_dict["message"]) - det_elem = fault_root.find('{0}details'.format(NS)) - self.assertEqual(det_elem.text, fault_dict["details"]) - - def test_action(self): - serializer = servers.FullServerTemplate() - - self.body["server"]["adminPass"] = u'\u89e3\u7801' - output = serializer.serialize(self.body) - root = etree.XML(output) - xmlutil.validate_schema(root, 'server') - - server_dict = self.body['server'] - - self._validate_required_attributes(root, server_dict, - self.ADMINS_ATTRIBUTES) - - self._validate_xml(root, server_dict) - - -class ServersAllExtensionsTestCase(test.TestCase): - """Servers tests using default API router with all extensions enabled. - - The intent here is to catch cases where extensions end up throwing - an exception because of a malformed request before the core API - gets a chance to validate the request and return a 422 response. - - For example, ServerDiskConfigController extends servers.Controller:: - - | @wsgi.extends - | def create(self, req, body): - | if 'server' in body: - | self._set_disk_config(body['server']) - | resp_obj = (yield) - | self._show(req, resp_obj) - - we want to ensure that the extension isn't barfing on an invalid - body. - """ - - def setUp(self): - super(ServersAllExtensionsTestCase, self).setUp() - self.app = compute.APIRouter() - - def test_create_missing_server(self): - # Test create with malformed body. - - def fake_create(*args, **kwargs): - raise test.TestingException("Should not reach the compute API.") - - self.stubs.Set(compute_api.API, 'create', fake_create) - - req = fakes.HTTPRequest.blank('/fake/servers') - req.method = 'POST' - req.content_type = 'application/json' - body = {'foo': {'a': 'b'}} - - req.body = jsonutils.dumps(body) - res = req.get_response(self.app) - self.assertEqual(422, res.status_int) - - def test_update_missing_server(self): - # Test update with malformed body. - - def fake_update(*args, **kwargs): - raise test.TestingException("Should not reach the compute API.") - - self.stubs.Set(compute_api.API, 'update', fake_update) - - req = fakes.HTTPRequest.blank('/fake/servers/1') - req.method = 'PUT' - req.content_type = 'application/json' - body = {'foo': {'a': 'b'}} - - req.body = jsonutils.dumps(body) - res = req.get_response(self.app) - self.assertEqual(422, res.status_int) - - -class ServersUnprocessableEntityTestCase(test.TestCase): - """Tests of places we throw 422 Unprocessable Entity from.""" - - def setUp(self): - super(ServersUnprocessableEntityTestCase, self).setUp() - self.ext_mgr = extensions.ExtensionManager() - self.ext_mgr.extensions = {} - self.controller = servers.Controller(self.ext_mgr) - - def _unprocessable_server_create(self, body): - req = fakes.HTTPRequest.blank('/fake/servers') - req.method = 'POST' - - self.assertRaises(webob.exc.HTTPUnprocessableEntity, - self.controller.create, req, body) - - def test_create_server_no_body(self): - self._unprocessable_server_create(body=None) - - def test_create_server_missing_server(self): - body = {'foo': {'a': 'b'}} - self._unprocessable_server_create(body=body) - - def test_create_server_malformed_entity(self): - body = {'server': 'string'} - self._unprocessable_server_create(body=body) - - def _unprocessable_server_update(self, body): - req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID) - req.method = 'PUT' - - self.assertRaises(webob.exc.HTTPUnprocessableEntity, - self.controller.update, req, FAKE_UUID, body) - - def test_update_server_no_body(self): - self._unprocessable_server_update(body=None) - - def test_update_server_missing_server(self): - body = {'foo': {'a': 'b'}} - self._unprocessable_server_update(body=body) - - def test_create_update_malformed_entity(self): - body = {'server': 'string'} - self._unprocessable_server_update(body=body) diff --git a/nova/tests/unit/api/openstack/test_common.py b/nova/tests/unit/api/openstack/test_common.py index a61f70cf95..b7d70a1ea3 100644 --- a/nova/tests/unit/api/openstack/test_common.py +++ b/nova/tests/unit/api/openstack/test_common.py @@ -17,9 +17,6 @@ Test suites for 'common' code used throughout the OpenStack HTTP API. """ -import xml.dom.minidom as minidom - -from lxml import etree import mock import six from testtools import matchers @@ -28,7 +25,6 @@ import webob.exc import webob.multidict from nova.api.openstack import common -from nova.api.openstack import xmlutil from nova.compute import task_states from nova.compute import vm_states from nova import exception @@ -548,203 +544,6 @@ class TestCollectionLinks(test.NoDBTestCase): self.assertThat(results, matchers.HasLength(1)) -class MetadataXMLDeserializationTest(test.TestCase): - - deserializer = common.MetadataXMLDeserializer() - - def test_create(self): - request_body = """ - - asdf - jkl; - """ - output = self.deserializer.deserialize(request_body, 'create') - expected = {"body": {"metadata": {"123": "asdf", "567": "jkl;"}}} - self.assertEqual(output, expected) - - def test_create_empty(self): - request_body = """ - """ - output = self.deserializer.deserialize(request_body, 'create') - expected = {"body": {"metadata": {}}} - self.assertEqual(output, expected) - - def test_update_all(self): - request_body = """ - - asdf - jkl; - """ - output = self.deserializer.deserialize(request_body, 'update_all') - expected = {"body": {"metadata": {"123": "asdf", "567": "jkl;"}}} - self.assertEqual(output, expected) - - def test_update(self): - request_body = """ - asdf""" - output = self.deserializer.deserialize(request_body, 'update') - expected = {"body": {"meta": {"123": "asdf"}}} - self.assertEqual(output, expected) - - -class MetadataXMLSerializationTest(test.TestCase): - - def test_xml_declaration(self): - serializer = common.MetadataTemplate() - fixture = { - 'metadata': { - 'one': 'two', - 'three': 'four', - }, - } - - output = serializer.serialize(fixture) - has_dec = output.startswith("") - self.assertTrue(has_dec) - - def test_index(self): - serializer = common.MetadataTemplate() - fixture = { - 'metadata': { - 'one': 'two', - 'three': 'four', - }, - } - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'metadata') - metadata_dict = fixture['metadata'] - metadata_elems = root.findall('{0}meta'.format(NS)) - self.assertEqual(len(metadata_elems), 2) - for i, metadata_elem in enumerate(metadata_elems): - (meta_key, meta_value) = metadata_dict.items()[i] - self.assertEqual(str(metadata_elem.get('key')), str(meta_key)) - self.assertEqual(str(metadata_elem.text).strip(), str(meta_value)) - - def test_index_null(self): - serializer = common.MetadataTemplate() - fixture = { - 'metadata': { - None: None, - }, - } - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'metadata') - metadata_dict = fixture['metadata'] - metadata_elems = root.findall('{0}meta'.format(NS)) - self.assertEqual(len(metadata_elems), 1) - for i, metadata_elem in enumerate(metadata_elems): - (meta_key, meta_value) = metadata_dict.items()[i] - self.assertEqual(str(metadata_elem.get('key')), str(meta_key)) - self.assertEqual(str(metadata_elem.text).strip(), str(meta_value)) - - def test_index_unicode(self): - serializer = common.MetadataTemplate() - fixture = { - 'metadata': { - u'three': u'Jos\xe9', - }, - } - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'metadata') - metadata_dict = fixture['metadata'] - metadata_elems = root.findall('{0}meta'.format(NS)) - self.assertEqual(len(metadata_elems), 1) - for i, metadata_elem in enumerate(metadata_elems): - (meta_key, meta_value) = metadata_dict.items()[i] - self.assertEqual(str(metadata_elem.get('key')), str(meta_key)) - self.assertEqual(metadata_elem.text.strip(), meta_value) - - def test_show(self): - serializer = common.MetaItemTemplate() - fixture = { - 'meta': { - 'one': 'two', - }, - } - output = serializer.serialize(fixture) - root = etree.XML(output) - meta_dict = fixture['meta'] - (meta_key, meta_value) = meta_dict.items()[0] - self.assertEqual(str(root.get('key')), str(meta_key)) - self.assertEqual(root.text.strip(), meta_value) - - def test_update_all(self): - serializer = common.MetadataTemplate() - fixture = { - 'metadata': { - 'key6': 'value6', - 'key4': 'value4', - }, - } - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'metadata') - metadata_dict = fixture['metadata'] - metadata_elems = root.findall('{0}meta'.format(NS)) - self.assertEqual(len(metadata_elems), 2) - for i, metadata_elem in enumerate(metadata_elems): - (meta_key, meta_value) = metadata_dict.items()[i] - self.assertEqual(str(metadata_elem.get('key')), str(meta_key)) - self.assertEqual(str(metadata_elem.text).strip(), str(meta_value)) - - def test_update_item(self): - serializer = common.MetaItemTemplate() - fixture = { - 'meta': { - 'one': 'two', - }, - } - output = serializer.serialize(fixture) - root = etree.XML(output) - meta_dict = fixture['meta'] - (meta_key, meta_value) = meta_dict.items()[0] - self.assertEqual(str(root.get('key')), str(meta_key)) - self.assertEqual(root.text.strip(), meta_value) - - def test_create(self): - serializer = common.MetadataTemplate() - fixture = { - 'metadata': { - 'key9': 'value9', - 'key2': 'value2', - 'key1': 'value1', - }, - } - output = serializer.serialize(fixture) - root = etree.XML(output) - xmlutil.validate_schema(root, 'metadata') - metadata_dict = fixture['metadata'] - metadata_elems = root.findall('{0}meta'.format(NS)) - self.assertEqual(len(metadata_elems), 3) - for i, metadata_elem in enumerate(metadata_elems): - (meta_key, meta_value) = metadata_dict.items()[i] - self.assertEqual(str(metadata_elem.get('key')), str(meta_key)) - self.assertEqual(str(metadata_elem.text).strip(), str(meta_value)) - actual = minidom.parseString(output.replace(" ", "")) - - expected = minidom.parseString(""" - - value2 - value9 - value1 - - """.replace(" ", "").replace("\n", "")) - - self.assertEqual(expected.toxml(), actual.toxml()) - - def test_metadata_deserializer(self): - """Should throw a 400 error on corrupt xml.""" - deserializer = common.MetadataXMLDeserializer() - self.assertRaises( - exception.MalformedRequestBody, - deserializer.deserialize, - utils.killer_xml_body()) - - class LinkPrefixTest(test.NoDBTestCase): def test_update_link_prefix(self): diff --git a/nova/tests/unit/api/openstack/test_faults.py b/nova/tests/unit/api/openstack/test_faults.py index 0c4adaa4fe..eefe9861ba 100644 --- a/nova/tests/unit/api/openstack/test_faults.py +++ b/nova/tests/unit/api/openstack/test_faults.py @@ -14,8 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -from xml.dom import minidom - import mock from oslo.serialization import jsonutils import webob @@ -23,10 +21,8 @@ import webob.dec import webob.exc import nova.api.openstack -from nova.api.openstack import common from nova.api.openstack import wsgi from nova import exception -from nova import i18n from nova.i18n import _ from nova import test @@ -150,170 +146,7 @@ class TestFaults(test.NoDBTestCase): self.assertEqual(response.content_type, "application/json") self.assertEqual(expected, actual) - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_raise(self): - # Ensure the ability to raise :class:`Fault` in WSGI-ified methods. - @webob.dec.wsgify - def raiser(req): - raise wsgi.Fault(webob.exc.HTTPNotFound(explanation='whut?')) - - req = webob.Request.blank('/.xml') - resp = req.get_response(raiser) - self.assertEqual(resp.content_type, "application/xml") - self.assertEqual(resp.status_int, 404) - self.assertIn('whut?', resp.body) - - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_raise_403(self): - # Ensure the ability to raise :class:`Fault` in WSGI-ified methods. - @webob.dec.wsgify - def raiser(req): - raise wsgi.Fault(webob.exc.HTTPForbidden(explanation='whut?')) - - req = webob.Request.blank('/.xml') - resp = req.get_response(raiser) - self.assertEqual(resp.content_type, "application/xml") - self.assertEqual(resp.status_int, 403) - self.assertNotIn('resizeNotAllowed', resp.body) - self.assertIn('forbidden', resp.body) - - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_raise_localize_explanation(self): - msgid = "String with params: %s" - params = ('blah', ) - lazy_gettext = i18n._ - expl = lazy_gettext(msgid) % params - - @webob.dec.wsgify - def raiser(req): - raise wsgi.Fault(webob.exc.HTTPNotFound(explanation=expl)) - - req = webob.Request.blank('/.xml') - resp = req.get_response(raiser) - self.assertEqual(resp.content_type, "application/xml") - self.assertEqual(resp.status_int, 404) - self.assertIn((msgid % params), resp.body) - def test_fault_has_status_int(self): # Ensure the status_int is set correctly on faults. fault = wsgi.Fault(webob.exc.HTTPBadRequest(explanation='what?')) - self.assertEqual(fault.status_int, 400) - - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_xml_serializer(self): - # Ensure that a v1.1 request responds with a v1.1 xmlns. - request = webob.Request.blank('/v1.1', - headers={"Accept": "application/xml"}) - - fault = wsgi.Fault(webob.exc.HTTPBadRequest(explanation='scram')) - response = request.get_response(fault) - - self.assertIn(common.XML_NS_V11, response.body) - self.assertEqual(response.content_type, "application/xml") - self.assertEqual(response.status_int, 400) - - -class FaultsXMLSerializationTestV11(test.NoDBTestCase): - """Tests covering `nova.api.openstack.faults:Fault` class.""" - - def _prepare_xml(self, xml_string): - xml_string = xml_string.replace(" ", "") - xml_string = xml_string.replace("\n", "") - xml_string = xml_string.replace("\t", "") - return xml_string - - def test_400_fault(self): - metadata = {'attributes': {"badRequest": 'code'}} - serializer = wsgi.XMLDictSerializer(metadata=metadata, - xmlns=common.XML_NS_V11) - - fixture = { - "badRequest": { - "message": "scram", - "code": 400, - }, - } - - output = serializer.serialize(fixture) - actual = minidom.parseString(self._prepare_xml(output)) - - expected = minidom.parseString(self._prepare_xml(""" - - scram - - """) % common.XML_NS_V11) - - self.assertEqual(expected.toxml(), actual.toxml()) - - def test_413_fault(self): - metadata = {'attributes': {"overLimit": 'code'}} - serializer = wsgi.XMLDictSerializer(metadata=metadata, - xmlns=common.XML_NS_V11) - - fixture = { - "overLimit": { - "message": "sorry", - "code": 413, - "retryAfter": 4, - }, - } - - output = serializer.serialize(fixture) - actual = minidom.parseString(self._prepare_xml(output)) - - expected = minidom.parseString(self._prepare_xml(""" - - sorry - 4 - - """) % common.XML_NS_V11) - - self.assertEqual(expected.toxml(), actual.toxml()) - - def test_429_fault(self): - metadata = {'attributes': {"overLimit": 'code'}} - serializer = wsgi.XMLDictSerializer(metadata=metadata, - xmlns=common.XML_NS_V11) - - fixture = { - "overLimit": { - "message": "sorry", - "code": 429, - "retryAfter": 4, - }, - } - - output = serializer.serialize(fixture) - actual = minidom.parseString(self._prepare_xml(output)) - - expected = minidom.parseString(self._prepare_xml(""" - - sorry - 4 - - """) % common.XML_NS_V11) - - self.assertEqual(expected.toxml(), actual.toxml()) - - def test_404_fault(self): - metadata = {'attributes': {"itemNotFound": 'code'}} - serializer = wsgi.XMLDictSerializer(metadata=metadata, - xmlns=common.XML_NS_V11) - - fixture = { - "itemNotFound": { - "message": "sorry", - "code": 404, - }, - } - - output = serializer.serialize(fixture) - actual = minidom.parseString(self._prepare_xml(output)) - - expected = minidom.parseString(self._prepare_xml(""" - - sorry - - """) % common.XML_NS_V11) - - self.assertEqual(expected.toxml(), actual.toxml()) + self.assertEqual(fault.status_int, 400) \ No newline at end of file diff --git a/nova/tests/unit/api/openstack/test_wsgi.py b/nova/tests/unit/api/openstack/test_wsgi.py index d3f837646c..097faa6d8f 100644 --- a/nova/tests/unit/api/openstack/test_wsgi.py +++ b/nova/tests/unit/api/openstack/test_wsgi.py @@ -44,51 +44,6 @@ class RequestTest(test.NoDBTestCase): result = request.get_content_type() self.assertEqual(result, "application/json") - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_content_type_from_accept(self): - for content_type in ('application/xml', - 'application/vnd.openstack.compute+xml', - 'application/json', - 'application/vnd.openstack.compute+json'): - request = wsgi.Request.blank('/tests/123') - request.headers["Accept"] = content_type - result = request.best_match_content_type() - self.assertEqual(result, content_type) - - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_content_type_from_accept_best(self): - request = wsgi.Request.blank('/tests/123') - request.headers["Accept"] = "application/xml, application/json" - result = request.best_match_content_type() - self.assertEqual(result, "application/json") - - request = wsgi.Request.blank('/tests/123') - request.headers["Accept"] = ("application/json; q=0.3, " - "application/xml; q=0.9") - result = request.best_match_content_type() - self.assertEqual(result, "application/xml") - - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_content_type_from_query_extension(self): - request = wsgi.Request.blank('/tests/123.xml') - result = request.best_match_content_type() - self.assertEqual(result, "application/xml") - - request = wsgi.Request.blank('/tests/123.json') - result = request.best_match_content_type() - self.assertEqual(result, "application/json") - - request = wsgi.Request.blank('/tests/123.invalid') - result = request.best_match_content_type() - self.assertEqual(result, "application/json") - - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_content_type_accept_and_query_extension(self): - request = wsgi.Request.blank('/tests/123.xml') - request.headers["Accept"] = "application/json" - result = request.best_match_content_type() - self.assertEqual(result, "application/xml") - def test_content_type_accept_default(self): request = wsgi.Request.blank('/tests/123.unsupported') request.headers["Accept"] = "application/unsupported1" @@ -252,24 +207,6 @@ class DictSerializerTest(test.NoDBTestCase): self.assertEqual(serializer.serialize({}, 'update'), '') -class XMLDictSerializerTest(test.NoDBTestCase): - def test_xml(self): - input_dict = dict(servers=dict(a=(2, 3))) - expected_xml = '(2,3)' - serializer = wsgi.XMLDictSerializer(xmlns="asdf") - result = serializer.serialize(input_dict) - result = result.replace('\n', '').replace(' ', '') - self.assertEqual(result, expected_xml) - - def test_xml_contains_unicode(self): - input_dict = dict(test=u'\u89e3\u7801') - expected_xml = '\xe8\xa7\xa3\xe7\xa0\x81' - serializer = wsgi.XMLDictSerializer() - result = serializer.serialize(input_dict) - result = result.replace('\n', '').replace(' ', '') - self.assertEqual(expected_xml, result) - - class JSONDictSerializerTest(test.NoDBTestCase): def test_json(self): input_dict = dict(servers=dict(a=(2, 3))) @@ -338,50 +275,6 @@ class JSONDeserializerTest(test.NoDBTestCase): deserializer.deserialize, data) -class XMLDeserializerTest(test.NoDBTestCase): - def test_xml(self): - xml = """ - - 123 - 1 - 1 - - """.strip() - as_dict = { - 'body': { - 'a': { - 'a1': '1', - 'a2': '2', - 'bs': ['1', '2', '3', {'c': {'c1': '1'}}], - 'd': {'e': '1'}, - 'f': '1', - }, - }, - } - metadata = {'plurals': {'bs': 'b', 'ts': 't'}} - deserializer = wsgi.XMLDeserializer(metadata=metadata) - self.assertEqual(deserializer.deserialize(xml), as_dict) - - def test_xml_empty(self): - xml = '' - as_dict = {"body": {"a": {}}} - deserializer = wsgi.XMLDeserializer() - self.assertEqual(deserializer.deserialize(xml), as_dict) - - def test_xml_valid_utf8(self): - xml = """ \xe6\xa6\x82\xe5\xbf\xb5 """ - deserializer = wsgi.XMLDeserializer() - as_dict = {'body': {u'a': {u'name': u'\u6982\u5ff5'}}} - self.assertEqual(deserializer.deserialize(xml), as_dict) - - def test_xml_invalid_utf8(self): - """Send invalid utf-8 to XMLDeserializer.""" - xml = """ \xf0\x28\x8c\x28 """ - deserializer = wsgi.XMLDeserializer() - self.assertRaises(exception.MalformedRequestBody, - deserializer.deserialize, xml) - - class ResourceTest(test.NoDBTestCase): def get_req_id_header_name(self, request): @@ -586,36 +479,6 @@ class ResourceTest(test.NoDBTestCase): '{"fooAction": true}') self.assertEqual(controller._action_foo, method) - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_get_method_action_xml(self): - class Controller(wsgi.Controller): - @wsgi.action('fooAction') - def _action_foo(self, req, id, body): - return body - - controller = Controller() - resource = wsgi.Resource(controller) - method, extensions = resource.get_method(None, 'action', - 'application/xml', - 'true') - self.assertEqual(controller._action_foo, method) - - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_get_method_action_corrupt_xml(self): - class Controller(wsgi.Controller): - @wsgi.action('fooAction') - def _action_foo(self, req, id, body): - return body - - controller = Controller() - resource = wsgi.Resource(controller) - self.assertRaises( - exception.MalformedRequestBody, - resource.get_method, - None, 'action', - 'application/xml', - utils.killer_xml_body()) - def test_get_method_action_bad_body(self): class Controller(wsgi.Controller): @wsgi.action('fooAction') @@ -791,12 +654,7 @@ class ResourceTest(test.NoDBTestCase): def deserialize(self, body): return 'json' - class XMLDeserializer(object): - def deserialize(self, body): - return 'xml' - class Controller(object): - @wsgi.deserializers(xml=XMLDeserializer) def index(self, req, pants=None): return pants @@ -806,27 +664,6 @@ class ResourceTest(test.NoDBTestCase): obj = resource.deserialize(controller.index, 'application/json', 'foo') self.assertEqual(obj, 'json') - @test.skipXmlTest("Nova v2 XML support is disabled") - def test_deserialize_decorator(self): - class JSONDeserializer(object): - def deserialize(self, body): - return 'json' - - class XMLDeserializer(object): - def deserialize(self, body): - return 'xml' - - class Controller(object): - @wsgi.deserializers(xml=XMLDeserializer) - def index(self, req, pants=None): - return pants - - controller = Controller() - resource = wsgi.Resource(controller, json=JSONDeserializer) - - obj = resource.deserialize(controller.index, 'application/xml', 'foo') - self.assertEqual(obj, 'xml') - def test_register_actions(self): class Controller(object): def index(self, req, pants=None): @@ -1271,17 +1108,12 @@ class ResponseObjectTest(test.NoDBTestCase): def serialize(self, obj): return 'json' - class XMLSerializer(object): - def serialize(self, obj): - return 'xml' - class AtomSerializer(object): def serialize(self, obj): return 'atom' robj = wsgi.ResponseObject({}, code=202, json=JSONSerializer, - xml=XMLSerializer, atom=AtomSerializer) robj['X-header1'] = 'header1' robj['X-header2'] = 'header2' diff --git a/nova/tests/unit/api/openstack/test_xmlutil.py b/nova/tests/unit/api/openstack/test_xmlutil.py deleted file mode 100644 index 19186889bb..0000000000 --- a/nova/tests/unit/api/openstack/test_xmlutil.py +++ /dev/null @@ -1,948 +0,0 @@ -# Copyright 2011 OpenStack Foundation -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from xml.dom import minidom - -from lxml import etree - -from nova.api.openstack import xmlutil -from nova import exception -from nova import test -from nova.tests.unit import utils as tests_utils - - -class SelectorTest(test.NoDBTestCase): - obj_for_test = { - 'test': { - 'name': 'test', - 'values': [1, 2, 3], - 'attrs': { - 'foo': 1, - 'bar': 2, - 'baz': 3, - }, - }, - } - - def test_repr(self): - sel = xmlutil.Selector() - self.assertEqual(repr(sel), "Selector()") - - def test_empty_selector(self): - sel = xmlutil.EmptyStringSelector() - self.assertEqual(len(sel.chain), 0) - self.assertEqual(sel(self.obj_for_test), self.obj_for_test) - self.assertEqual( - repr(self.obj_for_test), - "{'test': {'values': [1, 2, 3], 'name': 'test', 'attrs': " - "{'baz': 3, 'foo': 1, 'bar': 2}}}") - - def test_dict_selector(self): - sel = xmlutil.Selector('test') - self.assertEqual(len(sel.chain), 1) - self.assertEqual(sel.chain[0], 'test') - self.assertEqual(sel(self.obj_for_test), - self.obj_for_test['test']) - - def test_datum_selector(self): - sel = xmlutil.Selector('test', 'name') - self.assertEqual(len(sel.chain), 2) - self.assertEqual(sel.chain[0], 'test') - self.assertEqual(sel.chain[1], 'name') - self.assertEqual(sel(self.obj_for_test), 'test') - - def test_list_selector(self): - sel = xmlutil.Selector('test', 'values', 0) - self.assertEqual(len(sel.chain), 3) - self.assertEqual(sel.chain[0], 'test') - self.assertEqual(sel.chain[1], 'values') - self.assertEqual(sel.chain[2], 0) - self.assertEqual(sel(self.obj_for_test), 1) - - def test_items_selector(self): - sel = xmlutil.Selector('test', 'attrs', xmlutil.get_items) - self.assertEqual(len(sel.chain), 3) - self.assertEqual(sel.chain[2], xmlutil.get_items) - for key, val in sel(self.obj_for_test): - self.assertEqual(self.obj_for_test['test']['attrs'][key], val) - - def test_missing_key_selector(self): - sel = xmlutil.Selector('test2', 'attrs') - self.assertIsNone(sel(self.obj_for_test)) - self.assertRaises(KeyError, sel, self.obj_for_test, True) - - def test_constant_selector(self): - sel = xmlutil.ConstantSelector('Foobar') - self.assertEqual(sel.value, 'Foobar') - self.assertEqual(sel(self.obj_for_test), 'Foobar') - self.assertEqual(repr(sel), "'Foobar'") - - -class TemplateElementTest(test.NoDBTestCase): - def test_element_initial_attributes(self): - # Create a template element with some attributes - elem = xmlutil.TemplateElement('test', attrib=dict(a=1, b=2, c=3), - c=4, d=5, e=6) - - # Verify all the attributes are as expected - expected = dict(a=1, b=2, c=4, d=5, e=6) - for k, v in expected.items(): - self.assertEqual(elem.attrib[k].chain[0], v) - self.assertTrue(repr(elem)) - - def test_element_get_attributes(self): - expected = dict(a=1, b=2, c=3) - - # Create a template element with some attributes - elem = xmlutil.TemplateElement('test', attrib=expected) - - # Verify that get() retrieves the attributes - for k, v in expected.items(): - self.assertEqual(elem.get(k).chain[0], v) - - def test_element_set_attributes(self): - attrs = dict(a=None, b='foo', c=xmlutil.Selector('foo', 'bar')) - - # Create a bare template element with no attributes - elem = xmlutil.TemplateElement('test') - - # Set the attribute values - for k, v in attrs.items(): - elem.set(k, v) - - # Now verify what got set - self.assertEqual(len(elem.attrib['a'].chain), 1) - self.assertEqual(elem.attrib['a'].chain[0], 'a') - self.assertEqual(len(elem.attrib['b'].chain), 1) - self.assertEqual(elem.attrib['b'].chain[0], 'foo') - self.assertEqual(elem.attrib['c'], attrs['c']) - - def test_element_attribute_keys(self): - attrs = dict(a=1, b=2, c=3, d=4) - expected = set(attrs.keys()) - - # Create a template element with some attributes - elem = xmlutil.TemplateElement('test', attrib=attrs) - - # Now verify keys - self.assertEqual(set(elem.keys()), expected) - - def test_element_attribute_items(self): - expected = dict(a=xmlutil.Selector(1), - b=xmlutil.Selector(2), - c=xmlutil.Selector(3)) - keys = set(expected.keys()) - - # Create a template element with some attributes - elem = xmlutil.TemplateElement('test', attrib=expected) - - # Now verify items - for k, v in elem.items(): - self.assertEqual(expected[k], v) - keys.remove(k) - - # Did we visit all keys? - self.assertEqual(len(keys), 0) - - def test_element_selector_none(self): - # Create a template element with no selector - elem = xmlutil.TemplateElement('test') - - self.assertEqual(len(elem.selector.chain), 0) - - def test_element_selector_string(self): - # Create a template element with a string selector - elem = xmlutil.TemplateElement('test', selector='test') - - self.assertEqual(len(elem.selector.chain), 1) - self.assertEqual(elem.selector.chain[0], 'test') - - def test_element_selector(self): - sel = xmlutil.Selector('a', 'b') - - # Create a template element with an explicit selector - elem = xmlutil.TemplateElement('test', selector=sel) - - self.assertEqual(elem.selector, sel) - - def test_element_subselector_none(self): - # Create a template element with no subselector - elem = xmlutil.TemplateElement('test') - - self.assertIsNone(elem.subselector) - - def test_element_subselector_string(self): - # Create a template element with a string subselector - elem = xmlutil.TemplateElement('test', subselector='test') - - self.assertEqual(len(elem.subselector.chain), 1) - self.assertEqual(elem.subselector.chain[0], 'test') - - def test_element_subselector(self): - sel = xmlutil.Selector('a', 'b') - - # Create a template element with an explicit subselector - elem = xmlutil.TemplateElement('test', subselector=sel) - - self.assertEqual(elem.subselector, sel) - - def test_element_append_child(self): - # Create an element - elem = xmlutil.TemplateElement('test') - - # Make sure the element starts off empty - self.assertEqual(len(elem), 0) - - # Create a child element - child = xmlutil.TemplateElement('child') - - # Append the child to the parent - elem.append(child) - - # Verify that the child was added - self.assertEqual(len(elem), 1) - self.assertEqual(elem[0], child) - self.assertIn('child', elem) - self.assertEqual(elem['child'], child) - - # Ensure that multiple children of the same name are rejected - child2 = xmlutil.TemplateElement('child') - self.assertRaises(KeyError, elem.append, child2) - - def test_element_extend_children(self): - # Create an element - elem = xmlutil.TemplateElement('test') - - # Make sure the element starts off empty - self.assertEqual(len(elem), 0) - - # Create a few children - children = [ - xmlutil.TemplateElement('child1'), - xmlutil.TemplateElement('child2'), - xmlutil.TemplateElement('child3'), - ] - - # Extend the parent by those children - elem.extend(children) - - # Verify that the children were added - self.assertEqual(len(elem), 3) - for idx in range(len(elem)): - self.assertEqual(children[idx], elem[idx]) - self.assertIn(children[idx].tag, elem) - self.assertEqual(elem[children[idx].tag], children[idx]) - - # Ensure that multiple children of the same name are rejected - children2 = [ - xmlutil.TemplateElement('child4'), - xmlutil.TemplateElement('child1'), - ] - self.assertRaises(KeyError, elem.extend, children2) - - # Also ensure that child4 was not added - self.assertEqual(len(elem), 3) - self.assertEqual(elem[-1].tag, 'child3') - - def test_element_insert_child(self): - # Create an element - elem = xmlutil.TemplateElement('test') - - # Make sure the element starts off empty - self.assertEqual(len(elem), 0) - - # Create a few children - children = [ - xmlutil.TemplateElement('child1'), - xmlutil.TemplateElement('child2'), - xmlutil.TemplateElement('child3'), - ] - - # Extend the parent by those children - elem.extend(children) - - # Create a child to insert - child = xmlutil.TemplateElement('child4') - - # Insert it - elem.insert(1, child) - - # Ensure the child was inserted in the right place - self.assertEqual(len(elem), 4) - children.insert(1, child) - for idx in range(len(elem)): - self.assertEqual(children[idx], elem[idx]) - self.assertIn(children[idx].tag, elem) - self.assertEqual(elem[children[idx].tag], children[idx]) - - # Ensure that multiple children of the same name are rejected - child2 = xmlutil.TemplateElement('child2') - self.assertRaises(KeyError, elem.insert, 2, child2) - - def test_element_remove_child(self): - # Create an element - elem = xmlutil.TemplateElement('test') - - # Make sure the element starts off empty - self.assertEqual(len(elem), 0) - - # Create a few children - children = [ - xmlutil.TemplateElement('child1'), - xmlutil.TemplateElement('child2'), - xmlutil.TemplateElement('child3'), - ] - - # Extend the parent by those children - elem.extend(children) - - # Create a test child to remove - child = xmlutil.TemplateElement('child2') - - # Try to remove it - self.assertRaises(ValueError, elem.remove, child) - - # Ensure that no child was removed - self.assertEqual(len(elem), 3) - - # Now remove a legitimate child - elem.remove(children[1]) - - # Ensure that the child was removed - self.assertEqual(len(elem), 2) - self.assertEqual(elem[0], children[0]) - self.assertEqual(elem[1], children[2]) - self.assertEqual('child2' in elem, False) - - # Ensure the child cannot be retrieved by name - def get_key(elem, key): - return elem[key] - self.assertRaises(KeyError, get_key, elem, 'child2') - - def test_element_text(self): - # Create an element - elem = xmlutil.TemplateElement('test') - - # Ensure that it has no text - self.assertIsNone(elem.text) - - # Try setting it to a string and ensure it becomes a selector - elem.text = 'test' - self.assertEqual(hasattr(elem.text, 'chain'), True) - self.assertEqual(len(elem.text.chain), 1) - self.assertEqual(elem.text.chain[0], 'test') - - # Try resetting the text to None - elem.text = None - self.assertIsNone(elem.text) - - # Now make up a selector and try setting the text to that - sel = xmlutil.Selector() - elem.text = sel - self.assertEqual(elem.text, sel) - - # Finally, try deleting the text and see what happens - del elem.text - self.assertIsNone(elem.text) - - def test_apply_attrs(self): - # Create a template element - attrs = dict(attr1=xmlutil.ConstantSelector(1), - attr2=xmlutil.ConstantSelector(2)) - tmpl_elem = xmlutil.TemplateElement('test', attrib=attrs) - - # Create an etree element - elem = etree.Element('test') - - # Apply the template to the element - tmpl_elem.apply(elem, None) - - # Now, verify the correct attributes were set - for k, v in elem.items(): - self.assertEqual(str(attrs[k].value), v) - - def test_apply_text(self): - # Create a template element - tmpl_elem = xmlutil.TemplateElement('test') - tmpl_elem.text = xmlutil.ConstantSelector(1) - - # Create an etree element - elem = etree.Element('test') - - # Apply the template to the element - tmpl_elem.apply(elem, None) - - # Now, verify the text was set - self.assertEqual(str(tmpl_elem.text.value), elem.text) - - def test__render(self): - attrs = dict(attr1=xmlutil.ConstantSelector(1), - attr2=xmlutil.ConstantSelector(2), - attr3=xmlutil.ConstantSelector(3)) - - # Create a master template element - master_elem = xmlutil.TemplateElement('test', attr1=attrs['attr1']) - - # Create a couple of slave template element - slave_elems = [ - xmlutil.TemplateElement('test', attr2=attrs['attr2']), - xmlutil.TemplateElement('test', attr3=attrs['attr3']), - ] - - # Try the render - elem = master_elem._render(None, None, slave_elems, None) - - # Verify the particulars of the render - self.assertEqual(elem.tag, 'test') - self.assertEqual(len(elem.nsmap), 0) - for k, v in elem.items(): - self.assertEqual(str(attrs[k].value), v) - - # Create a parent for the element to be rendered - parent = etree.Element('parent') - - # Try the render again... - elem = master_elem._render(parent, None, slave_elems, dict(a='foo')) - - # Verify the particulars of the render - self.assertEqual(len(parent), 1) - self.assertEqual(parent[0], elem) - self.assertEqual(len(elem.nsmap), 1) - self.assertEqual(elem.nsmap['a'], 'foo') - - def test_render(self): - # Create a template element - tmpl_elem = xmlutil.TemplateElement('test') - tmpl_elem.text = xmlutil.Selector() - - # Create the object we're going to render - obj = ['elem1', 'elem2', 'elem3', 'elem4'] - - # Try a render with no object - elems = tmpl_elem.render(None, None) - self.assertEqual(len(elems), 0) - - # Try a render with one object - elems = tmpl_elem.render(None, 'foo') - self.assertEqual(len(elems), 1) - self.assertEqual(elems[0][0].text, 'foo') - self.assertEqual(elems[0][1], 'foo') - - # Now, try rendering an object with multiple entries - parent = etree.Element('parent') - elems = tmpl_elem.render(parent, obj) - self.assertEqual(len(elems), 4) - - # Check the results - for idx in range(len(obj)): - self.assertEqual(elems[idx][0].text, obj[idx]) - self.assertEqual(elems[idx][1], obj[idx]) - - # Check with a subselector - tmpl_elem = xmlutil.TemplateElement( - 'test', - subselector=xmlutil.ConstantSelector('foo')) - parent = etree.Element('parent') - - # Try a render with no object - elems = tmpl_elem.render(parent, obj) - self.assertEqual(len(elems), 4) - - def test_subelement(self): - # Try the SubTemplateElement constructor - parent = xmlutil.SubTemplateElement(None, 'parent') - self.assertEqual(parent.tag, 'parent') - self.assertEqual(len(parent), 0) - - # Now try it with a parent element - child = xmlutil.SubTemplateElement(parent, 'child') - self.assertEqual(child.tag, 'child') - self.assertEqual(len(parent), 1) - self.assertEqual(parent[0], child) - - def test_wrap(self): - # These are strange methods, but they make things easier - elem = xmlutil.TemplateElement('test') - self.assertEqual(elem.unwrap(), elem) - self.assertEqual(elem.wrap().root, elem) - - def test_dyntag(self): - obj = ['a', 'b', 'c'] - - # Create a template element with a dynamic tag - tmpl_elem = xmlutil.TemplateElement(xmlutil.Selector()) - - # Try the render - parent = etree.Element('parent') - elems = tmpl_elem.render(parent, obj) - - # Verify the particulars of the render - self.assertEqual(len(elems), len(obj)) - for idx in range(len(obj)): - self.assertEqual(elems[idx][0].tag, obj[idx]) - - def test_tree(self): - # Create a template element - elem = xmlutil.TemplateElement('test', attr3='attr3') - elem.text = 'test' - self.assertEqual(elem.tree(), - "") - - # Create a template element - elem = xmlutil.TemplateElement('test2') - - # Create a child element - child = xmlutil.TemplateElement('child') - - # Append the child to the parent - elem.append(child) - - self.assertEqual(elem.tree(), - "" - "") - - -class TemplateTest(test.NoDBTestCase): - def test_tree(self): - elem = xmlutil.TemplateElement('test') - tmpl = xmlutil.Template(elem) - self.assertTrue(tmpl.tree()) - - def test_wrap(self): - # These are strange methods, but they make things easier - elem = xmlutil.TemplateElement('test') - tmpl = xmlutil.Template(elem) - self.assertEqual(tmpl.unwrap(), elem) - self.assertEqual(tmpl.wrap(), tmpl) - - def test__siblings(self): - # Set up a basic template - elem = xmlutil.TemplateElement('test') - tmpl = xmlutil.Template(elem) - - # Check that we get the right siblings - siblings = tmpl._siblings() - self.assertEqual(len(siblings), 1) - self.assertEqual(siblings[0], elem) - - def test__nsmap(self): - # Set up a basic template - elem = xmlutil.TemplateElement('test') - tmpl = xmlutil.Template(elem, nsmap=dict(a="foo")) - - # Check out that we get the right namespace dictionary - nsmap = tmpl._nsmap() - self.assertNotEqual(id(nsmap), id(tmpl.nsmap)) - self.assertEqual(len(nsmap), 1) - self.assertEqual(nsmap['a'], 'foo') - - def test_master_attach(self): - # Set up a master template - elem = xmlutil.TemplateElement('test') - tmpl = xmlutil.MasterTemplate(elem, 1) - - # Make sure it has a root but no slaves - self.assertEqual(tmpl.root, elem) - self.assertEqual(len(tmpl.slaves), 0) - self.assertTrue(repr(tmpl)) - - # Try to attach an invalid slave - bad_elem = xmlutil.TemplateElement('test2') - self.assertRaises(ValueError, tmpl.attach, bad_elem) - self.assertEqual(len(tmpl.slaves), 0) - - # Try to attach an invalid and a valid slave - good_elem = xmlutil.TemplateElement('test') - self.assertRaises(ValueError, tmpl.attach, good_elem, bad_elem) - self.assertEqual(len(tmpl.slaves), 0) - - # Try to attach an inapplicable template - class InapplicableTemplate(xmlutil.Template): - def apply(self, master): - return False - inapp_tmpl = InapplicableTemplate(good_elem) - tmpl.attach(inapp_tmpl) - self.assertEqual(len(tmpl.slaves), 0) - - # Now try attaching an applicable template - tmpl.attach(good_elem) - self.assertEqual(len(tmpl.slaves), 1) - self.assertEqual(tmpl.slaves[0].root, good_elem) - - def test_master_copy(self): - # Construct a master template - elem = xmlutil.TemplateElement('test') - tmpl = xmlutil.MasterTemplate(elem, 1, nsmap=dict(a='foo')) - - # Give it a slave - slave = xmlutil.TemplateElement('test') - tmpl.attach(slave) - - # Construct a copy - copy = tmpl.copy() - - # Check to see if we actually managed a copy - self.assertNotEqual(tmpl, copy) - self.assertEqual(tmpl.root, copy.root) - self.assertEqual(tmpl.version, copy.version) - self.assertEqual(id(tmpl.nsmap), id(copy.nsmap)) - self.assertNotEqual(id(tmpl.slaves), id(copy.slaves)) - self.assertEqual(len(tmpl.slaves), len(copy.slaves)) - self.assertEqual(tmpl.slaves[0], copy.slaves[0]) - - def test_slave_apply(self): - # Construct a master template - elem = xmlutil.TemplateElement('test') - master = xmlutil.MasterTemplate(elem, 3) - - # Construct a slave template with applicable minimum version - slave = xmlutil.SlaveTemplate(elem, 2) - self.assertEqual(slave.apply(master), True) - self.assertTrue(repr(slave)) - - # Construct a slave template with equal minimum version - slave = xmlutil.SlaveTemplate(elem, 3) - self.assertEqual(slave.apply(master), True) - - # Construct a slave template with inapplicable minimum version - slave = xmlutil.SlaveTemplate(elem, 4) - self.assertEqual(slave.apply(master), False) - - # Construct a slave template with applicable version range - slave = xmlutil.SlaveTemplate(elem, 2, 4) - self.assertEqual(slave.apply(master), True) - - # Construct a slave template with low version range - slave = xmlutil.SlaveTemplate(elem, 1, 2) - self.assertEqual(slave.apply(master), False) - - # Construct a slave template with high version range - slave = xmlutil.SlaveTemplate(elem, 4, 5) - self.assertEqual(slave.apply(master), False) - - # Construct a slave template with matching version range - slave = xmlutil.SlaveTemplate(elem, 3, 3) - self.assertEqual(slave.apply(master), True) - - def test__serialize(self): - # Our test object to serialize - obj = { - 'test': { - 'name': 'foobar', - 'values': [1, 2, 3, 4], - 'attrs': { - 'a': 1, - 'b': 2, - 'c': 3, - 'd': 4, - }, - 'image': { - 'name': 'image_foobar', - 'id': 42, - }, - }, - } - - # Set up our master template - root = xmlutil.TemplateElement('test', selector='test', - name='name') - value = xmlutil.SubTemplateElement(root, 'value', selector='values') - value.text = xmlutil.Selector() - attrs = xmlutil.SubTemplateElement(root, 'attrs', selector='attrs') - xmlutil.SubTemplateElement(attrs, 'attr', selector=xmlutil.get_items, - key=0, value=1) - master = xmlutil.MasterTemplate(root, 1, nsmap=dict(f='foo')) - - # Set up our slave template - root_slave = xmlutil.TemplateElement('test', selector='test') - image = xmlutil.SubTemplateElement(root_slave, 'image', - selector='image', id='id') - image.text = xmlutil.Selector('name') - slave = xmlutil.SlaveTemplate(root_slave, 1, nsmap=dict(b='bar')) - - # Attach the slave to the master... - master.attach(slave) - - # Try serializing our object - siblings = master._siblings() - nsmap = master._nsmap() - result = master._serialize(None, obj, siblings, nsmap) - - # Now we get to manually walk the element tree... - self.assertEqual(result.tag, 'test') - self.assertEqual(len(result.nsmap), 2) - self.assertEqual(result.nsmap['f'], 'foo') - self.assertEqual(result.nsmap['b'], 'bar') - self.assertEqual(result.get('name'), obj['test']['name']) - for idx, val in enumerate(obj['test']['values']): - self.assertEqual(result[idx].tag, 'value') - self.assertEqual(result[idx].text, str(val)) - idx += 1 - self.assertEqual(result[idx].tag, 'attrs') - for attr in result[idx]: - self.assertEqual(attr.tag, 'attr') - self.assertEqual(attr.get('value'), - str(obj['test']['attrs'][attr.get('key')])) - idx += 1 - self.assertEqual(result[idx].tag, 'image') - self.assertEqual(result[idx].get('id'), - str(obj['test']['image']['id'])) - self.assertEqual(result[idx].text, obj['test']['image']['name']) - - templ = xmlutil.Template(None) - self.assertEqual(templ.serialize(None), '') - - def test_serialize_with_colon_tagname_support(self): - # Our test object to serialize - obj = {'extra_specs': {'foo:bar': '999'}} - expected_xml = (("\n" - '999' - '')) - # Set up our master template - root = xmlutil.TemplateElement('extra_specs', selector='extra_specs', - colon_ns=True) - value = xmlutil.SubTemplateElement(root, 'foo:bar', selector='foo:bar', - colon_ns=True) - value.text = xmlutil.Selector() - master = xmlutil.MasterTemplate(root, 1) - result = master.serialize(obj) - self.assertEqual(expected_xml, result) - - def test__serialize_with_empty_datum_selector(self): - # Our test object to serialize - obj = { - 'test': { - 'name': 'foobar', - 'image': '' - }, - } - - root = xmlutil.TemplateElement('test', selector='test', - name='name') - master = xmlutil.MasterTemplate(root, 1) - root_slave = xmlutil.TemplateElement('test', selector='test') - image = xmlutil.SubTemplateElement(root_slave, 'image', - selector='image') - image.set('id') - xmlutil.make_links(image, 'links') - slave = xmlutil.SlaveTemplate(root_slave, 1) - master.attach(slave) - - siblings = master._siblings() - result = master._serialize(None, obj, siblings) - self.assertEqual(result.tag, 'test') - self.assertEqual(result[0].tag, 'image') - self.assertEqual(result[0].get('id'), str(obj['test']['image'])) - - -class MasterTemplateBuilder(xmlutil.TemplateBuilder): - def construct(self): - elem = xmlutil.TemplateElement('test') - return xmlutil.MasterTemplate(elem, 1) - - -class SlaveTemplateBuilder(xmlutil.TemplateBuilder): - def construct(self): - elem = xmlutil.TemplateElement('test') - return xmlutil.SlaveTemplate(elem, 1) - - -class TemplateBuilderTest(test.NoDBTestCase): - def test_master_template_builder(self): - # Make sure the template hasn't been built yet - self.assertIsNone(MasterTemplateBuilder._tmpl) - - # Now, construct the template - tmpl1 = MasterTemplateBuilder() - - # Make sure that there is a template cached... - self.assertIsNotNone(MasterTemplateBuilder._tmpl) - - # Make sure it wasn't what was returned... - self.assertNotEqual(MasterTemplateBuilder._tmpl, tmpl1) - - # Make sure it doesn't get rebuilt - cached = MasterTemplateBuilder._tmpl - tmpl2 = MasterTemplateBuilder() - self.assertEqual(MasterTemplateBuilder._tmpl, cached) - - # Make sure we're always getting fresh copies - self.assertNotEqual(tmpl1, tmpl2) - - # Make sure we can override the copying behavior - tmpl3 = MasterTemplateBuilder(False) - self.assertEqual(MasterTemplateBuilder._tmpl, tmpl3) - - def test_slave_template_builder(self): - # Make sure the template hasn't been built yet - self.assertIsNone(SlaveTemplateBuilder._tmpl) - - # Now, construct the template - tmpl1 = SlaveTemplateBuilder() - - # Make sure there is a template cached... - self.assertIsNotNone(SlaveTemplateBuilder._tmpl) - - # Make sure it was what was returned... - self.assertEqual(SlaveTemplateBuilder._tmpl, tmpl1) - - # Make sure it doesn't get rebuilt - tmpl2 = SlaveTemplateBuilder() - self.assertEqual(SlaveTemplateBuilder._tmpl, tmpl1) - - # Make sure we're always getting the cached copy - self.assertEqual(tmpl1, tmpl2) - - -class MiscellaneousXMLUtilTests(test.NoDBTestCase): - def test_validate_schema(self): - xml = ''' - -value6value4 - -''' - xmlutil.validate_schema(xml, 'metadata') - # No way to test the return value of validate_schema. - # It just raises an exception when something is wrong. - self.assertTrue(True) - - def test_make_links(self): - elem = xmlutil.TemplateElement('image', selector='image') - self.assertTrue(repr(xmlutil.make_links(elem, 'links'))) - - def test_make_flat_dict(self): - expected_xml = ("\n" - 'foobar') - root = xmlutil.make_flat_dict('wrapper') - tmpl = xmlutil.MasterTemplate(root, 1) - result = tmpl.serialize(dict(wrapper=dict(a='foo', b='bar'))) - self.assertEqual(result, expected_xml) - - expected_xml = ("\n" -'foobar' -"") - root = xmlutil.make_flat_dict('wrapper', ns='ns') - tmpl = xmlutil.MasterTemplate(root, 1) - result = tmpl.serialize(dict(wrapper=dict(a='foo', b='bar'))) - self.assertEqual(result, expected_xml) - - def test_make_flat_dict_with_colon_tagname_support(self): - # Our test object to serialize - obj = {'extra_specs': {'foo:bar': '999'}} - expected_xml = (("\n" - '999' - '')) - # Set up our master template - root = xmlutil.make_flat_dict('extra_specs', colon_ns=True) - master = xmlutil.MasterTemplate(root, 1) - result = master.serialize(obj) - self.assertEqual(expected_xml, result) - - def test_make_flat_dict_with_parent(self): - # Our test object to serialize - obj = {"device": {"id": 1, - "extra_info": {"key1": "value1", - "key2": "value2"}}} - - expected_xml = (("\n" - 'value2' - 'value1')) - - root = xmlutil.TemplateElement('device', selector='device') - root.set('id') - extra = xmlutil.make_flat_dict('extra_info', root=root) - root.append(extra) - master = xmlutil.MasterTemplate(root, 1) - result = master.serialize(obj) - self.assertEqual(expected_xml, result) - - def test_make_flat_dict_with_dicts(self): - # Our test object to serialize - obj = {"device": {"id": 1, - "extra_info": {"key1": "value1", - "key2": "value2"}}} - - expected_xml = (("\n" - '1value2' - 'value1')) - - root = xmlutil.make_flat_dict('device', selector='device', - ignore_sub_dicts=True) - extra = xmlutil.make_flat_dict('extra_info', selector='extra_info') - root.append(extra) - master = xmlutil.MasterTemplate(root, 1) - result = master.serialize(obj) - self.assertEqual(expected_xml, result) - - def test_safe_parse_xml(self): - - normal_body = ('' - 'heythere') - - dom = xmlutil.safe_minidom_parse_string(normal_body) - # Some versions of minidom inject extra newlines so we ignore them - result = str(dom.toxml()).replace('\n', '') - self.assertEqual(normal_body, result) - - self.assertRaises(exception.MalformedRequestBody, - xmlutil.safe_minidom_parse_string, - tests_utils.killer_xml_body()) - - -class SafeParserTestCase(test.NoDBTestCase): - def test_external_dtd(self): - xml_string = (""" - - - - html with dtd - """) - - parser = xmlutil.ProtectedExpatParser(forbid_dtd=False, - forbid_entities=True) - self.assertRaises(ValueError, - minidom.parseString, - xml_string, parser) - - def test_external_file(self): - xml_string = """ - ]> - ⅇ""" - - parser = xmlutil.ProtectedExpatParser(forbid_dtd=False, - forbid_entities=True) - self.assertRaises(ValueError, - minidom.parseString, - xml_string, parser) - - def test_notation(self): - xml_string = """ - - - ]> - - """ - - parser = xmlutil.ProtectedExpatParser(forbid_dtd=False, - forbid_entities=True) - self.assertRaises(ValueError, - minidom.parseString, - xml_string, parser)