openstack/nova
Code Issues Proposed changes

Add Nova API Sample file & test for get keypair

Browse Source 
This patch adds the new API Sample file and its test for Nova V2 and V3
get keypair APIs.

This patch extend the timstamps reg exp to allow the combination
of TZ and microsecond/

Closes-Bug: 1298769
Closes-Bug: 1298818

Change-Id: If695a23cf95862b7bec6fbc5bdf7fc1733d08d4a
This commit is contained in:
Ghanshyam
2014-05-07 21:01:21 +09:00
parent edac193a89
commit c3cb44d688
9 changed files with 84 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,13 @@
{
"keypair": {
"created_at": "2014-05-07T12:06:13.681238",
"deleted": false,
"deleted_at": null,
"fingerprint": "9d:00:f4:d7:26:6e:52:06:4c:c1:d3:1d:fd:06:66:01",
"id": 1,
"name": "keypair-3582d8b7-e588-4aad-b7f7-f4e76f0e4314",
"public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYJrTVpcMwFqQy/oMvtUSRofZdSRHEwrsX8AYkRvn2ZnCXM+b6+GZ2NQuuWj+ocznlnwiGFQDsL/yeE+/kurqcPJFKKp60mToXIMyzioFxW88fJtwEWawHKAclbHWpR1t4fQ4DS+/sIbX/Yd9btlVQ2tpQjodGDbM9Tr9/+/3i6rcR+EoLqmbgCgAiGiVV6VbM2Zx79yUwd+GnQejHX8BlYZoOjCnt3NREsITcmWE9FVFy6TnLmahs3FkEO/QGgWGkaohAJlsgaVvSWGgDn2AujKYwyDokK3dXyeX3m2Vmc3ejiqPa/C4nRrCOlko5nSgV/9IXRx1ERImsqZnE9usB Generated by Nova\n",
"updated_at": null,
"user_id": "fake"
}
}

13
doc/api_samples/os-keypairs/keypairs-get-resp.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<keypair>
<public_key>ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTWIBcXl7SSxGWOmzryHuYFYFQajo7uZXACg2juI92lRnQt1yy8aJ1710QZWaBlfluJYaOqBMccYXGxAR1vmZTONuW+lpBjRMqYgNG6ZC46p6z+Akp7Okbf1w1aqZ2rF2kq9OsjpU1x1SuB+xwC9stDv5MXEW2Gt/VPVcl3fVQLgvIoANhQPA5UJU5fRoeWgq0F/GCQtEGo7cQOQO3PC6IOshUPWAI/vRHt1dFGKnJjKJTkTbAuQkH2AnkMEWn6DvFFy8frBl3PwCYWnrResmOuPLvL5MG+Q5c1IrXpQm9ifTpEAstMalLJfHA0h5amQvIeWsj2y2yWyttcHoHg9K5 Generated by Nova
</public_key>
<user_id>fake</user_id>
<name>keypair-8cabfb98-b13f-48cb-af1a-068b585eaaf5</name>
<deleted>False</deleted>
<created_at>2014-05-07 12:06:00.402696+00:00</created_at>
<updated_at>None</updated_at>
<fingerprint>ee:f5:79:02:69:af:ee:07:0f:ce:79:37:fd:5d:94:25</fingerprint>
<deleted_at>None</deleted_at>
<id>1</id>
</keypair>

7
doc/v3/api_samples/keypairs/keypairs-get-resp.json Normal file
View File

@@ -0,0 +1,7 @@
{
"keypair": {
"fingerprint": "44:fe:29:6e:23:14:b9:53:5b:65:82:58:1c:fe:5a:c3",
"name": "keypair-6638abdb-c4e8-407c-ba88-c8dd7cc3c4f1",
"public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1HTrHCbb9NawNLSV8N6tSa8i637+EC2dA+lsdHHfQlT54t+N0nHhJPlKWDLhc579j87vp6RDFriFJ/smsTnDnf64O12z0kBaJpJPH2zXrBkZFK6q2rmxydURzX/z0yLSCP77SFJ0fdXWH2hMsAusflGyryHGX20n+mZK6mDrxVzGxEz228dwQ5G7Az5OoZDWygH2pqPvKjkifRw0jwUKf3BbkP0QvANACOk26cv16mNFpFJfI1N3OC5lUsZQtKGR01ptJoWijYKccqhkAKuo902tg/qup58J5kflNm7I61sy1mJon6SGqNUSfoQagqtBH6vd/tU1jnlwZ03uUroAL Generated by Nova\n"
}
}

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

@@ -0,0 +1,13 @@
{
"keypair": {
"public_key": "%(public_key)s",
"name": "%(keypair_name)s",
"fingerprint": "%(fingerprint)s",
"user_id": "fake",
"deleted": false,
"created_at": "%(timestamp)s",
"updated_at": null,
"deleted_at": null,
"id": 1
}
}

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

@@ -0,0 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<keypair>
<public_key>%(public_key)s
</public_key>
<name>%(keypair_name)s</name>
<fingerprint>%(fingerprint)s</fingerprint>
<user_id>fake</user_id>
<deleted>False</deleted>
<created_at>%(timestamp)s</created_at>
<updated_at>None</updated_at>
<deleted_at>None</deleted_at>
<id>1</id>
</keypair>

3
nova/tests/integrated/api_samples_test_base.py
View File

@@ -271,7 +271,8 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase):
# shouldn't be an issue for this case.
timestamp_re = ('\d{4}-[0,1]\d-[0-3]\d[ ,T]'
'\d{2}:\d{2}:\d{2}'
'(Z|(\+|-)\d{2}:\d{2}|\.\d{6}|)')
'(Z|(\+|-)\d{2}:\d{2}|\.\d{6}|'
'\.\d{6}(Z|(\+|-)\d{2}:\d{2})|)')
return {
'isotime': isotime_re,
'timestamp': timestamp_re,

8
nova/tests/integrated/test_api_samples.py
View File

@@ -1118,6 +1118,14 @@ class KeyPairsSampleJsonTest(ApiSampleTestBaseV2):
subs['keypair_name'] = '(%s)' % key_name
self._verify_response('keypairs-list-resp', subs, response, 200)
def test_keypairs_get(self):
# Get api sample of key pairs get request.
key_name = self.test_keypairs_post()
response = self._do_get('os-keypairs/%s' % key_name)
subs = self._get_regexes()
subs['keypair_name'] = '(%s)' % key_name
self._verify_response('keypairs-get-resp', subs, response, 200)
class KeyPairsSampleXmlTest(KeyPairsSampleJsonTest):
ctype = 'xml'

7
nova/tests/integrated/v3/api_samples/keypairs/keypairs-get-resp.json.tpl Normal file
View File

@@ -0,0 +1,7 @@
{
"keypair": {
"public_key": "%(public_key)s",
"name": "%(keypair_name)s",
"fingerprint": "%(fingerprint)s"
}
}

8
nova/tests/integrated/v3/test_keypairs.py
View File

@@ -62,3 +62,11 @@ class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3):
subs = self._get_regexes()
subs['keypair_name'] = '(%s)' % key_name
self._verify_response('keypairs-list-resp', subs, response, 200)
def test_keypairs_get(self):
# Get api sample of key pairs get request.
key_name = self.test_keypairs_post()
response = self._do_get('keypairs/%s' % key_name)
subs = self._get_regexes()
subs['keypair_name'] = '(%s)' % key_name
self._verify_response('keypairs-get-resp', subs, response, 200)