X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsteps%2Fsync_controller_slices.py;h=0e37524f2abf3f32554792e1650aba2cba8a5649;hb=50c795217b2327793eff678bb456bacd702c9c5f;hp=07aca4c74846381428dc21b77986e534efb5f9e0;hpb=d4dc89f41b19a22f9c5f17edd7cd0a603c6c3ebb;p=plstackapi.git diff --git a/planetstack/openstack_observer/steps/sync_controller_slices.py b/planetstack/openstack_observer/steps/sync_controller_slices.py index 07aca4c..0e37524 100644 --- a/planetstack/openstack_observer/steps/sync_controller_slices.py +++ b/planetstack/openstack_observer/steps/sync_controller_slices.py @@ -5,40 +5,23 @@ from netaddr import IPAddress, IPNetwork from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep -from core.models.slice import Slice, ControllerSlices -from core.models.usercontrollers import ControllerUsers -from util.logger import Logger, logging +from core.models.slice import Slice, ControllerSlice +from core.models.controlleruser import ControllerUser +from util.logger import Logger, logging, logger from observer.ansible import * +from openstack.driver import OpenStackDriver logger = Logger(level=logging.INFO) class SyncControllerSlices(OpenStackSyncStep): - provides=[ControllerSlices] + provides=[ControllerSlice, Slice] requested_interval=0 def fetch_pending(self, deleted): if (deleted): - return ControllerSlices.deleted_objects.all() + return ControllerSlice.deleted_objects.all() else: - return ControllerSlices.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None)) - - def get_next_subnet(self, controller=None): - # limit ourself to 10.0.x.x for now - valid_subnet = lambda net: net.startswith('10.0') - driver = self.driver.admin_driver(controller=controller) - subnets = driver.shell.quantum.list_subnets()['subnets'] - ints = [int(IPNetwork(subnet['cidr']).ip) for subnet in subnets \ - if valid_subnet(subnet['cidr'])] - ints.sort() - if ints: - last_ip = IPAddress(ints[-1]) - else: - last_ip = IPAddress('10.0.0.1') - last_ip = IPAddress(ints[-1]) - last_network = IPNetwork(str(last_ip) + "/24") - next_network = IPNetwork(str(IPAddress(last_network) + last_network.size) + "/24") - return next_network - + return ControllerSlice.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None)) def sync_record(self, controller_slice): logger.info("sync'ing slice controller %s" % controller_slice) @@ -47,41 +30,39 @@ class SyncControllerSlices(OpenStackSyncStep): logger.info("controller %r has no admin_user, skipping" % controller_slice.controller) return - controller_users = ControllerUsers.objects.filter(user=controller_slice.slice.creator, - controller=controller_slice.controller) - if not controller_users: - logger.info("slice createor %s has not accout at controller %s" % (controller_slice.slice.creator, controller_slice.controller.name)) - roles = [] - else: - controller_user = controller_users[0] - roles = ['admin'] - - max_instances=int(controller_slice.slice.max_slivers) - tenant_fields = {'endpoint':controller_slice.controller.auth_url, - 'admin_user': controller_slice.controller.admin_user, - 'admin_password': controller_slice.controller.admin_password, - 'admin_tenant': 'admin', - 'tenant': controller_slice.slice.name, - 'tenant_description': controller_slice.slice.description, - 'roles':roles, - 'name':controller_user.user.email, - 'max_instances':max_instances} + controller_users = ControllerUser.objects.filter(user=controller_slice.slice.creator, + controller=controller_slice.controller) + if not controller_users: + raise Exception("slice createor %s has not accout at controller %s" % (controller_slice.slice.creator, controller_slice.controller.name)) + else: + controller_user = controller_users[0] + roles = ['Admin'] + + max_instances=int(controller_slice.slice.max_slivers) + tenant_fields = {'endpoint':controller_slice.controller.auth_url, + 'admin_user': controller_slice.controller.admin_user, + 'admin_password': controller_slice.controller.admin_password, + 'admin_tenant': 'admin', + 'tenant': controller_slice.slice.name, + 'tenant_description': controller_slice.slice.description, + 'roles':roles, + 'name':controller_user.user.email, + 'ansible_tag':'%s@%s'%(controller_slice.slice.name,controller_slice.controller.name), + 'max_instances':max_instances} - res = run_template('sync_controller_slices.yaml', tenant_fields) - expected_num = len(roles)+1 - if (len(res)!=expected_num): - raise Exception('Could not sync tenants for slice %s'%controller_slice.slice.name) - else: - tenant_id = res[0]['id'] - if (not controller_slice.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'%controller_slice.slice.name) - controller_slice.tenant_id = tenant_id - controller_slice.save() - + expected_num = len(roles)+1 + res = run_template('sync_controller_slices.yaml', tenant_fields, path='controller_slices', expected_num=expected_num) + tenant_id = res[0]['id'] + if (not controller_slice.tenant_id): + try: + driver = OpenStackDriver().admin_driver(controller=controller_slice.controller) + driver.shell.nova.quotas.update(tenant_id=controller_slice.tenant_id, instances=int(controller_slice.slice.max_slivers)) + except: + logger.log_exc('Could not update quota for %s'%controller_slice.slice.name) + raise Exception('Could not update quota for %s'%controller_slice.slice.name) + + controller_slice.tenant_id = tenant_id + controller_slice.save() def delete_record(self, controller_slice): @@ -95,10 +76,9 @@ class SyncControllerSlices(OpenStackSyncStep): client_driver.delete_router_interface(controller_slice.router_id, controller_slice.subnet_id) if controller_slice.subnet_id: client_driver.delete_subnet(controller_slice.subnet_id) - if controller_slice.router_id: + if controller_slice.router_id: client_driver.delete_router(controller_slice.router_id) if controller_slice.network_id: client_driver.delete_network(controller_slice.network_id) if controller_slice.tenant_id: driver.delete_tenant(controller_slice.tenant_id) -