From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 10 Apr 2013 12:11:45 +0000 (-0400)
Subject: fix TypeError
X-Git-Tag: 1.0~130
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=53c6334f8e8c3491f46f91a2d6a74531f61ddaf3;p=plstackapi.git

fix TypeError
---

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: