From d95d1aad78cfb8be2c089c3879fb64c720b4ba47 Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 10 Apr 2013 08:02:02 -0400
Subject: [PATCH] Fix NameError
---
plstackapi/core/api/slices.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/plstackapi/core/api/slices.py b/plstackapi/core/api/slices.py
index 200aa5e..8e4707a 100644
--- a/plstackapi/core/api/slices.py
+++ b/plstackapi/core/api/slices.py
@@ -22,7 +22,7 @@ def lookup_site(fields):
site = None
if 'name' in fields:
validate_name(fields['name'])
- login_base = fields['name'][:fields['name'].find('@')]
+ login_base = fields['name'][:fields['name'].find('_')]
sites = Site.objects.filter(login_base=login_base)
if sites:
site = sites[0]
@@ -48,12 +48,12 @@ def add_slice(auth, fields):
slice.tenant_id=tenant.id
# create network
- network = driver.create_network(name=self.name)
- self.network_id = network['id']
+ network = driver.create_network(name=slice.name)
+ slice.network_id = network['id']
# create router
- router = driver.create_router(name=self.name)
- self.router_id = router['id']
+ router = driver.create_router(name=slice.name)
+ slice.router_id = router['id']
slice.save()
return slice
@@ -92,7 +92,8 @@ def delete_slice(auth, filter={}):
def get_slices(auth, filter={}):
client = auth_check(auth)
- site = lookup_site(filter)
+ if 'site' in filter:
+ site = lookup_site(filter)
if site: filter['site'] = site
slices = Slice.objects.filter(**filter)
return slices
--
2.47.0