diff options
| author | Jesse Andrews <anotherjesse@gmail.com> | 2012-01-16 17:02:15 -0800 |
|---|---|---|
| committer | Jesse Andrews <anotherjesse@gmail.com> | 2012-01-16 17:04:53 -0800 |
| commit | d67df1a3d9e0bb8b2adc4db8712bfab6dfe0272c (patch) | |
| tree | cc61492977e1370bad43d1a3348c8ca52328bfd3 /tests/v2_0 | |
| parent | c7a72f15d76ee3b2383902a31b87bb1fe067073f (diff) | |
| download | python-keystoneclient-d67df1a3d9e0bb8b2adc4db8712bfab6dfe0272c.tar.gz | |
update ec2 crud responses we test against
this is to support blueprint: generate-ec2-access-secret
Change-Id: I55c2758e68b207adc363cde22e82ff9b5fdbf1f4
Diffstat (limited to 'tests/v2_0')
| -rw-r--r-- | tests/v2_0/test_ec2.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/v2_0/test_ec2.py b/tests/v2_0/test_ec2.py index f35804c..a9c7fb5 100644 --- a/tests/v2_0/test_ec2.py +++ b/tests/v2_0/test_ec2.py @@ -20,8 +20,8 @@ class EC2Tests(utils.TestCase): user_id = 'usr' tenant_id = 'tnt' req_body = {"tenant_id": tenant_id} - resp_body = {"credential": {"access_key": "access", - "secret_key": "secret", + resp_body = {"credential": {"access": "access", + "secret": "secret", "tenant_id": tenant_id, "created": "12/12/12", "enabled": True}} @@ -43,14 +43,14 @@ class EC2Tests(utils.TestCase): self.assertTrue(isinstance(cred, ec2.EC2)) self.assertEqual(cred.tenant_id, tenant_id) self.assertEqual(cred.enabled, True) - self.assertEqual(cred.access_key, 'access') - self.assertEqual(cred.secret_key, 'secret') + self.assertEqual(cred.access, 'access') + self.assertEqual(cred.secret, 'secret') def test_get(self): user_id = 'usr' tenant_id = 'tnt' - resp_body = {"credential": {"access_key": "access", - "secret_key": "secret", + resp_body = {"credential": {"access": "access", + "secret": "secret", "tenant_id": tenant_id, "created": "12/12/12", "enabled": True}} @@ -72,21 +72,21 @@ class EC2Tests(utils.TestCase): self.assertTrue(isinstance(cred, ec2.EC2)) self.assertEqual(cred.tenant_id, tenant_id) self.assertEqual(cred.enabled, True) - self.assertEqual(cred.access_key, 'access') - self.assertEqual(cred.secret_key, 'secret') + self.assertEqual(cred.access, 'access') + self.assertEqual(cred.secret, 'secret') def test_list(self): user_id = 'usr' tenant_id = 'tnt' resp_body = {"credentials": { "values": [ - {"access_key": "access", - "secret_key": "secret", + {"access": "access", + "secret": "secret", "tenant_id": tenant_id, "created": "12/12/12", "enabled": True}, - {"access_key": "another", - "secret_key": "key", + {"access": "another", + "secret": "key", "tenant_id": tenant_id, "created": "12/12/31", "enabled": True}]}} @@ -110,8 +110,8 @@ class EC2Tests(utils.TestCase): self.assertTrue(isinstance(cred, ec2.EC2)) self.assertEqual(cred.tenant_id, tenant_id) self.assertEqual(cred.enabled, True) - self.assertEqual(cred.access_key, 'access') - self.assertEqual(cred.secret_key, 'secret') + self.assertEqual(cred.access, 'access') + self.assertEqual(cred.secret, 'secret') def test_delete(self): user_id = 'usr' |