summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>2011-08-23 15:06:24 -0700
committerHisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>2011-08-23 15:06:24 -0700
commit8cd7dcca1ccac0347289d633ebd10567d6cba4c7 (patch)
tree9df945ee2c9ba311d446d7a4b357b10ecc06388f /bin
parent20a58d38232e910f0a5d844caaf506c8d710477f (diff)
downloadnova-8cd7dcca1ccac0347289d633ebd10567d6cba4c7.tar.gz
nova-8cd7dcca1ccac0347289d633ebd10567d6cba4c7.tar.xz
nova-8cd7dcca1ccac0347289d633ebd10567d6cba4c7.zip
Stub out the DB in unit test.
Fix 'nova-manage network modify' to use db.network_update()
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-manage18
1 files changed, 6 insertions, 12 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 349a53a5c..b0322eb11 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -813,22 +813,16 @@ class NetworkCommands(object):
"""
admin_context = context.get_admin_context()
network = db.network_get_by_cidr(admin_context, fixed_range)
+ net = {}
if project:
- project_id = manager.Project.safe_id(project)
- db.network_associate_by_id(admin_context,
- network_id=network['id'],
- project_id=project,
- force=True)
+ net['project_id'] = project
elif dis_project:
- db.network_disassociate(admin_context, network_id=network['id'])
+ net['project_id'] = None
if host:
- db.network_set_host(admin_context,
- network['id'],
- host)
+ net['host'] = host
elif dis_host:
- db.network_set_host(admin_context,
- network['id'],
- None)
+ net['host'] = None
+ db.network_update(admin_context, network['id'], net)
class VmCommands(object):