diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-10 15:32:56 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-10 15:32:56 +0200 |
| commit | fffa02ac32055650b2bfffff090ec7d52c86291a (patch) | |
| tree | b27cd34d295ed12760015082218842014a5bd7f5 /nova | |
| parent | d64adee4656a3044258c7dbfff93f5201c39560c (diff) | |
| download | nova-fffa02ac32055650b2bfffff090ec7d52c86291a.tar.gz nova-fffa02ac32055650b2bfffff090ec7d52c86291a.tar.xz nova-fffa02ac32055650b2bfffff090ec7d52c86291a.zip | |
Adjust a few things to make the unit tests happy again.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/endpoint/cloud.py | 2 | ||||
| -rw-r--r-- | nova/tests/virt_unittest.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 3334f09af..930274aed 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -348,7 +348,7 @@ class CloudController(object): @rbac.allow('netadmin') def delete_security_group(self, context, group_name, **kwargs): security_group = db.security_group_get_by_user_and_name(context, context.user.id, group_name) - security_group.delete() + db.security_group_destroy(context, security_group.id) return True @rbac.allow('projectmanager', 'sysadmin') diff --git a/nova/tests/virt_unittest.py b/nova/tests/virt_unittest.py index b8dcec12b..1f573c463 100644 --- a/nova/tests/virt_unittest.py +++ b/nova/tests/virt_unittest.py @@ -16,6 +16,7 @@ from xml.dom.minidom import parseString +from nova import db from nova import flags from nova import test from nova.endpoint import cloud @@ -91,7 +92,10 @@ class NWFilterTestCase(test.TrialTestCase): cidr_ip='0.0.0.0/0') fw = libvirt_conn.NWFilterFirewall() - xml = fw.security_group_to_nwfilter_xml(1) + + security_group = db.security_group_get_by_user_and_name({}, 'fake', 'testgroup') + + xml = fw.security_group_to_nwfilter_xml(security_group.id) dom = parseString(xml) self.assertEqual(dom.firstChild.tagName, 'filter') |