commit f180f211902591e772e6a0438fec661c9d591d79
author Tony Mack <tmack@paris.CS.Princeton.EDU> Tue May 28 09:19:01 2013 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Tue May 28 09:19:43 2013 -0400
tree 3f6bd31c48ec6d3ce4bbad7e8f7bf51c0476225d
parent c2835a965f07502b33513822ce0b945ab9e65a4a

fix bugs

planetstack/openstack/manager.py

diff --git a/planetstack/openstack/manager.py b/planetstack/openstack/manager.py
index 4ddd7f6..83dd954 100644
--- a/planetstack/openstack/manager.py
+++ b/planetstack/openstack/manager.py
@@ -175,6 +175,8 @@
             slice.subnet_id = subnet['id']
             # add subnet as interface to slice's router
             self.driver.add_router_interface(router['id'], subnet['id'])
+            # add external route
+            self.driver.add_external_route(subnet)               
  
 
         if slice.id and slice.tenant_id:
@@ -190,6 +192,14 @@
             self.driver.delete_router(slice.router_id)
             self.driver.delete_network(slice.network_id)
             self.driver.delete_tenant(slice.tenant_id)
+            # delete external route
+            subnet = None 
+            subnets = self.driver.shell.quantum.list_subnets()['subnets']
+            for snet in subnets:
+                if snet['id'] == slice.subnet_id:
+                    subnet = snet
+            if subnet:
+                self.driver.delete_external_route(subnet)
 
     
 
@@ -233,7 +243,7 @@
     def save_sliver(self, sliver):
         if not sliver.instance_id:
             instance = self.driver.spawn_instance(name=sliver.name,
-                                   key_name = sliver.key.name,
+                                   key_name = sliver.key.nkey_id,
                                    image_id = sliver.image.image_id,
                                    hostname = sliver.node.name )
             sliver.instance_id = instance.id