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
Changed DeploymentNetwork to Deployment, adjusted initial_json to include service...
[plstackapi.git]
/
planetstack
/
core
/
api
/
deployment_networks.py
diff --git
a/planetstack/core/api/deployment_networks.py
b/planetstack/core/api/deployment_networks.py
index
51fa03e
..
ee1f68e
100644
(file)
--- a/
planetstack/core/api/deployment_networks.py
+++ b/
planetstack/core/api/deployment_networks.py
@@
-1,37
+1,38
@@
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 core.models import DeploymentNetwork
+from core.models import Deployment
+from django.contrib.auth import authenticate
def _get_deployment_networks(filter):
if isinstance(filter, StringTypes) and filter.isdigit():
filter = int(filter)
if isinstance(filter, int):
def _get_deployment_networks(filter):
if isinstance(filter, StringTypes) and filter.isdigit():
filter = int(filter)
if isinstance(filter, int):
- deployment_networks = Deployment
Network
.objects.filter(id=filter)
+ deployment_networks = Deployment.objects.filter(id=filter)
elif isinstance(filter, StringTypes):
elif isinstance(filter, StringTypes):
- deployment_networks = Deployment
Network
.objects.filter(name=filter)
+ deployment_networks = Deployment.objects.filter(name=filter)
elif isinstance(filter, dict):
elif isinstance(filter, dict):
- deployment_networks = Deployment
Network
.objects.filter(**filter)
+ deployment_networks = Deployment.objects.filter(**filter)
else:
deployment_networks = []
return deployment_networks
def add_deployment_network(auth, name):
else:
deployment_networks = []
return deployment_networks
def add_deployment_network(auth, name):
- auth_check(auth)
- deployment = DeploymentNetwork(name=name)
+ user = authenticate(username=auth.get('username'),
+ password=auth.get('password'))
+ deployment = Deployment(name=name)
deployment.save()
return deployment
def delete_deployment_network(auth, filter={}):
deployment.save()
return deployment
def delete_deployment_network(auth, filter={}):
- auth_check(auth)
+ user = authenticate(username=auth.get('username'),
+ password=auth.get('password'))
deployments = _get_deployment_networks(filter)
for deployment in deployments:
deployment.delete()
return 1
def get_deployment_networks(auth, filter={}):
deployments = _get_deployment_networks(filter)
for deployment in deployments:
deployment.delete()
return 1
def get_deployment_networks(auth, filter={}):
- auth_check(auth)
+ user = authenticate(username=auth.get('username'),
+ password=auth.get('password'))
deployments = _get_deployment_networks(filter)
return deployments
deployments = _get_deployment_networks(filter)
return deployments