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 (from parent 1:
227d9ab
)
update get_slices()
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 2 May 2013 19:44:49 +0000
(15:44 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 2 May 2013 19:44:49 +0000
(15:44 -0400)
plstackapi/core/api/slices.py
patch
|
blob
|
history
diff --git
a/plstackapi/core/api/slices.py
b/plstackapi/core/api/slices.py
index
a0cc8f8
..
eda2249
100644
(file)
--- a/
plstackapi/core/api/slices.py
+++ b/
plstackapi/core/api/slices.py
@@
-1,5
+1,6
@@
import re
from types import StringTypes
import re
from types import StringTypes
+from django.contrib.auth import authenticate
from plstackapi.openstack.client import OpenStackClient
from plstackapi.openstack.driver import OpenStackDriver
from plstackapi.core.api.auth import auth_check
from plstackapi.openstack.client import OpenStackClient
from plstackapi.openstack.driver import OpenStackDriver
from plstackapi.core.api.auth import auth_check
@@
-80,7
+81,8
@@
def delete_slice(auth, filter={}):
return 1
def get_slices(auth, filter={}):
return 1
def get_slices(auth, filter={}):
- client = auth_check(auth)
+ user = authenticate(username=auth.get('username'),
+ password=auth.get('password'))
if 'site' in filter:
sites = _get_sites(filter.get('site'))
if sites: filter['site'] = sites[0]
if 'site' in filter:
sites = _get_sites(filter.get('site'))
if sites: filter['site'] = sites[0]