X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fopenstack%2Fosaggregate.py;h=68141595832f0ff399526d0cf5503328db8d7e6a;hb=89fdd26461afcd8279de66f10fb1688a25178b74;hp=6175c72ae2d33e48e31aab2a0a737c7b5c9a6043;hpb=5e209a116a27c492c3b411b073f083d9422c5418;p=sfa.git diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index 6175c72a..68141595 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -3,11 +3,12 @@ import os import socket import base64 import string -import random +import random +import time from collections import defaultdict from nova.exception import ImageNotFound from nova.api.ec2.cloud import CloudController -from sfa.util.faults import SfaAPIError +from sfa.util.faults import SfaAPIError, InvalidRSpec from sfa.rspecs.rspec import RSpec from sfa.rspecs.elements.hardware_type import HardwareType from sfa.rspecs.elements.node import Node @@ -36,12 +37,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), @@ -92,7 +88,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') @@ -101,15 +97,11 @@ 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') @@ -117,6 +109,8 @@ class OSAggregate: 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,11 +133,13 @@ class OSAggregate: for private_ip in addresses.get('private', []): if_xrn = PlXrn(auth=self.driver.hrn, - interface='node%s:eth0' % (instance.hostId)) - interface = Interface({'component_id': if_xrn.urn}) + interface='node%s' % (instance.hostId)) + if_client_id = Xrn(if_xrn.urn, type='interface', id="eth%s" %if_index).urn + interface = Interface({'component_id': if_xrn.urn, + 'client_id': if_client_id}) 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 @@ -154,7 +150,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() @@ -233,6 +229,11 @@ class OSAggregate: cidr_ip = rule.get('cidr_ip'), port_range = rule.get('port_range'), icmp_type_code = rule.get('icmp_type_code')) + # Open ICMP by default + security_group.add_rule_to_group(group_name, + protocol = "icmp", + cidr_ip = "0.0.0.0/0", + icmp_type_code = "-1:-1") return group_name def add_rule_to_security_group(self, group_name, **kwds): @@ -278,6 +279,8 @@ class OSAggregate: image = instance.get('disk_image') if image and isinstance(image, list): image = image[0] + else: + raise InvalidRSpec("Must specify a disk_image for each VM") image_id = self.driver.shell.nova_manager.images.find(name=image['name']) fw_rules = instance.get('fw_rules', []) group_name = self.create_security_group(instance_name, fw_rules) @@ -311,6 +314,7 @@ class OSAggregate: 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() @@ -321,7 +325,7 @@ class OSAggregate: self.driver.shell.nova_manager.servers.delete(instance) # deleate this instance's security groups thread_manager.run(_delete_security_group, instance) - return 1 + return True def stop_instances(self, instance_name, tenant_name):