move default group creation to api
This commit is contained in:
@@ -491,11 +491,6 @@ class AuthManager(object):
|
||||
drv.delete_project(project.id)
|
||||
raise
|
||||
|
||||
values = { 'name' : 'default',
|
||||
'description' : 'default',
|
||||
'user_id' : User.safe_id(manager_user),
|
||||
'project_id' : project.id }
|
||||
db.security_group_create({}, values)
|
||||
return project
|
||||
|
||||
def modify_project(self, project, manager_user=None, description=None):
|
||||
@@ -571,15 +566,6 @@ class AuthManager(object):
|
||||
except:
|
||||
logging.exception('Could not destroy network for %s',
|
||||
project)
|
||||
try:
|
||||
project_id = Project.safe_id(project)
|
||||
groups = db.security_group_get_by_project(context={},
|
||||
project_id=project_id)
|
||||
for group in groups:
|
||||
db.security_group_destroy({}, group['id'])
|
||||
except:
|
||||
logging.exception('Could not destroy security groups for %s',
|
||||
project)
|
||||
|
||||
with self.driver() as drv:
|
||||
drv.delete_project(Project.safe_id(project))
|
||||
|
@@ -31,6 +31,7 @@ from tornado import ioloop
|
||||
from twisted.internet import defer
|
||||
from twisted.trial import unittest
|
||||
|
||||
from nova import db
|
||||
from nova import fakerabbit
|
||||
from nova import flags
|
||||
|
||||
@@ -74,6 +75,7 @@ class TrialTestCase(unittest.TestCase):
|
||||
|
||||
if FLAGS.fake_rabbit:
|
||||
fakerabbit.reset_all()
|
||||
db.security_group_destroy_all(None)
|
||||
|
||||
def flags(self, **kw):
|
||||
"""Override flag variables for a test"""
|
||||
|
Reference in New Issue
Block a user