git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
[plstackapi.git]
/
planetstack
/
core
/
api
/
images.py
diff --git
a/planetstack/core/api/images.py
b/planetstack/core/api/images.py
index
c080a55
..
933216f
100644
(file)
--- a/
planetstack/core/api/images.py
+++ b/
planetstack/core/api/images.py
@@
-1,7
+1,5
@@
from types import StringTypes
from types import StringTypes
-from openstack.client import OpenStackClient
-from openstack.driver import OpenStackDriver
-from core.api.auth import auth_check
+from django.contrib.auth import authenticate
from core.models import Image
def _get_images(filter):
from core.models import Image
def _get_images(filter):
@@
-26,7
+24,8
@@
def delete_image(auth, filter={}):
return 1
def get_images(auth, filter={}):
return 1
def get_images(auth, filter={}):
- auth_check(auth)
+ user = authenticate(username=auth.get('username'),
+ password=auth.get('password'))
images = _get_images(filter)
return images
images = _get_images(filter)
return images