from sfa.rspecs.elements.disk_image import DiskImage
from sfa.rspecs.elements.services import Services
from sfa.rspecs.elements.interface import Interface
+from sfa.rspecs.elements.fw_rule import FWRule
from sfa.util.xrn import Xrn
from sfa.planetlab.plxrn import PlXrn
from sfa.openstack.osxrn import OSXrn, hrn_to_os_slicename
user_data += "\n"
return user_data
-def instance_to_sliver(instance, xrn=None):
- sliver_urn = None
- if slice_xrn:
- sliver_xrn = Xrn(xrn=slice_xrn, type='slice', id=instance.id).get_urn()
-
- sliver = Sliver({'slice_id': sliver_urn,
- 'name': instance.name,
- 'type': instance.name,
- 'cpus': str(instance.vcpus),
- 'memory': str(instance.ram),
- 'storage': str(instance.disk)})
- return sliver
-
def image_to_rspec_disk_image(image):
img = DiskImage()
img['name'] = image['name']
zones = [zone.name for zone in zones]
return zones
-
def list_resources(self, version=None, options={}):
version_manager = VersionManager()
version = version_manager.get_version(version)
instances = self.get_instances(urns)
if len(instances) == 0:
raise SliverDoesNotExist("You have not allocated any slivers here")
-
geni_slivers = []
rspec_nodes = []
for instance in instances:
version_manager = VersionManager()
version = version_manager.get_version(version)
rspec_version = version_manager._get_version(version.type, version.version, 'manifest')
- rspec = RSpec(version=version, user_options=options)
+ rspec = RSpec(version=rspec_version, user_options=options)
rspec.version.add_nodes(rspec_nodes)
result = {'geni_urn': Xrn(urns[0]).get_urn(),
'geni_rspec': rspec.toxml(),
ids = set()
for urn in urns:
xrn = OSXrn(xrn=urn)
- names.add(xrn.get_slice_name())
- if xrn.id:
- ids.add(xrn.id)
+ if xrn.type == 'slice':
+ names.add(xrn.get_slice_name())
+ elif xrn.type == 'sliver':
+ ids.add(xrn.leaf)
# look up instances
instances = []
- for name in name:
- servers = self.driver.shell.nova_manager.servers.findall(name=name)
- instances.extend(servers)
-
- # filter on id
+ filter = {}
+ if names:
+ filter['name'] = names
if ids:
- instances = [server in servers if server.id in ids]
+ filter['id'] = ids
+ servers = self.driver.shell.nova_manager.servers.findall(**filter)
+ instances.extend(servers)
return instances
rspec_node['sliver_id'] = OSXrn(name=instance.name, type='slice', id=instance.id).get_urn()
if instance.metadata.get('client_id'):
rspec_node['client_id'] = instance.metadata.get('client_id')
+
+ # get sliver details
flavor = self.driver.shell.nova_manager.flavors.find(id=instance.flavor['id'])
- rspec_node['slivers'] = [self.instance_to_sliver(flavor)]
+ sliver = self.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]
- # build interfaces
+ # get interfaces
rspec_node['services'] = []
rspec_node['interfaces'] = []
addresses = instance.addresses
op_status = 'geni_configuring'
elif state == 'failed':
op_status =' geni_failed'
-
- urn = OSXrn(name=instance.name, type='slice', id=instance.id).get_urn()
+
+ sliver_hrn = '%s.%s' % (root_hrn, instance.id)
+ sliver_id = Xrn(sliver_hrn, type='sliver').urn
# required fields
- geni_sliver = {'geni_sliver_urn': urn,
+ geni_sliver = {'geni_sliver_urn': sliver_id,
'geni_expires': None,
'geni_allocation_status': 'geni_provisioned',
'geni_operational_status': op_status,
rspec = RSpec(rspec)
requested_instances = defaultdict(list)
# iterate over clouds/zones/nodes
+ slivers = []
for node in rspec.version.get_nodes_with_slivers():
instances = node.get('slivers', [])
if not instances:
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)
+ slivers.append(server)
except Exception, err:
logger.log_exc(err)
+ return slivers
-
- def delete_instance(self, tenant_name, instance_name, id=None):
+ def delete_instance(self, instance):
- def _delete_security_group(instance):
- security_group = instance.metadata.get('security_groups', '')
+ def _delete_security_group(inst):
+ security_group = inst.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:
+ tmp_inst = self.driver.shell.nova_manager.servers.findall(id=inst.id)
+ if not tmp_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)
- args = {'name': instance_name}
- if id:
- args['id'] = id
+ thread_manager = ThreadManager()
+ 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
+ 'id': instance.id}
instances = self.driver.shell.nova_manager.servers.findall(**args)
security_group_manager = SecurityGroup(self.driver)
for instance in instances: