X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fosaggregate.py;h=29681a0591f5bffb0c146432a35d9ec7076bd0d0;hb=a0ef6e7c91c3c8fa376943d28fec8c5c204a78cd;hp=4506fe9d6809a6417bda775b1840d568731aa84b;hpb=242002fedb442a214397b93b774dbbfbd7c7c5bb;p=sfa.git diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index 4506fe9d..29681a05 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -8,7 +8,7 @@ import time from collections import defaultdict from nova.exception import ImageNotFound from nova.api.ec2.cloud import CloudController -from sfa.util.faults import SfaAPIError, SliverDoesNotExist +from sfa.util.faults import SliverDoesNotExist from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch from sfa.rspecs.rspec import RSpec from sfa.rspecs.elements.hardware_type import HardwareType @@ -24,6 +24,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.client.multiclient import MultiClient from sfa.util.sfalogging import logger def pubkeys_to_user_data(pubkeys): @@ -57,7 +58,8 @@ class OSAggregate: zones = [zone.name for zone in zones] return zones - def list_resources(self, version=None, options={}): + def list_resources(self, version=None, options=None): + if options is None: options={} version_manager = VersionManager() version = version_manager.get_version(version) rspec_version = version_manager._get_version(version.type, version.version, 'ad') @@ -66,18 +68,16 @@ class OSAggregate: rspec.version.add_nodes(nodes) return rspec.toxml() - def describe(self, urns, version=None, options={}): + def describe(self, urns, version=None, options=None): + if options is None: options={} # update nova connection tenant_name = OSXrn(xrn=urns[0], type='slice').get_tenant_name() self.driver.shell.nova_manager.connect(tenant=tenant_name) instances = self.get_instances(urns) - if len(instances) == 0: - raise SliverDoesNotExist("You have not allocated any slivers here") - # lookup the sliver allocations sliver_ids = [sliver['sliver_id'] for sliver in slivers] constraint = SliverAllocation.sliver_id.in_(sliver_ids) - sliver_allocations = dbsession.query(SliverAllocation).filter(constraint) + sliver_allocations = self.driver.api.dbsession().query(SliverAllocation).filter(constraint) sliver_allocation_dict = {} for sliver_allocation in sliver_allocations: sliver_allocation_dict[sliver_allocation.sliver_id] = sliver_allocation @@ -92,6 +92,7 @@ class OSAggregate: version = version_manager.get_version(version) rspec_version = version_manager._get_version(version.type, version.version, 'manifest') rspec = RSpec(version=rspec_version, user_options=options) + rspec.xml.set('expires', datetime_to_string(utcparse(time.time()))) rspec.version.add_nodes(rspec_nodes) result = {'geni_urn': Xrn(urns[0]).get_urn(), 'geni_rspec': rspec.toxml(), @@ -201,9 +202,10 @@ class OSAggregate: def instance_to_sliver(self, instance, xrn=None): if xrn: - xrn = Xrn(xrn=slice_xrn, type='slice', id=instance.id).get_urn() + sliver_hrn = '%s.%s' % (self.driver.hrn, instance.id) + sliver_id = Xrn(sliver_hrn, type='sliver').urn - sliver = Sliver({'sliver_id': xrn.get_urn(), + sliver = Sliver({'sliver_id': sliver_id, 'name': instance.name, 'type': instance.name, 'cpus': str(instance.vcpus), @@ -211,8 +213,9 @@ class OSAggregate: 'storage': str(instance.disk)}) return sliver - def instance_to_geni_sliver(self, instance, sliver_allocations = {}): - sliver_hrn = '%s.%s' % (root_hrn, instance.id) + def instance_to_geni_sliver(self, instance, sliver_allocations=None): + if sliver_allocations is None: sliver_allocations={} + sliver_hrn = '%s.%s' % (self.driver.hrn, instance.id) sliver_id = Xrn(sliver_hrn, type='sliver').urn # set sliver allocation and operational status @@ -243,7 +246,6 @@ class OSAggregate: 'plos_sliver_type': self.shell.nova_manager.flavors.find(id=instance.flavor['id']).name, } - return geni_sliver def get_aggregate_nodes(self): @@ -303,7 +305,8 @@ class OSAggregate: return key_name - def create_security_group(self, slicename, fw_rules=[]): + def create_security_group(self, slicename, fw_rules=None): + if fw_rules is None: fw_rules=[] # use default group by default group_name = 'default' if isinstance(fw_rules, list) and fw_rules: @@ -321,6 +324,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): @@ -354,6 +362,7 @@ class OSAggregate: files = {'/root/.ssh/authorized_keys': authorized_keys} rspec = RSpec(rspec) requested_instances = defaultdict(list) + # iterate over clouds/zones/nodes slivers = [] for node in rspec.version.get_nodes_with_slivers(): @@ -367,6 +376,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) @@ -384,7 +395,7 @@ class OSAggregate: meta=metadata, name=instance_name) slivers.append(server) - except Exception, err: + except Exception as err: logger.log_exc(err) return slivers @@ -405,7 +416,7 @@ class OSAggregate: time.sleep(.5) manager.delete_security_group(security_group) - thread_manager = ThreadManager() + multiclient = MultiClient() tenant = self.driver.shell.auth_manager.tenants.find(id=instance.tenant_id) self.driver.shell.nova_manager.connect(tenant=tenant.name) args = {'name': instance.name, @@ -416,7 +427,7 @@ class OSAggregate: # destroy instance self.driver.shell.nova_manager.servers.delete(instance) # deleate this instance's security groups - thread_manager.run(_delete_security_group, instance) + multiclient.run(_delete_security_group, instance) return 1 def stop_instances(self, instance_name, tenant_name, id=None):