-import re
+import commands
+from types import StringTypes
from plstackapi.openstack.client import OpenStackClient
from plstackapi.openstack.driver import OpenStackDriver
from plstackapi.core.api.auth import auth_check
from plstackapi.core.models import Subnet
from plstackapi.core.api.slices import _get_slices
+
def _get_subnets(filter):
+ if isinstance(filter, StringTypes) and filter.isdigit():
+ filter = int(filter)
if isinstance(filter, int):
subnets = Subnet.objects.filter(id=filter)
elif isinstance(filter, StringTypes):
- subnets = Subnet.objects.filter(name=filter)
- elif isinstance(filer, dict):
+ # the name is the subnet's slice's name
+ slices = _get_slices(filter)
+ slice = None
+ if slices: slice=slices[0]
+ subnets = Subnet.objects.filter(slice=slice)
+ elif isinstance(filter, dict):
subnets = Subnet.objects.filter(**filter)
else:
subnets = []
def add_subnet(auth, fields):
driver = OpenStackDriver(client = auth_check(auth))
- slices = _get_slice(fields.get('slice'))
+ slices = _get_slices(fields.get('slice'))
if slices: fields['slice'] = slices[0]
subnet = Subnet(**fields)
# create quantum subnet
- subnet = driver.create_subnet(network_name=subnet.name,
- cidr_ip = subnet.cidr,
- ip_version=subnet.ip_version,
- start = subnet.start,
- end = subnet.end,
- dns_nameservers = ['8.8.8.8', '8.8.4.4'])
-
- subnet.subnet_id=subnet.id
+ quantum_subnet = driver.create_subnet(name= subnet.slice.name,
+ network_id=subnet.slice.network_id,
+ cidr_ip = subnet.cidr,
+ ip_version=subnet.ip_version,
+ start = subnet.start,
+ end = subnet.end)
+ subnet.subnet_id=quantum_subnet['id']
+ ## set dns servers
+ #driver.update_subnet(subnet.id, {'dns_nameservers': ['8.8.8.8', '8.8.4.4']})
# add subnet as interface to slice's router
- driver.add_router_interface(subnet.slice.router_id, subnet.subnet_id)
-
+ 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
+ commands.getstatusoutput(add_route)
subnet.save()
return subnet
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
+ commands.getstatusoutput(del_route)
return 1
def get_subnets(auth, filter={}):