diff options
-rw-r--r-- | novaclient/tests/unit/fixture_data/keypairs.py | 12 | ||||
-rw-r--r-- | novaclient/tests/unit/v2/fakes.py | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/novaclient/tests/unit/fixture_data/keypairs.py b/novaclient/tests/unit/fixture_data/keypairs.py index 1d73d252..5ac1b4ad 100644 --- a/novaclient/tests/unit/fixture_data/keypairs.py +++ b/novaclient/tests/unit/fixture_data/keypairs.py @@ -10,16 +10,20 @@ # License for the specific language governing permissions and limitations # under the License. +from novaclient import api_versions from novaclient.tests.unit import fakes from novaclient.tests.unit.fixture_data import base class V1(base.Fixture): + api_version = '2.1' base_url = 'os-keypairs' def setUp(self): super(V1, self).setUp() + api_version = api_versions.APIVersion(self.api_version) + keypair = {'fingerprint': 'FAKE_KEYPAIR', 'name': 'test'} headers = self.json_headers @@ -39,7 +43,13 @@ class V1(base.Fixture): def post_os_keypairs(request, context): body = request.json() assert list(body) == ['keypair'] - fakes.assert_has_keys(body['keypair'], required=['name']) + if api_version >= api_versions.APIVersion("2.92"): + # In 2.92, public_key becomes mandatory + required = ['name', 'public_key'] + else: + required = ['name'] + fakes.assert_has_keys(body['keypair'], + required=required) return {'keypair': keypair} self.requests_mock.post(self.url(), diff --git a/novaclient/tests/unit/v2/fakes.py b/novaclient/tests/unit/v2/fakes.py index c7687c1e..059a7147 100644 --- a/novaclient/tests/unit/v2/fakes.py +++ b/novaclient/tests/unit/v2/fakes.py @@ -1228,13 +1228,8 @@ class FakeSessionClient(base_client.SessionClient): def post_os_keypairs(self, body, **kw): assert list(body) == ['keypair'] - if self.api_version >= api_versions.APIVersion("2.92"): - # In 2.92, public_key becomes mandatory - required = ['name', 'public_key'] - else: - required = ['name'] fakes.assert_has_keys(body['keypair'], - required=required) + required=['name']) r = {'keypair': self.get_os_keypairs()[2]['keypairs'][0]['keypair']} return (202, {}, r) |