X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack%2Fmanager.py;h=3ae7dead146675be140f763b5ccfc2bab3a60ce9;hb=dfefe9db61e02e03d66bc2ac625576483abb931f;hp=131b8fbc82501eb0148b7271764a4f63a27237c9;hpb=6795fbebdf1c348f1539dbd32e255f50e9ff4e12;p=plstackapi.git diff --git a/planetstack/openstack/manager.py b/planetstack/openstack/manager.py index 131b8fb..3ae7dea 100644 --- a/planetstack/openstack/manager.py +++ b/planetstack/openstack/manager.py @@ -2,7 +2,8 @@ import os #os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings") import string import random -import md5 +import hashlib +from datetime import datetime from netaddr import IPAddress, IPNetwork from planetstack import settings @@ -57,7 +58,7 @@ class OpenStackManager: @require_enabled def init_caller(self, caller, tenant): auth = {'username': caller.email, - 'password': md5.new(caller.password).hexdigest()[:6], + 'password': hashlib.md5(caller.password).hexdigest()[:6], 'tenant': tenant} self.client = OpenStackClient(**auth) self.driver = OpenStackDriver(client=self.client) @@ -98,7 +99,7 @@ class OpenStackManager: name = user.email[:user.email.find('@')] user_fields = {'name': name, 'email': user.email, - 'password': md5.new(user.password).hexdigest()[:6], + 'password': hashlib.md5(user.password).hexdigest()[:6], 'enabled': True} if not user.kuser_id: keystone_user = self.driver.create_user(**user_fields) @@ -118,6 +119,10 @@ class OpenStackManager: self.init_caller(user, user.site.login_base) self.save_key(user.public_key, user.keyname) self.init_admin() + + user.save() + user.enacted = datetime.now() + user.save(update_fields=['enacted']) @require_enabled def delete_user(self, user): @@ -140,11 +145,33 @@ class OpenStackManager: description=site.name, enabled=site.enabled) + # commit the updated record + site.save() + site.enacted = datetime.now() + site.save(update_fields=['enacted']) # enusre enacted > updated + + @require_enabled def delete_site(self, site): if site.tenant_id: self.driver.delete_tenant(site.tenant_id) + @require_enabled + def save_site_privilege(self, site_priv): + if site_priv.user.kuser_id and site_priv.site.tenant_id: + self.driver.add_user_role(site_priv.user.kuser_id, + site_priv.site.tenant_id, + site_priv.role.role_type) + site_priv.enacted = datetime.now() + site_priv.save(update_fields=['enacted']) + + + @require_enabled + def delete_site_privilege(self, site_priv): + self.driver.delete_user_role(site_priv.user.kuser_id, + site_priv.site.tenant_id, + site_priv.role.role_type) + @require_enabled def save_slice(self, slice): if not slice.tenant_id: @@ -186,30 +213,55 @@ class OpenStackManager: # add subnet as interface to slice's router self.driver.add_router_interface(router['id'], subnet['id']) # add external route - self.driver.add_external_route(subnet) - + self.driver.add_external_route(subnet) + if slice.id and slice.tenant_id: self.driver.update_tenant(slice.tenant_id, description=slice.description, - enabled=slice.enabled) + enabled=slice.enabled) + + slice.save() + slice.enacted = datetime.now() + slice.save(update_fields=['enacted']) @require_enabled def delete_slice(self, slice): if slice.tenant_id: - self.driver.delete_router_interface(slice.router_id, slice.subnet_id) - self.driver.delete_subnet(slice.subnet_id) - self.driver.delete_router(slice.router_id) - self.driver.delete_network(slice.network_id) - self.driver.delete_tenant(slice.tenant_id) - # delete external route - subnet = None - subnets = self.driver.shell.quantum.list_subnets()['subnets'] - for snet in subnets: - if snet['id'] == slice.subnet_id: - subnet = snet - if subnet: - self.driver.delete_external_route(subnet) + self._delete_slice(slice.tenant_id, slice.network_id, + slice.router_id, slice.subnet_id) + @require_enabled + def _delete_slice(self, tenant_id, network_id, router_id, subnet_id): + self.driver.delete_router_interface(slice.router_id, slice.subnet_id) + self.driver.delete_subnet(slice.subnet_id) + self.driver.delete_router(slice.router_id) + self.driver.delete_network(slice.network_id) + self.driver.delete_tenant(slice.tenant_id) + # delete external route + subnet = None + subnets = self.driver.shell.quantum.list_subnets()['subnets'] + for snet in subnets: + if snet['id'] == slice.subnet_id: + subnet = snet + if subnet: + self.driver.delete_external_route(subnet) + + + @require_enabled + def save_slice_membership(self, slice_memb): + if slice_memb.user.kuser_id and slice_memb.slice.tenant_id: + self.driver.add_user_role(slice_memb.user.kuser_id, + slice_memb.slice.tenant_id, + slice_memb.role.role_type) + slice_memb.enacted = datetime.now() + slice_memb.save(update_fields=['enacted']) + + + @require_enabled + def delete_slice_membership(self, slice_memb): + self.driver.delete_user_role(slice_memb.user.kuser_id, + slice_memb.slice.tenant_id, + slice_memb.role.role_type) @require_enabled @@ -252,16 +304,24 @@ class OpenStackManager: @require_enabled def save_sliver(self, sliver): if not sliver.instance_id: + slice_memberships = SliceMembership.objects.filter(slice=sliver.slice) + pubkeys = [sm.user.public_key for sm in slice_memberships if sm.user.public_key] + pubkeys.append(sliver.creator.public_key) instance = self.driver.spawn_instance(name=sliver.name, key_name = sliver.creator.keyname, image_id = sliver.image.image_id, - hostname = sliver.node.name ) + hostname = sliver.node.name, + pubkeys = pubkeys ) sliver.instance_id = instance.id sliver.instance_name = getattr(instance, 'OS-EXT-SRV-ATTR:instance_name') if sliver.instance_id and ("numberCores" in sliver.changed_fields): self.driver.update_instance_metadata(sliver.instance_id, {"cpu_cores": str(sliver.numberCores)}) + sliver.save() + sliver.enacted = datetime.now() + sliver.save(update_fields=['enacted']) + @require_enabled def delete_sliver(self, sliver): if sliver.instance_id: