X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fosaggregate.py;h=35dcf5052e3c03a3e2d5c9a7dc90bb63db249b46;hb=c4ebba2362e27d686c7f6ef95372a4a433d57c6e;hp=7696fee33940817e548c8c8b32101d7f8d05c45a;hpb=6851425f87d2083be38884c196092dbdf4f714e5;p=sfa.git diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index 7696fee3..35dcf505 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -21,6 +21,7 @@ from sfa.planetlab.plxrn import PlXrn from sfa.openstack.osxrn import OSXrn, hrn_to_os_slicename from sfa.rspecs.version_manager import VersionManager from sfa.openstack.security_group import SecurityGroup +from sfa.server.threadmanager import ThreadManager from sfa.util.sfalogging import logger def pubkeys_to_user_data(pubkeys): @@ -35,12 +36,7 @@ def pubkeys_to_user_data(pubkeys): def instance_to_sliver(instance, slice_xrn=None): sliver_id = None - if slice_xrn: - xrn = Xrn(slice_xrn, 'slice') - sliver_id = xrn.get_sliver_id(instance.project_id, instance.hostname, instance.id) - - sliver = Sliver({'slice_id': sliver_id, - 'name': instance.name, + sliver = Sliver({'name': instance.name, 'type': instance.name, 'cpus': str(instance.vcpus), 'memory': str(instance.ram), @@ -91,7 +87,7 @@ class OSAggregate: zones = self.get_availability_zones() name = hrn_to_os_slicename(slice_xrn) instances = self.driver.shell.nova_manager.servers.findall(name=name) - node_dict = {} + rspec_nodes = [] for instance in instances: # determine node urn node_xrn = instance.metadata.get('component_id') @@ -100,19 +96,20 @@ class OSAggregate: else: node_xrn = OSXrn(xrn=node_xrn, type='node') - if not node_xrn.urn in node_dict: - rspec_node = Node() - rspec_node['component_id'] = node_xrn.urn - rspec_node['component_name'] = node_xrn.name - rspec_node['component_manager_id'] = Xrn(self.driver.hrn, 'authority+cm').get_urn() - rspec_node['slivers'] = [] - node_dict[node_xrn.urn] = rspec_node - else: - rspec_node = node_dict[node_xrn.urn] + rspec_node = Node() + rspec_node['component_id'] = node_xrn.urn + rspec_node['component_name'] = node_xrn.name + rspec_node['component_manager_id'] = Xrn(self.driver.hrn, 'authority+cm').get_urn() + rspec_node['slivers'] = [] + + if instance.metadata.get('client_id'): + rspec_node['client_id'] = instance.metadata.get('client_id') flavor = self.driver.shell.nova_manager.flavors.find(id=instance.flavor['id']) sliver = instance_to_sliver(flavor) rspec_node['slivers'].append(sliver) + sliver_xrn = OSXrn(xrn=slice_xrn, type='slice', id=instance.id) + rspec_node['sliver_id'] = sliver_xrn.get_urn() image = self.driver.shell.image_manager.get_images(id=instance.image['id']) if isinstance(image, list) and len(image) > 0: image = image[0] @@ -139,7 +136,7 @@ class OSAggregate: interface = Interface({'component_id': if_xrn.urn}) interface['ips'] = [{'address': private_ip['addr'], #'netmask': private_ip['network'], - 'type': private_ip['version']}] + 'type': 'ipv%s' % str(private_ip['version'])}] rspec_node['interfaces'].append(interface) # slivers always provide the ssh service @@ -150,7 +147,7 @@ class OSAggregate: service = Services({'login': login}) rspec_node['services'].append(service) rspec_nodes.append(rspec_node) - return node_dict.values() + return rspec_nodes def get_aggregate_nodes(self): zones = self.get_availability_zones() @@ -280,6 +277,8 @@ class OSAggregate: metadata['security_groups'] = group_name if node.get('component_id'): metadata['component_id'] = node['component_id'] + if node.get('client_id'): + metadata['client_id'] = node['client_id'] self.driver.shell.nova_manager.servers.create(flavor=flavor_id, image=image_id, key_name = key_name, @@ -293,20 +292,32 @@ class OSAggregate: def delete_instances(self, instance_name, tenant_name): + + def _delete_security_group(instance): + security_group = instance.metadata.get('security_groups', '') + if security_group: + manager = SecurityGroup(self.driver) + timeout = 10.0 # wait a maximum of 10 seconds before forcing the security group delete + start_time = time.time() + instance_deleted = False + while instance_deleted == False and (time.time() - start_time) < timeout: + inst = self.driver.shell.nova_manager.servers.findall(id=instance.id) + if not inst: + instance_deleted = True + time.sleep(.5) + manager.delete_security_group(security_group) + + thread_manager = ThreadManager() self.driver.shell.nova_manager.connect(tenant=tenant_name) instances = self.driver.shell.nova_manager.servers.findall(name=instance_name) - security_group_manager = SecurityGroup(self.driver) for instance in instances: - # deleate this instance's security groups - security_group = instance.metadata.get('security_groups', '') - if security_group: - # dont delete the default security group - if security_group != 'default': - security_group_manager.delete_security_group(security_group) # destroy instance self.driver.shell.nova_manager.servers.delete(instance) + # deleate this instance's security groups + thread_manager.run(_delete_security_group, instance) return 1 + def stop_instances(self, instance_name, tenant_name): self.driver.shell.nova_manager.connect(tenant=tenant_name) instances = self.driver.shell.nova_manager.servers.findall(name=instance_name)