create OSModelAdmin. Update some Admin definitions to subclass OSModelAdmin

[plstackapi.git] / plstackapi / core / models / subnet.py

diff --git a/plstackapi/core/models/subnet.py b/plstackapi/core/models/subnet.py
index e94bfed..c9ea1ef 100644 (file)
--- a/plstackapi/core/models/subnet.py
+++ b/plstackapi/core/models/subnet.py
@@ -3,7 +3,6 @@ import commands
 from django.db import models
 from plstackapi.core.models import PlCoreBase
 from plstackapi.core.models import Slice
-from plstackapi.openstack.driver import OpenStackDriver
 
 # Create your models here.
 
@@ -18,10 +17,8 @@ class Subnet(PlCoreBase):
     def __unicode__(self):  return u'%s' % (self.slice.name)
 
     def save(self, *args, **kwds):
-
-        driver = OpenStackDriver()
         if not self.subnet_id:
-            quantum_subnet = driver.create_subnet(name= self.slice.name,
+            quantum_subnet = self.driver.create_subnet(name= self.slice.name,
                                           network_id=self.slice.network_id,
                                           cidr_ip = self.cidr,
                                           ip_version=self.ip_version,
@@ -29,17 +26,16 @@ class Subnet(PlCoreBase):
                                           end = self.end)
             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
-            commands.getstatusoutput(add_route)
+            self.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
+            #commands.getstatusoutput(add_route)
 
         super(Subnet, self).save(*args, **kwds)
 
     def delete(self, *args, **kwds):
-        driver = OpenStackDriver()
         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 
-        commands.getstatusoutput(del_route)
+            self.driver.delete_router_interface(self.slice.router_id, self.subnet_id) 
+            self.driver.delete_subnet(self.subnet_id)
+            #del_route = 'route del -net %s' % self.cidr 
+            #commands.getstatusoutput(del_route)
         super(Subnet, self).delete(*args, **kwds)