openstack/python-keystoneclient
Code Issues Proposed changes

update ec2 crud responses we test against

Browse Source 
this is to support blueprint: generate-ec2-access-secret

Change-Id: I55c2758e68b207adc363cde22e82ff9b5fdbf1f4
This commit is contained in:
Jesse Andrews
2012-01-16 17:02:15 -08:00
parent c7a72f15d7
commit d67df1a3d9
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/v2_0/test_ec2.py
View File

@@ -20,8 +20,8 @@ class EC2Tests(utils.TestCase):
user_id = 'usr' user_id = 'usr'
tenant_id = 'tnt' tenant_id = 'tnt'
req_body = {"tenant_id": tenant_id} req_body = {"tenant_id": tenant_id}
resp_body = {"credential": {"access_key": "access", resp_body = {"credential": {"access": "access",
"secret_key": "secret", "secret": "secret",
"tenant_id": tenant_id, "tenant_id": tenant_id,
"created": "12/12/12", "created": "12/12/12",
"enabled": True}} "enabled": True}}
@@ -43,14 +43,14 @@ class EC2Tests(utils.TestCase):
self.assertTrue(isinstance(cred, ec2.EC2)) self.assertTrue(isinstance(cred, ec2.EC2))
self.assertEqual(cred.tenant_id, tenant_id) self.assertEqual(cred.tenant_id, tenant_id)
self.assertEqual(cred.enabled, True) self.assertEqual(cred.enabled, True)
self.assertEqual(cred.access_key, 'access') self.assertEqual(cred.access, 'access')
self.assertEqual(cred.secret_key, 'secret') self.assertEqual(cred.secret, 'secret')
def test_get(self): def test_get(self):
user_id = 'usr' user_id = 'usr'
tenant_id = 'tnt' tenant_id = 'tnt'
resp_body = {"credential": {"access_key": "access", resp_body = {"credential": {"access": "access",
"secret_key": "secret", "secret": "secret",
"tenant_id": tenant_id, "tenant_id": tenant_id,
"created": "12/12/12", "created": "12/12/12",
"enabled": True}} "enabled": True}}
@@ -72,21 +72,21 @@ class EC2Tests(utils.TestCase):
self.assertTrue(isinstance(cred, ec2.EC2)) self.assertTrue(isinstance(cred, ec2.EC2))
self.assertEqual(cred.tenant_id, tenant_id) self.assertEqual(cred.tenant_id, tenant_id)
self.assertEqual(cred.enabled, True) self.assertEqual(cred.enabled, True)
self.assertEqual(cred.access_key, 'access') self.assertEqual(cred.access, 'access')
self.assertEqual(cred.secret_key, 'secret') self.assertEqual(cred.secret, 'secret')
def test_list(self): def test_list(self):
user_id = 'usr' user_id = 'usr'
tenant_id = 'tnt' tenant_id = 'tnt'
resp_body = {"credentials": { resp_body = {"credentials": {
"values": [ "values": [
{"access_key": "access", {"access": "access",
"secret_key": "secret", "secret": "secret",
"tenant_id": tenant_id, "tenant_id": tenant_id,
"created": "12/12/12", "created": "12/12/12",
"enabled": True}, "enabled": True},
{"access_key": "another", {"access": "another",
"secret_key": "key", "secret": "key",
"tenant_id": tenant_id, "tenant_id": tenant_id,
"created": "12/12/31", "created": "12/12/31",
"enabled": True}]}} "enabled": True}]}}
@@ -110,8 +110,8 @@ class EC2Tests(utils.TestCase):
self.assertTrue(isinstance(cred, ec2.EC2)) self.assertTrue(isinstance(cred, ec2.EC2))
self.assertEqual(cred.tenant_id, tenant_id) self.assertEqual(cred.tenant_id, tenant_id)
self.assertEqual(cred.enabled, True) self.assertEqual(cred.enabled, True)
self.assertEqual(cred.access_key, 'access') self.assertEqual(cred.access, 'access')
self.assertEqual(cred.secret_key, 'secret') self.assertEqual(cred.secret, 'secret')
def test_delete(self): def test_delete(self):
user_id = 'usr' user_id = 'usr'