bases=(models.Model,),
),
migrations.CreateModel(
- name='UserDeployments',
+ name='UserDeploymentss',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('created', models.DateTimeField(default=django.utils.timezone.now, auto_now_add=True)),
from .site import DeploymentLinkManager,DeploymentLinkDeletionManager
from .slice import Slice, SliceDeployments
from .site import SitePrivilege, SiteDeployments
-from .userdeployments import UserDeployment
+from .userdeployments import UserDeployments
from .image import Image, ImageDeployments
from .node import Node
from .serviceresource import ServiceResource
from core.models import PlCoreBase,Site,User,Deployment
from core.models import Deployment,DeploymentLinkManager,DeploymentLinkDeletionManager
-class UserDeployment(PlCoreBase):
+class UserDeployments(PlCoreBase):
objects = DeploymentLinkManager()
deleted_objects = DeploymentLinkDeletionManager()
@staticmethod
def select_by_user(user):
if user.is_admin:
- qs = UserDeployment.objects.all()
+ qs = UserDeployments.objects.all()
else:
users = Users.select_by_user(user)
qs = Usereployments.objects.filter(user__in=slices)
-from core.models import User, UserDeployment
+from core.models import User, UserDeployments
from observer.deleter import Deleter
-from observer.deleters.user_deployment_deleter import UserDeploymentDeleter
+from observer.deleters.user_deployment_deleter import UserDeploymentsDeleter
class UserDeleter(Deleter):
model='User'
def call(self, pk):
user = User.objects.get(pk=pk)
- user_deployment_deleter = UserDeploymentDeleter()
- for user_deployment in UserDeployment.objects.filter(user=user):
+ user_deployment_deleter = UserDeploymentsDeleter()
+ for user_deployment in UserDeployments.objects.filter(user=user):
user_deployment_deleter(user_deployment.id)
user.delete()
-from core.models import User, UserDeployment
+from core.models import User, UserDeployments
from observer.deleter import Deleter
-class UserDeploymentDeleter(Deleter):
- model='UserDeployment'
+class UserDeploymentsDeleter(Deleter):
+ model='UserDeployments'
def call(self, pk):
- user_deployment = UserDeployment.objects.get(pk=pk)
+ user_deployment = UserDeployments.objects.get(pk=pk)
if user_deployment.user.kuser_id:
driver = self.driver.admin_driver(deployment=user_deployment.deployment.name)
driver.delete_user(user_deployment.user.kuser_id)
url(r'plstackapi/slicedeployments/(?P<pk>[a-zA-Z0-9\-]+)/$', SliceDeploymentsDetail.as_view(), name ='slicedeployment-detail'),
# url(r'plstackapi/slicedeployments/!new/$', SliceDeploymentsNew.as_view(), name ='slicedeployment-new'),
- url(r'plstackapi/userdeployments/$', UserDeploymentList.as_view(), name='userdeployment-list'),
- url(r'plstackapi/userdeployments/(?P<pk>[a-zA-Z0-9\-]+)/$', UserDeploymentDetail.as_view(), name ='userdeployment-detail'),
-# url(r'plstackapi/userdeployments/!new/$', UserDeploymentNew.as_view(), name ='userdeployment-new'),
+ url(r'plstackapi/userdeployments/$', UserDeploymentsList.as_view(), name='userdeployment-list'),
+ url(r'plstackapi/userdeployments/(?P<pk>[a-zA-Z0-9\-]+)/$', UserDeploymentsDetail.as_view(), name ='userdeployment-detail'),
+# url(r'plstackapi/userdeployments/!new/$', UserDeploymentsNew.as_view(), name ='userdeployment-new'),
url(r'plstackapi/accounts/$', AccountList.as_view(), name='account-list'),
url(r'plstackapi/accounts/(?P<pk>[a-zA-Z0-9\-]+)/$', AccountDetail.as_view(), name ='account-detail'),
-class UserDeploymentSerializer(serializers.HyperlinkedModelSerializer):
+class UserDeploymentsSerializer(serializers.HyperlinkedModelSerializer):
id = serializers.Field()
class Meta:
- model = UserDeployment
+ model = UserDeployments
fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',)
-class UserDeploymentIdSerializer(serializers.ModelSerializer):
+class UserDeploymentsIdSerializer(serializers.ModelSerializer):
id = serializers.Field()
class Meta:
- model = UserDeployment
+ model = UserDeployments
fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',)
SliceDeployments: SliceDeploymentsSerializer,
- UserDeployment: UserDeploymentSerializer,
+ UserDeployments: UserDeploymentsSerializer,
Account: AccountSerializer,
-class UserDeploymentList(generics.ListCreateAPIView):
- queryset = UserDeployment.objects.select_related().all()
- serializer_class = UserDeploymentSerializer
- id_serializer_class = UserDeploymentIdSerializer
+class UserDeploymentsList(generics.ListCreateAPIView):
+ queryset = UserDeployments.objects.select_related().all()
+ serializer_class = UserDeploymentsSerializer
+ id_serializer_class = UserDeploymentsIdSerializer
filter_backends = (filters.DjangoFilterBackend,)
filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',)
return self.serializer_class
def get_queryset(self):
- return UserDeployment.select_by_user(self.request.user)
+ return UserDeployments.select_by_user(self.request.user)
def create(self, request, *args, **kwargs):
serializer = self.get_serializer(data=request.DATA, files=request.FILES)
obj = serializer.object
obj.caller = request.user
if obj.can_update(request.user):
- return super(UserDeploymentList, self).create(request, *args, **kwargs)
+ return super(UserDeploymentsList, self).create(request, *args, **kwargs)
else:
raise Exception("failed obj.can_update")
- ret = super(UserDeploymentList, self).create(request, *args, **kwargs)
+ ret = super(UserDeploymentsList, self).create(request, *args, **kwargs)
if (ret.status_code%100 != 200):
raise Exception(ret.data)
return ret
-class UserDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
- queryset = UserDeployment.objects.select_related().all()
- serializer_class = UserDeploymentSerializer
- id_serializer_class = UserDeploymentIdSerializer
+class UserDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+ queryset = UserDeployments.objects.select_related().all()
+ serializer_class = UserDeploymentsSerializer
+ id_serializer_class = UserDeploymentsIdSerializer
def get_serializer_class(self):
no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
return self.serializer_class
def get_queryset(self):
- return UserDeployment.select_by_user(self.request.user)
+ return UserDeployments.select_by_user(self.request.user)
# update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
filled with defaults. I solved it another way, so this code may soon be
abandoned.
-class UserDeploymentNew(GenericAPIView):
- serializer_class = UserDeploymentSerializer
- id_serializer_class = UserDeploymentIdSerializer
+class UserDeploymentsNew(GenericAPIView):
+ serializer_class = UserDeploymentsSerializer
+ id_serializer_class = UserDeploymentsIdSerializer
def get(self, request, *args, **kwargs):
return self.makenew(request, *args, **kwargs)
return self.serializer_class
def makenew(self, request, *args, **kwargs):
- obj = UserDeployment()
+ obj = UserDeployments()
serializer = self.get_serializer(obj)
return Response(serializer.data)
"""
from core.models import *
def handle(user):
- from core.models import Deployment,SiteDeployments,UserDeployment
+ from core.models import Deployment,SiteDeployments,UserDeployments
from collections import defaultdict
deployments = Deployment.objects.all()
site_deployments = SiteDeployments.objects.all()
site_deploy_lookup[site_deployment.site].append(site_deployment.deployment)
user_deploy_lookup = defaultdict(list)
- for user_deployment in UserDeployment.objects.all():
+ for user_deployment in UserDeployments.objects.all():
user_deploy_lookup[user_deployment.user].append(user_deployment.deployment)
all_deployments = Deployment.objects.filter()
if not user in user_deploy_lookup or \
expected_deployment not in user_deploy_lookup[user]:
# add new record
- ud = UserDeployment(user=user, deployment=expected_deployment)
+ ud = UserDeployments(user=user, deployment=expected_deployment)
ud.save()
from django.db.models import F, Q
from planetstack.config import Config
from observer.openstacksyncstep import OpenStackSyncStep
-from core.models import User, UserDeployment, SitePrivilege, SiteDeployments
+from core.models import User, UserDeployments, SitePrivilege, SiteDeployments
class SyncSitePrivileges(OpenStackSyncStep):
requested_interval=0
# sync site privileges at all site deployments
site_deployments = SiteDeployments.objects.filter(site=site_priv.site)
for site_deployment in site_deployments:
- user_deployments = UserDeployment.objects.filter(deployment=site_deployment.deployment)
+ user_deployments = UserDeployments.objects.filter(deployment=site_deployment.deployment)
if user_deployments:
kuser_id = user_deployments[0].kuser_id
driver = self.driver.admin_driver(deployment=site_deployment.deployment.name)
from observer.openstacksyncstep import OpenStackSyncStep
from core.models.site import Deployment, SiteDeployments
from core.models.slice import Slice, SliceDeployments
-from core.models.userdeployments import UserDeployment
+from core.models.userdeployments import UserDeployments
from util.logger import Logger, logging
from observer.ansible import *
logger.info("deployment %r has no admin_user, skipping" % slice_deployment.deployment)
return
- deployment_users = UserDeployment.objects.filter(user=slice_deployment.slice.creator,
+ deployment_users = UserDeployments.objects.filter(user=slice_deployment.slice.creator,
deployment=slice_deployment.deployment)
if not deployment_users:
logger.info("slice createor %s has not accout at deployment %s" % (slice_deployment.slice.creator, slice_deployment.deployment.name))
from planetstack.config import Config
from observer.openstacksyncstep import OpenStackSyncStep
from core.models.slice import *
-from core.models.userdeployments import UserDeployment
+from core.models.userdeployments import UserDeployments
from util.logger import Logger, logging
logger = Logger(level=logging.INFO)
for slice_deployment in slice_deployments:
if not slice_deployment.tenant_id:
continue
- user_deployments = UserDeployment.objects.filter(deployment=slice_deployment.deployment,
+ user_deployments = UserDeployments.objects.filter(deployment=slice_deployment.deployment,
user=slice_memb.user)
if user_deployments:
kuser_id = user_deployments[0].kuser_id
from observer.openstacksyncstep import OpenStackSyncStep
from core.models.site import SiteDeployments, Deployment
from core.models.user import User
-from core.models.userdeployments import UserDeployment
+from core.models.userdeployments import UserDeployments
from util.logger import Logger, logging
from observer.ansible import *
logger = Logger(level=logging.INFO)
-class SyncUserDeployment(OpenStackSyncStep):
- provides=[UserDeployment, User]
+class SyncUserDeployments(OpenStackSyncStep):
+ provides=[UserDeployments, User]
requested_interval=0
def fetch_pending(self, deleted):
if (deleted):
- return UserDeployment.deleted_objects.all()
+ return UserDeployments.deleted_objects.all()
else:
- return UserDeployment.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
+ return UserDeployments.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
def sync_record(self, user_deployment):
logger.info("sync'ing user %s at deployment %s" % (user_deployment.user, user_deployment.deployment.name))
from planetstack.config import Config
from observer.openstacksyncstep import OpenStackSyncStep
from core.models.user import User
-from core.models.userdeployments import UserDeployment
-from observer.steps.sync_user_deployments import SyncUserDeployment
+from core.models.userdeployments import UserDeployments
+from observer.steps.sync_user_deployments import SyncUserDeployments
class SyncUsers(OpenStackSyncStep):
provides=[User]
requested_interval=0
def sync_record(self, user):
- for user_deployment in UserDeployment.objects.filter(user=user):
+ for user_deployment in UserDeployments.objects.filter(user=user):
# bump the 'updated' field so user account are updated across
# deployments.
user_deployment.save()
def delete_record(self, user):
- user_deployment_deleter = SyncUserDeployment().delete_record
- for user_deployment in UserDeployment.objects.filter(user=user):
+ user_deployment_deleter = SyncUserDeployments().delete_record
+ for user_deployment in UserDeployments.objects.filter(user=user):
user_deployment_deleter(user_deployment)
git://git.onelab.eu / plstackapi.git / commitdiff