From: Sandrine Avakian Date: Mon, 10 Sep 2012 08:21:37 +0000 (+0200) Subject: Merge branch 'master' into senslab2 X-Git-Tag: sfa-2.1-24~3^2~89 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=d4bf21b9cd5596d72d5c414444a8f3b9708366b5;hp=8d14077fe21d1e78dba172962f9f0d003974ec29 Merge branch 'master' into senslab2 --- diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 50112cd9..d9fa24e6 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -436,7 +436,7 @@ class NovaDriver(Driver): return result def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options): - + aggregate = OSAggregate(self) # assume first user is the caller and use their context @@ -454,9 +454,16 @@ class NovaDriver(Driver): rspec = RSpec(rspec_string) instance_name = hrn_to_os_slicename(slice_hrn) tenant_name = OSXrn(xrn=slice_hrn, type='slice').get_tenant_name() - aggregate.run_instances(instance_name, tenant_name, rspec_string, key_name, pubkeys) - - return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version) + instances = aggregate.run_instances(instance_name, tenant_name, rspec_string, key_name, pubkeys) + rspec_nodes = [] + for instance in instances: + rspec_nodes.append(aggregate.instance_to_rspec_node(slice_urn, instance)) + version_manager = VersionManager() + manifest_version = version_manager._get_version(rspec.version.type, rspec.version.version, 'manifest') + manifest_rspec = RSpec(version=manifest_version, user_options=options) + manifest_rspec.version.add_nodes(rspec_nodes) + + return manifest_rspec.toxml() def delete_sliver (self, slice_urn, slice_hrn, creds, options): aggregate = OSAggregate(self) diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index 8d4b8360..861e1be6 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -81,6 +81,82 @@ class OSAggregate: zones = [zone.name for zone in zones] return zones + def instance_to_rspec_node(self, slice_xrn, instance): + # determine node urn + node_xrn = instance.metadata.get('component_id') + if not node_xrn: + node_xrn = OSXrn('cloud', type='node') + else: + node_xrn = OSXrn(xrn=node_xrn, type='node') + + 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() + if instance.metadata.get('client_id'): + rspec_node['client_id'] = instance.metadata.get('client_id') + + # get sliver details + sliver_xrn = OSXrn(xrn=slice_xrn, type='slice', id=instance.id) + rspec_node['sliver_id'] = sliver_xrn.get_urn() + flavor = self.driver.shell.nova_manager.flavors.find(id=instance.flavor['id']) + sliver = instance_to_sliver(flavor) + # get firewall rules + fw_rules = [] + group_name = instance.metadata.get('security_groups') + if group_name: + group = self.driver.shell.nova_manager.security_groups.find(name=group_name) + for rule in group.rules: + port_range ="%s:%s" % (rule['from_port'], rule['to_port']) + fw_rule = FWRule({'protocol': rule['ip_protocol'], + 'port_range': port_range, + 'cidr_ip': rule['ip_range']['cidr']}) + fw_rules.append(fw_rule) + sliver['fw_rules'] = fw_rules + rspec_node['slivers']= [sliver] + # get disk image + image = self.driver.shell.image_manager.get_images(id=instance.image['id']) + if isinstance(image, list) and len(image) > 0: + image = image[0] + disk_image = image_to_rspec_disk_image(image) + sliver['disk_image'] = [disk_image] + + # get interfaces + rspec_node['services'] = [] + rspec_node['interfaces'] = [] + addresses = instance.addresses + # HACK: public ips are stored in the list of private, but + # this seems wrong. Assume pub ip is the last in the list of + # private ips until openstack bug is fixed. + if addresses.get('private'): + login = Login({'authentication': 'ssh-keys', + 'hostname': addresses.get('private')[-1]['addr'], + 'port':'22', 'username': 'root'}) + service = Services({'login': login}) + rspec_node['services'].append(service) + + for private_ip in addresses.get('private', []): + if_xrn = PlXrn(auth=self.driver.hrn, + interface='node%s' % (instance.hostId)) + if_client_id = Xrn(if_xrn.urn, type='interface', id="eth%s" %if_index).urn + if_sliver_id = Xrn(rspec_node['sliver_id'], type='slice', id="eth%s" %if_index).urn + interface = Interface({'component_id': if_xrn.urn, + 'client_id': if_client_id, + 'sliver_id': if_sliver_id}) + interface['ips'] = [{'address': private_ip['addr'], + #'netmask': private_ip['network'], + 'type': 'ipv%s' % str(private_ip['version'])}] + rspec_node['interfaces'].append(interface) + + # slivers always provide the ssh service + for public_ip in addresses.get('public', []): + login = Login({'authentication': 'ssh-keys', + 'hostname': public_ip['addr'], + 'port':'22', 'username': 'root'}) + service = Services({'login': login}) + rspec_node['services'].append(service) + return rspec_node + def get_slice_nodes(self, slice_xrn): # update nova connection tenant_name = OSXrn(xrn=slice_xrn, type='slice').get_tenant_name() @@ -91,81 +167,7 @@ class OSAggregate: instances = self.driver.shell.nova_manager.servers.findall(name=name) rspec_nodes = [] for instance in instances: - # determine node urn - node_xrn = instance.metadata.get('component_id') - if not node_xrn: - node_xrn = OSXrn('cloud', type='node') - else: - node_xrn = OSXrn(xrn=node_xrn, type='node') - - 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() - if instance.metadata.get('client_id'): - rspec_node['client_id'] = instance.metadata.get('client_id') - - # get sliver details - sliver_xrn = OSXrn(xrn=slice_xrn, type='slice', id=instance.id) - rspec_node['sliver_id'] = sliver_xrn.get_urn() - flavor = self.driver.shell.nova_manager.flavors.find(id=instance.flavor['id']) - sliver = instance_to_sliver(flavor) - # get firewall rules - fw_rules = [] - group_name = instance.metadata.get('security_groups') - if group_name: - group = self.driver.shell.nova_manager.security_groups.find(name=group_name) - for rule in group.rules: - port_range ="%s:%s" % (rule['from_port'], rule['to_port']) - fw_rule = FWRule({'protocol': rule['ip_protocol'], - 'port_range': port_range, - 'cidr_ip': rule['ip_range']['cidr']}) - fw_rules.append(fw_rule) - sliver['fw_rules'] = fw_rules - rspec_node['slivers']= [sliver] - # get disk image - image = self.driver.shell.image_manager.get_images(id=instance.image['id']) - if isinstance(image, list) and len(image) > 0: - image = image[0] - disk_image = image_to_rspec_disk_image(image) - sliver['disk_image'] = [disk_image] - - # get interfaces - rspec_node['services'] = [] - rspec_node['interfaces'] = [] - addresses = instance.addresses - # HACK: public ips are stored in the list of private, but - # this seems wrong. Assume pub ip is the last in the list of - # private ips until openstack bug is fixed. - if addresses.get('private'): - login = Login({'authentication': 'ssh-keys', - 'hostname': addresses.get('private')[-1]['addr'], - 'port':'22', 'username': 'root'}) - service = Services({'login': login}) - rspec_node['services'].append(service) - - for private_ip in addresses.get('private', []): - if_xrn = PlXrn(auth=self.driver.hrn, - interface='node%s' % (instance.hostId)) - if_client_id = Xrn(if_xrn.urn, type='interface', id="eth%s" %if_index).urn - if_sliver_id = Xrn(rspec_node['sliver_id'], type='slice', id="eth%s" %if_index).urn - interface = Interface({'component_id': if_xrn.urn, - 'client_id': if_client_id, - 'sliver_id': if_sliver_id}) - interface['ips'] = [{'address': private_ip['addr'], - #'netmask': private_ip['network'], - 'type': 'ipv%s' % str(private_ip['version'])}] - rspec_node['interfaces'].append(interface) - - # slivers always provide the ssh service - for public_ip in addresses.get('public', []): - login = Login({'authentication': 'ssh-keys', - 'hostname': public_ip['addr'], - 'port':'22', 'username': 'root'}) - service = Services({'login': login}) - rspec_node['services'].append(service) - - rspec_nodes.append(rspec_node) + rspec_nodes.append(self.instance_to_rspec_node(slice_xrn, instance)) return rspec_nodes def get_aggregate_nodes(self): @@ -283,7 +285,9 @@ class OSAggregate: files = {'/root/.ssh/authorized_keys': authorized_keys} rspec = RSpec(rspec) requested_instances = defaultdict(list) + # iterate over clouds/zones/nodes + created_instances = [] for node in rspec.version.get_nodes_with_slivers(): instances = node.get('slivers', []) if not instances: @@ -303,18 +307,21 @@ 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, + server = self.driver.shell.nova_manager.servers.create(flavor=flavor_id, image=image_id, key_name = key_name, security_groups = [group_name], files=files, meta=metadata, name=instance_name) + if node.get('client_id'): + server.metadata['client_id'] = node['client_id'] + created_instances.append(server) + except Exception, err: logger.log_exc(err) + return created_instances def delete_instances(self, instance_name, tenant_name): @@ -330,7 +337,7 @@ class OSAggregate: inst = self.driver.shell.nova_manager.servers.findall(id=instance.id) if not inst: instance_deleted = True - time.sleep(.5) + time.sleep(1) manager.delete_security_group(security_group) thread_manager = ThreadManager() diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py index 1b2535a6..1fd35915 100644 --- a/sfa/planetlab/plaggregate.py +++ b/sfa/planetlab/plaggregate.py @@ -118,7 +118,9 @@ class PlAggregate: # sort slivers by node id for node_id in slice['node_ids']: - sliver = Sliver({'sliver_id': Xrn(slice_urn, type='slice', id=node_id, authority=self.driver.hrn).urn, + sliver_xrn = Xrn(slice_urn, type='sliver', id=node_id) + sliver_xrn.set_authority(self.driver.hrn) + sliver = Sliver({'sliver_id': sliver_xrn.urn, 'name': slice['name'], 'type': 'plab-vserver', 'tags': []}) @@ -129,7 +131,9 @@ class PlAggregate: for tag in tags: # most likely a default/global sliver attribute (node_id == None) if tag['node_id'] not in slivers: - sliver = Sliver({'sliver_id': urn_to_sliver_id(slice_urn, slice['slice_id'], ""), + sliver_xrn = Xrn(slice_urn, type='sliver', id=tag['node_id']) + sliver_xrn.set_authority(self.driver.hrn) + sliver = Sliver({'sliver_id': sliver_xrn.urn, 'name': slice['name'], 'type': 'plab-vserver', 'tags': []}) @@ -138,7 +142,7 @@ class PlAggregate: return (slice, slivers) - def get_nodes_and_links(self, slice_xrn, slice=None,slivers=[], options={}): + def get_nodes_and_links(self, slice_xrn, slice=None,slivers=[], options={}, requested_slivers={}): # if we are dealing with a slice that has no node just return # and empty list if slice_xrn: @@ -196,6 +200,10 @@ class PlAggregate: rspec_node['component_name'] = node['hostname'] rspec_node['component_manager_id'] = Xrn(self.driver.hrn, 'authority+cm').get_urn() rspec_node['authority_id'] = hrn_to_urn(PlXrn.site_hrn(self.driver.hrn, site['login_base']), 'authority+sa') + if requested_slivers and node['hostname'] in requested_slivers: + requested_sliver = requested_slivers[node['hostname']] + if requested_sliver.get('client_id'): + rspec_node['client_id'] = requested_sliver['client_id'] # do not include boot state ( element) in the manifest rspec if not slice: rspec_node['boot_state'] = node['boot_state'] @@ -234,7 +242,6 @@ class PlAggregate: # add sliver info sliver = slivers[node['node_id']] rspec_node['sliver_id'] = sliver['sliver_id'] - rspec_node['client_id'] = node['hostname'] rspec_node['slivers'] = [sliver] # slivers always provide the ssh service @@ -283,7 +290,7 @@ class PlAggregate: return rspec_leases - def get_rspec(self, slice_xrn=None, version = None, options={}): + def get_rspec(self, slice_xrn=None, version = None, options={}, requested_slivers={}): version_manager = VersionManager() version = version_manager.get_version(version) @@ -298,16 +305,17 @@ class PlAggregate: rspec.xml.set('expires', datetime_to_string(utcparse(slice['expires']))) if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'leases': - nodes, links = self.get_nodes_and_links(slice_xrn, slice, slivers, options) - rspec.version.add_nodes(nodes) - rspec.version.add_links(links) - # add sliver defaults - default_sliver = slivers.get(None, []) - if default_sliver: - default_sliver_attribs = default_sliver.get('tags', []) - for attrib in default_sliver_attribs: - logger.info(attrib) - rspec.version.add_default_sliver_attribute(attrib['tagname'], attrib['value']) + nodes, links = self.get_nodes_and_links(slice_xrn, slice, slivers, options, + requested_slivers=requested_slivers) + rspec.version.add_nodes(nodes) + rspec.version.add_links(links) + # add sliver defaults + default_sliver = slivers.get(None, []) + if default_sliver: + default_sliver_attribs = default_sliver.get('tags', []) + for attrib in default_sliver_attribs: + logger.info(attrib) + rspec.version.add_default_sliver_attribute(attrib['tagname'], attrib['value']) if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'resources': leases = self.get_leases(slice) diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py index 21fa2270..0fa8818f 100644 --- a/sfa/planetlab/pldriver.py +++ b/sfa/planetlab/pldriver.py @@ -691,8 +691,10 @@ class PlDriver (Driver): if node['last_contact'] is not None: res['pl_last_contact'] = datetime_to_string(utcparse(node['last_contact'])) - sliver_id = Xrn(slice_urn, type='slice', id=node['node_id'], authority=self.hrn).urn - res['geni_urn'] = sliver_id + sliver_xrn = Xrn(slice_urn, type='sliver', id=node['node_id']) + sliver_xrn.set_authority(self.hrn) + + res['geni_urn'] = sliver_xrn.urn if node['boot_state'] == 'boot': res['geni_status'] = 'ready' else: @@ -732,16 +734,17 @@ class PlDriver (Driver): slices.verify_slice_attributes(slice, requested_attributes, options=options) # add/remove slice from nodes - requested_slivers = [] - for node in rspec.version.get_nodes_with_slivers(): + requested_slivers = {} + slivers = rspec.version.get_nodes_with_slivers() + for node in slivers: hostname = None if node.get('component_name'): hostname = node.get('component_name').strip() elif node.get('component_id'): hostname = xrn_to_hostname(node.get('component_id').strip()) if hostname: - requested_slivers.append(hostname) - nodes = slices.verify_slice_nodes(slice, requested_slivers, peer) + requested_slivers[hostname] = node + nodes = slices.verify_slice_nodes(slice, requested_slivers.keys(), peer) # add/remove links links slices.verify_slice_links(slice, rspec.version.get_link_requests(), nodes) @@ -766,7 +769,9 @@ class PlDriver (Driver): # only used by plc and ple. slices.handle_peer(site, slice, persons, peer) - return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version) + return aggregate.get_rspec(slice_xrn=slice_urn, + version=rspec.version, + requested_slivers = requested_slivers) def delete_sliver (self, slice_urn, slice_hrn, creds, options): slicename = hrn_to_pl_slicename(slice_hrn) diff --git a/sfa/rspecs/elements/node.py b/sfa/rspecs/elements/node.py index 7358ee03..7c467f4c 100644 --- a/sfa/rspecs/elements/node.py +++ b/sfa/rspecs/elements/node.py @@ -3,6 +3,7 @@ from sfa.rspecs.elements.element import Element class Node(Element): fields = [ + 'client_id', 'component_id', 'component_name', 'component_manager_id', diff --git a/sfa/util/xrn.py b/sfa/util/xrn.py index e548fa56..2402de01 100644 --- a/sfa/util/xrn.py +++ b/sfa/util/xrn.py @@ -124,13 +124,17 @@ class Xrn: self.hrn=None self.urn=xrn if id: - self.urn = "%s:%s" % (self.urn, str(id)) + self.urn = "%s-%s" % (self.urn, str(id)) self.urn_to_hrn() + if type: + self.type=type + self.hrn_to_urn() else: self.urn=None self.hrn=xrn self.type=type self.hrn_to_urn() + self._normalize() # happens all the time .. # if not type: @@ -173,11 +177,9 @@ class Xrn: update the authority section of an existing urn """ authority_hrn = self.get_authority_hrn() - if not authority_hrn.startswith(authority): - hrn = ".".join([authority,authority_hrn, self.get_leaf()]) - else: - hrn = ".".join([authority_hrn, self.get_leaf()]) - + old_hrn_parts = Xrn.hrn_split(self.hrn) + old_hrn_parts[0] = authority + hrn = ".".join(old_hrn_parts) self.hrn = hrn self.hrn_to_urn() self._normalize() @@ -244,6 +246,9 @@ class Xrn: else: self.authority = Xrn.hrn_auth_list(self.hrn) name = Xrn.hrn_leaf(self.hrn) + # separate name from id + name_parts = name.split("-") + name = name_parts[0] authority_string = self.get_authority_urn() if self.type == None: @@ -252,7 +257,7 @@ class Xrn: urn = "+".join(['',authority_string,self.type,Xrn.unescape(name)]) if hasattr(self, 'id') and self.id: - urn = "%s:%s" % (urn, self.id) + urn = "%s-%s" % (urn, self.id) self.urn = Xrn.URN_PREFIX + urn