openstack
/
nova
Code Issues Proposed changes

Merge "initialize objects with context in server groups api"

This commit is contained in:
Jenkins 2014-11-25 22:44:14 +00:00 committed by Gerrit Code Review
parent 2f1cc501c1 0caab869c5
commit ecf8916750
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/compute/contrib/server_groups.py
View File

@ -244,7 +244,7 @@ class ServerGroupController(wsgi.Controller):
"server group"))
try:
sg.destroy(context)
sg.destroy()
except nova.exception.InstanceGroupNotFound as e:
if quotas:
quotas.rollback()

2
nova/api/openstack/compute/plugins/v3/server_groups.py
View File

@ -156,7 +156,7 @@ class ServerGroupController(wsgi.Controller):
"server group"))
try:
sg.destroy(context)
sg.destroy()
except nova.exception.InstanceGroupNotFound as e:
if quotas:
quotas.rollback()

10
nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py
View File

@ -113,17 +113,17 @@ class ServerGroupTestV21(test.TestCase):
self.assertEqual(res_dict['server_group']['policies'], policies)
def _create_instance(self, context):
instance = objects.Instance(image_ref=1, node='node1',
instance = objects.Instance(context=context, image_ref=1, node='node1',
reservation_id='a', host='host1', project_id='fake',
vm_state='fake', system_metadata={'key': 'value'})
instance.create(context)
instance.create()
return instance
def _create_instance_group(self, context, members):
ig = objects.InstanceGroup(name='fake_name',
ig = objects.InstanceGroup(context=context, name='fake_name',
user_id='fake_user', project_id='fake',
members=members)
ig.create(context)
ig.create()
return ig.uuid
def _create_groups_and_instances(self, ctx):
@ -148,7 +148,7 @@ class ServerGroupTestV21(test.TestCase):
req = fakes.HTTPRequest.blank(self._get_url() + '/os-server-groups')
# delete an instance
instances[1].destroy(ctx)
instances[1].destroy()
# check that the instance does not exist
self.assertRaises(exception.InstanceNotFound,
objects.Instance.get_by_uuid,