diff --git a/doc/api_samples/os-certificates/certificate-create-resp.json b/doc/api_samples/os-certificates/certificate-create-resp.json deleted file mode 100644 index dfcb579f56f0..000000000000 --- a/doc/api_samples/os-certificates/certificate-create-resp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "certificate": { - "data": "Certificate:\n Data:\n Version: 1 (0x0)\n Serial Number: 23 (0x17)\n Signature Algorithm: md5WithRSAEncryption\n Issuer: O=NOVA ROOT, L=Mountain View, ST=California, C=US\n Validity\n Not Before: Oct 2 19:31:45 2012 GMT\n Not After : Oct 2 19:31:45 2013 GMT\n Subject: C=US, ST=California, O=OpenStack, OU=NovaDev, CN=openstack-fake-2012-10-02T19:31:45Z\n Subject Public Key Info:\n Public Key Algorithm: rsaEncryption\n RSA Public Key: (1024 bit)\n Modulus (1024 bit):\n 00:b8:87:67:7a:de:28:ed:f6:5d:1f:20:14:58:df:\n b0:f7:62:3d:85:61:a8:c2:31:49:5f:b5:2a:07:34:\n 0e:25:13:0d:2e:4d:79:c7:26:36:dd:d2:3e:c7:36:\n 54:80:0d:67:80:32:e6:a8:48:33:69:ec:22:2c:5c:\n cb:7a:88:0f:c0:48:de:67:14:54:d9:94:b4:6a:23:\n 36:28:23:44:47:8a:24:89:8e:f4:86:77:59:f8:62:\n b6:ab:d5:e0:bc:b4:ad:d1:95:dd:59:a3:aa:e3:ea:\n d3:ae:23:17:c5:54:96:a3:25:56:72:90:20:07:8c:\n 63:4d:be:e9:60:7e:10:57:17\n Exponent: 65537 (0x10001)\n Signature Algorithm: md5WithRSAEncryption\n 32:82:ff:8b:92:0e:8d:9c:6b:ce:7e:fe:34:16:2a:4c:47:4f:\n c7:28:a2:33:1e:48:56:2e:4b:e8:e8:e3:48:b1:3d:a3:43:21:\n ef:83:e7:df:e2:10:91:7e:9a:c0:4d:1e:96:68:2b:b9:f7:84:\n 7f:ec:84:8a:bf:bc:5e:50:05:d9:ce:4a:1a:bf:d2:bf:0c:d1:\n 7e:ec:64:c3:a5:37:78:a3:a6:2b:a1:b7:1c:cc:c8:b9:78:61:\n 98:50:3c:e6:28:34:f1:0e:62:bb:b5:d7:a1:dd:1f:38:c6:0d:\n 58:9f:81:67:ff:9c:32:fc:52:7e:6d:8c:91:43:49:fe:e3:48:\n bb:40\n-----BEGIN CERTIFICATE-----\nMIICMzCCAZwCARcwDQYJKoZIhvcNAQEEBQAwTjESMBAGA1UEChMJTk9WQSBST09U\nMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRMwEQYDVQQIEwpDYWxpZm9ybmlhMQsw\nCQYDVQQGEwJVUzAeFw0xMjEwMDIxOTMxNDVaFw0xMzEwMDIxOTMxNDVaMHYxCzAJ\nBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRIwEAYDVQQKEwlPcGVuU3Rh\nY2sxEDAOBgNVBAsTB05vdmFEZXYxLDAqBgNVBAMTI29wZW5zdGFjay1mYWtlLTIw\nMTItMTAtMDJUMTk6MzE6NDVaMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4\nh2d63ijt9l0fIBRY37D3Yj2FYajCMUlftSoHNA4lEw0uTXnHJjbd0j7HNlSADWeA\nMuaoSDNp7CIsXMt6iA/ASN5nFFTZlLRqIzYoI0RHiiSJjvSGd1n4Yrar1eC8tK3R\nld1Zo6rj6tOuIxfFVJajJVZykCAHjGNNvulgfhBXFwIDAQABMA0GCSqGSIb3DQEB\nBAUAA4GBADKC/4uSDo2ca85+/jQWKkxHT8coojMeSFYuS+jo40ixPaNDIe+D59/i\nEJF+msBNHpZoK7n3hH/shIq/vF5QBdnOShq/0r8M0X7sZMOlN3ijpiuhtxzMyLl4\nYZhQPOYoNPEOYru116HdHzjGDVifgWf/nDL8Un5tjJFDSf7jSLtA\n-----END CERTIFICATE-----\n", - "private_key": "-----BEGIN RSA PRIVATE KEY-----\nMIICXAIBAAKBgQC4h2d63ijt9l0fIBRY37D3Yj2FYajCMUlftSoHNA4lEw0uTXnH\nJjbd0j7HNlSADWeAMuaoSDNp7CIsXMt6iA/ASN5nFFTZlLRqIzYoI0RHiiSJjvSG\nd1n4Yrar1eC8tK3Rld1Zo6rj6tOuIxfFVJajJVZykCAHjGNNvulgfhBXFwIDAQAB\nAoGBAIjfxx4YU/vO1lwUC4OwyS92q3OYcPk6XdakJryZHDTb4NcLmNzjt6bqIK7b\n2enyB2fMWdNRWvGiueZ2HmiRLDyOGsAVdEsHvL4qbr9EZGTqC8Qxx+zTevWWf6pB\nF1zxzbXNQDFZDf9kVsSLCkbMHITnW1k4MrM++9gfCO3WrfehAkEA4nd8TyCCZazq\nKMOQwFLTNaiVLeTXCtvGopl4ZNiKYZ1qI3KDXb2wbAyArFuERlotxFlylXpwtlMo\nSlI/C/sYqwJBANCX1sdfRJq8DpdP44ThWqOkWFLB9rBiwyyBt8746fX8amwr8eyz\nH44/z5GT/Vyp8qFsjkuDzeP93eeDnr2qE0UCP1zipRnPO6x4P5J4o+Y+EmLvwkAQ\nnCLYAaCvUbILHrbq2Z2wWjEYnEO03RHUd2xjkGH4TgcBMTmW4e+ZzEIduwJACnIw\nLVfWBbG5QVac3EC021EVoz9XbUnk4Eu2usS4Yrs7USN6QBJQWD1V1cKFg6h3ICJh\nleKJ4wsJm9h5kKH9yQJBAN8CaX223MlTSuBOVuIOwNA+09iLfx4UCLiH1fGMKDpe\nxVcmkM3qCnTqNxrAPSFdT9IyB3IXiaLWbvzl7MfiOwQ=\n-----END RSA PRIVATE KEY-----\n" - } -} \ No newline at end of file diff --git a/doc/api_samples/os-certificates/certificate-get-root-resp.json b/doc/api_samples/os-certificates/certificate-get-root-resp.json deleted file mode 100644 index d05db8b126cd..000000000000 --- a/doc/api_samples/os-certificates/certificate-get-root-resp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "certificate": { - "data": "-----BEGIN CERTIFICATE-----\nMIICyzCCAjSgAwIBAgIJAIJ/UoFWKoOUMA0GCSqGSIb3DQEBBAUAME4xEjAQBgNV\nBAoTCU5PVkEgUk9PVDEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzETMBEGA1UECBMK\nQ2FsaWZvcm5pYTELMAkGA1UEBhMCVVMwHhcNMTIxMDAyMTg1NzQ1WhcNMTMxMDAy\nMTg1NzQ1WjBOMRIwEAYDVQQKEwlOT1ZBIFJPT1QxFjAUBgNVBAcTDU1vdW50YWlu\nIFZpZXcxEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVTMIGfMA0GCSqG\nSIb3DQEBAQUAA4GNADCBiQKBgQCg0Bn8WSqbJF3QNTZUxo1TzmFBxuqvhjZLKbnQ\nIiShdVIWUK7RC8frq8FJI7dgJNmvkIBn9njABWDoZmurQRCzD65yCSbUc4R2ea5H\nIK4wQIui0CJykvMBNjAe3bzztVVs8/ccDTsjtqq3F/KeQkKzQVfSWBrJSmYtG5tO\nG+dOSwIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFCljRfaNOsA/\n9mHuq0io7Lt83FtaMH4GA1UdIwR3MHWAFCljRfaNOsA/9mHuq0io7Lt83FtaoVKk\nUDBOMRIwEAYDVQQKEwlOT1ZBIFJPT1QxFjAUBgNVBAcTDU1vdW50YWluIFZpZXcx\nEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVTggkAgn9SgVYqg5QwDQYJ\nKoZIhvcNAQEEBQADgYEAEbpJOOlpKCh5omwfAwAfFg1ml4h/FJiCH3PETmOCc+3l\nCtWTBd4MG8AoH7A3PU2JKAGVQ5XWo6+ihpW1RgfQpCnloI6vIeGcws+rSLnlzULt\nIvfCJpRg7iQdR3jZGt3295behtP1GsCqipJEulOkOaEIs8iLlXgSOG94Mkwlb4Q=\n-----END CERTIFICATE-----\n", - "private_key": null - } -} \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-certificates/certificate-create-req.json.tpl b/nova/tests/functional/api_samples/os-certificates/certificate-create-req.json.tpl deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/nova/tests/functional/api_samples/os-certificates/certificate-create-resp.json.tpl b/nova/tests/functional/api_samples/os-certificates/certificate-create-resp.json.tpl deleted file mode 100644 index 35c063c82056..000000000000 --- a/nova/tests/functional/api_samples/os-certificates/certificate-create-resp.json.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{ - "certificate": { - "data": "%(text)s", - "private_key": "%(text)s" - } -} diff --git a/nova/tests/functional/api_samples/os-certificates/certificate-get-root-resp.json.tpl b/nova/tests/functional/api_samples/os-certificates/certificate-get-root-resp.json.tpl deleted file mode 100644 index 4938e92fba14..000000000000 --- a/nova/tests/functional/api_samples/os-certificates/certificate-get-root-resp.json.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{ - "certificate": { - "data": "%(text)s", - "private_key": null - } -} diff --git a/nova/tests/functional/test_api_samples.py b/nova/tests/functional/test_api_samples.py index 27d390a06487..ddd6803ce60e 100644 --- a/nova/tests/functional/test_api_samples.py +++ b/nova/tests/functional/test_api_samples.py @@ -1221,22 +1221,6 @@ class FixedIpJsonTest(ApiSampleTestBaseV2): self._verify_response('fixedips-get-resp', project, response, 200) -class CertificatesSamplesJsonTest(ApiSampleTestBaseV2): - extension_name = ("nova.api.openstack.compute.contrib.certificates." - "Certificates") - - def test_create_certificates(self): - response = self._do_post('os-certificates', - 'certificate-create-req', {}) - subs = self._get_regexes() - self._verify_response('certificate-create-resp', subs, response, 200) - - def test_get_root_certificate(self): - response = self._do_get('os-certificates/root') - subs = self._get_regexes() - self._verify_response('certificate-get-root-resp', subs, response, 200) - - class UsedLimitsSamplesJsonTest(ApiSampleTestBaseV2): extension_name = ("nova.api.openstack.compute.contrib.used_limits." "Used_limits") diff --git a/nova/tests/functional/v3/test_certificates.py b/nova/tests/functional/v3/test_certificates.py index b52aeb2208ba..74e448bc25fd 100644 --- a/nova/tests/functional/v3/test_certificates.py +++ b/nova/tests/functional/v3/test_certificates.py @@ -13,11 +13,28 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_config import cfg + from nova.tests.functional.v3 import api_sample_base +CONF = cfg.CONF +CONF.import_opt('osapi_compute_extension', + 'nova.api.openstack.compute.extensions') + class CertificatesSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): extension_name = "os-certificates" + # TODO(gmann): Overriding '_api_version' till all functional tests + # are merged between v2 and v2.1. After that base class variable + # itself can be changed to 'v2' + _api_version = 'v2' + + def _get_flags(self): + f = super(CertificatesSamplesJsonTest, self)._get_flags() + f['osapi_compute_extension'] = CONF.osapi_compute_extension[:] + f['osapi_compute_extension'].append( + 'nova.api.openstack.compute.contrib.certificates.Certificates') + return f def test_create_certificates(self): response = self._do_post('os-certificates',