x/python-ganttclient
Code Issues Proposed changes

fix daemons and move network code

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-08-23 20:39:19 -07:00
parent b68417494f
commit f1ab66bc1e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/auth/manager.py
View File

@@ -524,8 +524,11 @@ class AuthManager(object):
member_users)
if project_dict:
project = Project(**project_dict)
# FIXME(ja): EVIL HACK
db.network_create(context, {'project_id': project.id})
try:
db.network_allocate(context, project.id)
except:
drv.delete_project(project.id)
raise
return project
def add_to_project(self, user, project):
@@ -574,7 +577,6 @@ class AuthManager(object):
def delete_project(self, project, context=None):
"""Deletes a project"""
# FIXME(ja): EVIL HACK
network_ref = db.project_get_network(context,
Project.safe_id(project))
try:

11
nova/tests/network_unittest.py
View File

@@ -179,18 +179,17 @@ class NetworkTestCase(test.TrialTestCase):
FLAGS.num_networks)
def test_too_many_networks(self):
"""Ensure error is raised if we run out of vpn ports"""
"""Ensure error is raised if we run out of networks"""
projects = []
# TODO(vish): use data layer for count
networks_left = FLAGS.num_networks - models.Network.count()
for i in range(networks_left):
project = self.manager.create_project('many%s' % i, self.user)
self.service.set_network_host(project.id)
projects.append(project)
project = self.manager.create_project('boom' , self.user)
self.assertRaises(db.NoMoreNetworks,
self.service.set_network_host,
project.id)
self.manager.delete_project(project)
self.manager.create_project,
'boom',
self.user)
for project in projects:
self.manager.delete_project(project)