fix TypeError
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 10 Apr 2013 12:11:45 +0000 (08:11 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 10 Apr 2013 12:11:45 +0000 (08:11 -0400)
plstackapi/core/api/slices.py
plstackapi/openstack/driver.py

index 8e4707a..3f50050 100644 (file)
@@ -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()
index ef7662a..aac72ab 100644 (file)
@@ -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: