commit aa6b750e4cf840bf24e395884e8fe514331c5d1b
author Tony Mack <tmack@paris.CS.Princeton.EDU> Wed Apr 17 21:58:34 2013 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Wed Apr 17 21:58:34 2013 -0400
tree 544bee457c6b343434bd11ce0f2b6141c7c26b19
parent 745bf6e4c13fc51b481017f304274178b2d12206

disable setting route until we have consistent way to determine external ip address

plstackapi/core/api/subnets.py

diff --git a/plstackapi/core/api/subnets.py b/plstackapi/core/api/subnets.py
index f72595a..b62a7ef 100644
--- a/plstackapi/core/api/subnets.py
+++ b/plstackapi/core/api/subnets.py
@@ -43,7 +43,7 @@
     # add subnet as interface to slice's router
     try: driver.add_router_interface(subnet.slice.router_id, subnet.subnet_id)
     except: pass         
-    add_route = 'route add -net %s dev br-ex gw 10.100.0.5' % self.cidr
+    #add_route = 'route add -net %s dev br-ex gw 10.100.0.5' % self.cidr
     commands.getstatusoutput(add_route)    
     subnet.save()
     return subnet
@@ -58,7 +58,7 @@
         driver.delete_router_interface(subnet.slice.router_id, subnet.subnet_id)
         driver.delete_subnet(subnet.subnet_id) 
         subnet.delete()
-        del_route = 'route del -net %s' % subnet.cidr
+        #del_route = 'route del -net %s' % subnet.cidr
     commands.getstatusoutput(del_route)
     return 1
 

plstackapi/core/models/key.py

diff --git a/plstackapi/core/models/key.py b/plstackapi/core/models/key.py
index 5174ebb..e224831 100644
--- a/plstackapi/core/models/key.py
+++ b/plstackapi/core/models/key.py
@@ -22,7 +22,6 @@
             key_fields = {'name': self.name,
                           'key': self.key}
             nova_key = driver.create_keypair(**key_fields)
-            print nova_key.id
             self.key_id = nova_key.id
         super(Key, self).save(*args, **kwds)
 

plstackapi/core/models/subnet.py

diff --git a/plstackapi/core/models/subnet.py b/plstackapi/core/models/subnet.py
index e94bfed..dcc9c6b 100644
--- a/plstackapi/core/models/subnet.py
+++ b/plstackapi/core/models/subnet.py
@@ -30,7 +30,7 @@
             self.subnet_id = quantum_subnet['id']
             # add subnet as interface to slice's router
             driver.add_router_interface(self.slice.router_id, self.subnet_id)
-            add_route = 'route add -net %s dev br-ex gw 10.100.0.5' % self.cidr
+            #add_route = 'route add -net %s dev br-ex gw 10.100.0.5' % self.cidr
             commands.getstatusoutput(add_route)
 
         super(Subnet, self).save(*args, **kwds)
@@ -40,6 +40,6 @@
         if self.subnet_id:
             driver.delete_router_interface(self.slice.router_id, self.subnet_id) 
             driver.delete_subnet(self.subnet_id)
-            del_route = 'route del -net %s' % self.cidr 
+            #del_route = 'route del -net %s' % self.cidr 
         commands.getstatusoutput(del_route)
         super(Subnet, self).delete(*args, **kwds)