From da3a02243df43ee581c52d3e194c8ed54d4cdd24 Mon Sep 17 00:00:00 2001 From: Ghanshyam Date: Fri, 28 Mar 2014 15:06:30 +0900 Subject: [PATCH] Correct the keypairs-get-resp.json API sample file Current keypair sample files 'keypairs-get-resp.json/xml contain 'keypairs' as the first key and that means its sample response of "list keypairs" API not "get keypair" API. The tests don't pass a keypair id, so current tests also are for "list keypairs" API. Details- Below API sample files- from their name it looks like these are for get keypair API. But in actual content of these files are written as List keypair API response. So it create the confusion that for which API these API sample file are. Name suggest for GET and content suggest for LIST Keypair. /nova/tests/integrated/api_samples/os-keypairs/ keypairs-get-resp.json.tpl /nova/tests/integrated/api_samples/os-keypairs/ keypairs-get-resp.xml.tpl Their API sample test cases are written corrosponding to list keypair APIs. This patch correct the above API sample file name from get to list Keypair APIs. API Sample test cases names are also modified accordingly. Partial-Bug: 1298769 Change-Id: I88d894ff9b0f6236221fa922601b641f26a87301 --- .../{keypairs-get-resp.json => keypairs-list-resp.json} | 0 .../{keypairs-get-resp.xml => keypairs-list-resp.xml} | 0 .../{keypairs-get-resp.json => keypairs-list-resp.json} | 0 ...ypairs-get-resp.json.tpl => keypairs-list-resp.json.tpl} | 0 ...keypairs-get-resp.xml.tpl => keypairs-list-resp.xml.tpl} | 0 nova/tests/integrated/test_api_samples.py | 6 +++--- ...ypairs-get-resp.json.tpl => keypairs-list-resp.json.tpl} | 0 nova/tests/integrated/v3/test_keypairs.py | 6 +++--- 8 files changed, 6 insertions(+), 6 deletions(-) rename doc/api_samples/os-keypairs/{keypairs-get-resp.json => keypairs-list-resp.json} (100%) rename doc/api_samples/os-keypairs/{keypairs-get-resp.xml => keypairs-list-resp.xml} (100%) rename doc/v3/api_samples/keypairs/{keypairs-get-resp.json => keypairs-list-resp.json} (100%) rename nova/tests/integrated/api_samples/os-keypairs/{keypairs-get-resp.json.tpl => keypairs-list-resp.json.tpl} (100%) rename nova/tests/integrated/api_samples/os-keypairs/{keypairs-get-resp.xml.tpl => keypairs-list-resp.xml.tpl} (100%) rename nova/tests/integrated/v3/api_samples/keypairs/{keypairs-get-resp.json.tpl => keypairs-list-resp.json.tpl} (100%) diff --git a/doc/api_samples/os-keypairs/keypairs-get-resp.json b/doc/api_samples/os-keypairs/keypairs-list-resp.json similarity index 100% rename from doc/api_samples/os-keypairs/keypairs-get-resp.json rename to doc/api_samples/os-keypairs/keypairs-list-resp.json diff --git a/doc/api_samples/os-keypairs/keypairs-get-resp.xml b/doc/api_samples/os-keypairs/keypairs-list-resp.xml similarity index 100% rename from doc/api_samples/os-keypairs/keypairs-get-resp.xml rename to doc/api_samples/os-keypairs/keypairs-list-resp.xml diff --git a/doc/v3/api_samples/keypairs/keypairs-get-resp.json b/doc/v3/api_samples/keypairs/keypairs-list-resp.json similarity index 100% rename from doc/v3/api_samples/keypairs/keypairs-get-resp.json rename to doc/v3/api_samples/keypairs/keypairs-list-resp.json diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.json.tpl rename to nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.xml.tpl similarity index 100% rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.xml.tpl rename to nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.xml.tpl diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index d9e1a44a03..f30016edf3 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -1110,13 +1110,13 @@ class KeyPairsSampleJsonTest(ApiSampleTestBaseV2): subs['keypair_name'] = '(%s)' % key_name self._verify_response('keypairs-import-post-resp', subs, response, 200) - def test_keypairs_get(self): - # Get api sample of key pairs get request. + def test_keypairs_list(self): + # Get api sample of key pairs list request. key_name = self.test_keypairs_post() response = self._do_get('os-keypairs') subs = self._get_regexes() subs['keypair_name'] = '(%s)' % key_name - self._verify_response('keypairs-get-resp', subs, response, 200) + self._verify_response('keypairs-list-resp', subs, response, 200) class KeyPairsSampleXmlTest(KeyPairsSampleJsonTest): diff --git a/nova/tests/integrated/v3/api_samples/keypairs/keypairs-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/keypairs/keypairs-list-resp.json.tpl similarity index 100% rename from nova/tests/integrated/v3/api_samples/keypairs/keypairs-get-resp.json.tpl rename to nova/tests/integrated/v3/api_samples/keypairs/keypairs-list-resp.json.tpl diff --git a/nova/tests/integrated/v3/test_keypairs.py b/nova/tests/integrated/v3/test_keypairs.py index bb47bcf6ee..8f71aff34d 100644 --- a/nova/tests/integrated/v3/test_keypairs.py +++ b/nova/tests/integrated/v3/test_keypairs.py @@ -55,10 +55,10 @@ class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): subs['keypair_name'] = '(%s)' % key_name self._verify_response('keypairs-import-post-resp', subs, response, 201) - def test_keypairs_get(self): - # Get api sample of key pairs get request. + def test_keypairs_list(self): + # Get api sample of key pairs list request. key_name = self.test_keypairs_post() response = self._do_get('keypairs') subs = self._get_regexes() subs['keypair_name'] = '(%s)' % key_name - self._verify_response('keypairs-get-resp', subs, response, 200) + self._verify_response('keypairs-list-resp', subs, response, 200)