diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-08-15 15:41:07 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-08-15 15:41:07 -0400 |
| commit | 8e7163cd413eebd2e08b5ad32d155f643e972740 (patch) | |
| tree | 3151788a5ccb331e8a882dca872c3ffcf13d9617 | |
| parent | 32ab7846b7781c557429600f419b9f7c8768cdce (diff) | |
| download | nova-8e7163cd413eebd2e08b5ad32d155f643e972740.tar.gz nova-8e7163cd413eebd2e08b5ad32d155f643e972740.tar.xz nova-8e7163cd413eebd2e08b5ad32d155f643e972740.zip | |
put tenant_id back in places where it was
| -rw-r--r-- | nova/api/openstack/contrib/security_groups.py | 6 | ||||
| -rw-r--r-- | nova/tests/api/openstack/contrib/test_security_groups.py | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/nova/api/openstack/contrib/security_groups.py b/nova/api/openstack/contrib/security_groups.py index 6c1043c83..d1230df69 100644 --- a/nova/api/openstack/contrib/security_groups.py +++ b/nova/api/openstack/contrib/security_groups.py @@ -56,7 +56,7 @@ class SecurityGroupController(object): if rule.group_id: source_group = db.security_group_get(context, rule.group_id) sg_rule['group'] = {'name': source_group.name, - 'project_id': source_group.project_id} + 'tenant_id': source_group.project_id} else: sg_rule['ip_range'] = {'cidr': rule.cidr} return sg_rule @@ -66,7 +66,7 @@ class SecurityGroupController(object): security_group['id'] = group.id security_group['description'] = group.description security_group['name'] = group.name - security_group['project_id'] = group.project_id + security_group['tenant_id'] = group.project_id security_group['rules'] = [] for rule in group.rules: security_group['rules'] += [self._format_security_group_rule( @@ -118,7 +118,7 @@ class SecurityGroupController(object): return {'security_groups': list(sorted(result, - key=lambda k: (k['project_id'], k['name'])))} + key=lambda k: (k['tenant_id'], k['name'])))} def create(self, req, body): """Creates a new security group.""" diff --git a/nova/tests/api/openstack/contrib/test_security_groups.py b/nova/tests/api/openstack/contrib/test_security_groups.py index aedc487c0..8d615eaea 100644 --- a/nova/tests/api/openstack/contrib/test_security_groups.py +++ b/nova/tests/api/openstack/contrib/test_security_groups.py @@ -247,7 +247,7 @@ class TestSecurityGroups(test.TestCase): expected = {'security_groups': [ {'id': 1, 'name':"default", - 'project_id': "123", + 'tenant_id': "123", "description":"default", "rules": [] }, @@ -257,7 +257,7 @@ class TestSecurityGroups(test.TestCase): { 'id': 2, 'name': "test", - 'project_id': "123", + 'tenant_id': "123", "description": "group-description", "rules": [] } @@ -283,12 +283,11 @@ class TestSecurityGroups(test.TestCase): 'security_group': { 'id': 2, 'name': "test", - 'project_id': "123", + 'tenant_id': "123", 'description': "group-description", 'rules': [] } } - self.assertEquals(response.status_int, 200) self.assertEquals(res_dict, expected) def test_get_security_group_by_invalid_id(self): |