X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsteps%2Fsync_slice_deployments.py;h=97196d628423ad4d13132effd53876fdf5ba0fcc;hb=07c4515e22b348e3c64f5a70f48217b48b85b719;hp=24b745977cf244bbce510b238e82902e64118b0a;hpb=d97caf30a4d58e52c5a9881510938d9d51484fcf;p=plstackapi.git diff --git a/planetstack/openstack_observer/steps/sync_slice_deployments.py b/planetstack/openstack_observer/steps/sync_slice_deployments.py index 24b7459..97196d6 100644 --- a/planetstack/openstack_observer/steps/sync_slice_deployments.py +++ b/planetstack/openstack_observer/steps/sync_slice_deployments.py @@ -9,6 +9,7 @@ from core.models.site import Deployment, SiteDeployments from core.models.slice import Slice, SliceDeployments from core.models.userdeployments import UserDeployments from util.logger import Logger, logging +from observer.ansible import * logger = Logger(level=logging.INFO) @@ -20,30 +21,6 @@ class SyncSliceDeployments(OpenStackSyncStep): if (deleted): return SliceDeployments.deleted_objects.all() else: - # slice deployments are not visible to users. We must ensure - # slices are deployed at all deploymets available to their site. - site_deployments = SiteDeployments.objects.all() - site_deploy_lookup = defaultdict(list) - for site_deployment in site_deployments: - site_deploy_lookup[site_deployment.site].append(site_deployment.deployment) - - slice_deployments = SliceDeployments.objects.all() - slice_deploy_lookup = defaultdict(list) - for slice_deployment in slice_deployments: - slice_deploy_lookup[slice_deployment.slice].append(slice_deployment.deployment) - - all_deployments = Deployment.objects.all() - for slice in Slice.objects.all(): - # slices are added to all deployments for now - expected_deployments = all_deployments - #expected_deployments = site_deploy_lookup[slice.site] - for expected_deployment in expected_deployments: - if slice not in slice_deploy_lookup or \ - expected_deployment not in slice_deploy_lookup[slice]: - sd = SliceDeployments(slice=slice, deployment=expected_deployment) - sd.save() - - # now we can return all slice deployments that need to be enacted return SliceDeployments.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None)) def get_next_subnet(self, deployment=None): @@ -66,46 +43,46 @@ class SyncSliceDeployments(OpenStackSyncStep): def sync_record(self, slice_deployment): logger.info("sync'ing slice deployment %s" % slice_deployment) - if not slice_deployment.tenant_id: - nova_fields = {'tenant_name': slice_deployment.slice.name, - 'description': slice_deployment.slice.description, - 'enabled': slice_deployment.slice.enabled} - driver = self.driver.admin_driver(deployment=slice_deployment.deployment.name) - tenant = driver.create_tenant(**nova_fields) - slice_deployment.tenant_id = tenant.id - - # XXX give caller an admin role at the tenant they've created - 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)) - else: - deployment_user = deployment_users[0] - # lookup user id at this deployment - kuser= driver.shell.keystone.users.find(email=slice_deployment.slice.creator.email) - - # add required roles at the slice's tenant - driver.add_user_role(kuser.id, tenant.id, 'admin') - - # refresh credentials using this tenant - client_driver = self.driver.client_driver(caller=deployment_user.user, - tenant=tenant.name, - deployment=slice_deployment.deployment.name) + if not slice_deployment.deployment.admin_user: + logger.info("deployment %r has no admin_user, skipping" % slice_deployment.deployment) + return - if slice_deployment.id and slice_deployment.tenant_id: - # update existing tenant - driver = self.driver.admin_driver(deployment=slice_deployment.deployment.name) - driver.update_tenant(slice_deployment.tenant_id, - description=slice_deployment.slice.description, - enabled=slice_deployment.slice.enabled) - - if slice_deployment.tenant_id: - # update slice/tenant quota - driver = self.driver.client_driver(deployment=slice_deployment.deployment.name, tenant=slice_deployment.slice.name) - driver.shell.nova.quotas.update(tenant_id=slice_deployment.tenant_id, instances=int(slice_deployment.slice.max_slivers)) - - slice_deployment.save() + 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)) + roles = [] + else: + deployment_user = deployment_users[0] + roles = ['admin'] + + max_instances=int(slice_deployment.slice.max_slivers) + tenant_fields = {'endpoint':slice_deployment.deployment.auth_url, + 'admin_user': slice_deployment.deployment.admin_user, + 'admin_password': slice_deployment.deployment.admin_password, + 'admin_tenant': 'admin', + 'tenant': slice_deployment.slice.name, + 'tenant_description': slice_deployment.slice.description, + 'roles':roles, + 'name':deployment_user.email, + 'max_instances':max_instances} + + res = run_template('sync_slice_deployments.yaml', tenant_fields) + expected_num = len(roles)+1 + if (len(res)!=expected_num): + raise Exception('Could not sync tenants for slice %s'%slice_deployment.slice.name) + else: + tenant_id = res[0]['id'] + if (not slice_deployment.tenant_id): + handle = os.popen('nova quota-update --instances %d %s'%(max_instances,tenant_id)) + output = handle.read() + result = handle.close() + if (result): + logging.info('Could not update quota for %s'%slice_deployment.slice.name) + slice_deployment.tenant_id = tenant_id + slice_deployment.save() + def delete_record(self, slice_deployment): @@ -125,11 +102,4 @@ class SyncSliceDeployments(OpenStackSyncStep): client_driver.delete_network(slice_deployment.network_id) if slice_deployment.tenant_id: driver.delete_tenant(slice_deployment.tenant_id) - # delete external route - #subnet = None - #subnets = client_driver.shell.quantum.list_subnets()['subnets'] - #for snet in subnets: - # if snet['id'] == slice_deployment.subnet_id: - # subnet = snet - #if subnet: - # driver.delete_external_route(subnet) +