From 53c6334f8e8c3491f46f91a2d6a74531f61ddaf3 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 10 Apr 2013 08:11:45 -0400 Subject: [PATCH] fix TypeError --- plstackapi/core/api/slices.py | 4 ++-- plstackapi/openstack/driver.py | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plstackapi/core/api/slices.py b/plstackapi/core/api/slices.py index 8e4707a..3f50050 100644 --- a/plstackapi/core/api/slices.py +++ b/plstackapi/core/api/slices.py @@ -48,11 +48,11 @@ def add_slice(auth, fields): slice.tenant_id=tenant.id # create network - network = driver.create_network(name=slice.name) + network = driver.create_network(slice.name) slice.network_id = network['id'] # create router - router = driver.create_router(name=slice.name) + router = driver.create_router(slice.name) slice.router_id = router['id'] slice.save() diff --git a/plstackapi/openstack/driver.py b/plstackapi/openstack/driver.py index ef7662a..aac72ab 100644 --- a/plstackapi/openstack/driver.py +++ b/plstackapi/openstack/driver.py @@ -119,8 +119,13 @@ class OpenStackDriver: self.shell.quantum.router_remove_interface(router, subnet) def create_network(self, name): - return self.shell.quantum.create_network(name=name, admin_state_up=True) - + nets = self.shell.quantum.list_networks(name=name) + if not nets: + net = self.shell.quantum.create_network(name, admin_state_up=True) + else: + net = nets[0] + return net + def delete_network(self, name): nets = self.shell.quantum.list_networks(name=name) for net in nets: -- 2.47.0