git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
19505a5
)
Fix NameError
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 10 Apr 2013 12:02:02 +0000
(08:02 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 10 Apr 2013 12:02:02 +0000
(08:02 -0400)
plstackapi/core/api/slices.py
patch
|
blob
|
history
diff --git
a/plstackapi/core/api/slices.py
b/plstackapi/core/api/slices.py
index
200aa5e
..
8e4707a
100644
(file)
--- 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'])
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]
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
slice.tenant_id=tenant.id
# create network
- network = driver.create_network(name=s
elf
.name)
- s
elf
.network_id = network['id']
+ network = driver.create_network(name=s
lice
.name)
+ s
lice
.network_id = network['id']
# create router
# create router
- router = driver.create_router(name=s
elf
.name)
- s
elf
.router_id = router['id']
+ router = driver.create_router(name=s
lice
.name)
+ s
lice
.router_id = router['id']
slice.save()
return slice
slice.save()
return slice
@@
-92,7
+92,8
@@
def delete_slice(auth, filter={}):
def get_slices(auth, filter={}):
client = auth_check(auth)
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
if site: filter['site'] = site
slices = Slice.objects.filter(**filter)
return slices