+from nova.exception import ImageNotFound
+from nova.api.ec2.cloud import CloudController
+from sfa.util.faults import SfaAPIError
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.elements.hardware_type import HardwareType
from sfa.rspecs.elements.node import Node
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.login import Login
+from sfa.rspecs.elements.disk_image import DiskImage
from sfa.rspecs.elements.services import Services
from sfa.util.xrn import Xrn
from sfa.util.osxrn import OSXrn
from sfa.rspecs.version_manager import VersionManager
+
+def disk_image_to_rspec_object(image):
+ img = DiskImage()
+ img['name'] = image['ami']['name']
+ img['description'] = image['ami']['name']
+ img['os'] = image['ami']['name']
+ img['version'] = image['ami']['name']
+ return img
+
+
+def instance_to_sliver(instance, slice_xrn=None):
+ # should include?
+ # * instance.image_ref
+ # * instance.kernel_id
+ # * instance.ramdisk_id
+ import nova.db.sqlalchemy.models
+ name=None
+ type=None
+ sliver_id = None
+ if isinstance(instance, dict):
+ # this is an isntance type dict
+ name = instance['name']
+ type = instance['name']
+ elif isinstance(instance, nova.db.sqlalchemy.models.Instance):
+ # this is an object that describes a running instance
+ name = instance.display_name
+ type = instance.instance_type.name
+ else:
+ raise SfaAPIError("instnace must be an instance_type dict or" + \
+ " a nova.db.sqlalchemy.models.Instance object")
+ 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': name,
+ 'type': 'plos-' + type,
+ 'tags': []})
+ return sliver
+
+
class OSAggregate:
def __init__(self, driver):
self.driver = driver
- def instance_to_sliver(self, instance, slice_xrn=None):
- sliver_id = None
- name = None
- if slice_xrn:
- name = OSXrn(slice_xrn, 'slice').name
- sliver_id = xrn.sliver_id(instance.instance_id, "")
-
- # should include:
- # * instance.image_ref
- # * instance.kernel_id
- # * instance.ramdisk_id
- name=None
- if hasattr(instance, 'name'):
- name = instance.name
- elif hasattr(instance, 'display_name'):
- name = instance.display_name
- sliver = Sliver({'slice_id': sliver_id,
- 'name': name,
- 'type': 'plos-' + instance['name'],
- 'tags': []})
- return sliver
-
- def get_rspec(self, slice_xrn=None, vsersion=None, options={}):
+ def get_machine_image_details(self, image):
+ """
+ Returns a dict that contains the ami, aki and ari details for the specified
+ ami image.
+ """
+ disk_image = {}
+ if image['container_format'] == 'ami':
+ kernel_id = image['properties']['kernel_id']
+ ramdisk_id = image['properties']['ramdisk_id']
+ disk_image['ami'] = image
+ disk_image['aki'] = self.driver.shell.image_manager.show(kernel_id)
+ disk_image['ari'] = self.driver.shell.image_manager.show(ramdisk_id)
+ return disk_image
+
+ def get_disk_image(self, id=None, name=None):
+ """
+ Look up a image bundle using the specifeid id or name
+ """
+ disk_image = None
+ try:
+ if id:
+ image = self.driver.shell.image_manager.show(image_id)
+ elif name:
+ image = self.driver.shell.image_manager.show_by_name(image_name)
+ if image['container_format'] == 'ami':
+ disk_image = self.get_machine_image_details(image)
+ except ImageNotFound:
+ pass
+ return disk_image
+
+ def get_available_disk_images(self):
+ # get image records
+ disk_images = []
+ for image in self.driver.shell.image_manager.detail():
+ if image['container_format'] == 'ami':
+ disk_images.append(self.get_machine_image_details(image))
+ return disk_images
+
+ def get_rspec(self, slice_xrn=None, version=None, options={}):
version_manager = VersionManager()
version = version_manager.get_version(version)
if not slice_xrn:
else:
rspec_version = version_manager._get_version(version.type, version.version, 'manifest')
nodes = self.get_slice_nodes(slice_xrn)
-
+ rspec = RSpec(version=rspec_version, user_options=options)
rspec.version.add_nodes(nodes)
return rspec.toxml()
def get_slice_nodes(self, slice_xrn):
name = OSXrn(xrn = slice_xrn).name
- instances = self.driver.shell.instance_get_all_by_project(name)
+ instances = self.driver.shell.db.instance_get_all_by_project(name)
rspec_nodes = []
for instance in instances:
rspec_node = Node()
rspec_node['component_id'] = xrn.urn
rspec_node['component_name'] = xrn.name
rspec_node['component_manager_id'] = Xrn(self.driver.hrn, 'authority+cm').get_urn()
- sliver = self.instance_to_sliver(instance)
+ sliver = instance_to_sliver(instance)
+ disk_image = self.get_disk_image(instance.image_ref)
+ sliver['disk_images'] = [disk_image_to_rspec_object(disk_image)]
rspec_node['slivers'] = [sliver]
rspec_nodes.append(rspec_node)
return rspec_nodes
def get_aggregate_nodes(self):
- zones = self.driver.shell.zone_get_all()
+ zones = self.driver.shell.db.zone_get_all()
if not zones:
zones = ['cloud']
else:
zones = [zone.name for zone in zones]
+ # available sliver/instance/vm types
+ instances = self.driver.shell.db.instance_type_get_all().values()
+ # available images
+ disk_images = self.get_available_disk_images()
+ disk_image_objects = [disk_image_to_rspec_object(image) \
+ for image in disk_images]
rspec_nodes = []
for zone in zones:
rspec_node = Node()
rspec_node['exclusive'] = 'false'
rspec_node['hardware_types'] = [HardwareType({'name': 'plos-pc'}),
HardwareType({'name': 'pc'})]
- instances = self.driver.shell.instance_type_get_all().values()
- slivers = [self.instance_to_sliver(inst) for inst in instances]
+ slivers = []
+ for instance in instances:
+ sliver = instance_to_sliver(instance)
+ sliver['disk_images'] = disk_image_objects
+ slivers.append(sliver)
+
rspec_node['slivers'] = slivers
rspec_nodes.append(rspec_node)
- return rspec_node
+ return rspec_nodes
- def verify_slice(self, slicename, users, options={}):
+ def create_project(self, slicename, users, options={}):
"""
Create the slice if it doesn't alredy exist
"""
+ import nova.exception.ProjectNotFound
try:
slice = self.driver.shell.auth_manager.get_project(slicename)
except nova.exception.ProjectNotFound:
proj_manager = usernames[0]
self.driver.shell.auth_manager.create_project(slicename, proj_manager)
- def verify_slice_users(self, slicename, users, options={}):
+ def create_project_users(self, slicename, users, options={}):
"""
Add requested users to the specified slice.
"""
except nova.exception.UserNotFound:
self.driver.shell.auth_manager.create_user(username)
self.verify_user_keys(username, user['keys'], options)
+
def verify_user_keys(self, username, keys, options={}):
"""
existing_pub_keys = [key.public_key for key in existing_keys]
removed_pub_keys = set(existing_pub_keys).difference(keys)
added_pub_keys = set(keys).difference(existing_pub_keys)
-
+ pubkeys = []
# add new keys
for public_key in added_pub_keys:
key = {}
for key in existing_keys:
if key.public_key in removed_pub_keys:
self.driver.shell.db.key_pair_destroy(username, key.name)
-
- def verify_instances(self, slicename, rspec):
- pass
+
+ def reserve_instance(self, image_id, kernel_id, ramdisk_id, \
+ instance_type, key_name, user_data):
+ conn = self.driver.euca_shell
+ logger.info('Reserving an instance: image: %s, kernel: ' \
+ '%s, ramdisk: %s, type: %s, key: %s' % \
+ (image_id, kernel_id, ramdisk_id,
+ instance_type, key_name))
+ try:
+ reservation = conn.run_instances(image_id=image_id,
+ kernel_id=kernel_id,
+ ramdisk_id=ramdisk_id,
+ instance_type=instance_type,
+ key_name=key_name,
+ user_data = user_data)
+ except EC2ResponseError, ec2RespError:
+ logger.log_exc(ec2RespError)
+
+ def run_instances(self, slicename, rspec, keyname, pubkeys):
+ """
+ Create the instances thats requested in the rspec
+ """
+ # the default image to use for instnaces that dont
+ # explicitly request an image.
+ # Just choose the first available image for now.
+ available_images = self.get_available_disk_images()
+ default_image = self.get_disk_images()[0]
+ default_ami_id = CloudController.image_ec2_id(default_image['ami']['id'])
+ default_aki_id = CloudController.image_ec2_id(default_image['aki']['id'])
+ default_ari_id = CloudController.image_ec2_id(default_image['ari']['id'])
+
+ # get requested slivers
+ rspec = RSpec(rspec)
+ requested_instances = defaultdict(list)
+ # iterate over clouds/zones/nodes
+ for node in rspec.version.get_nodes_with_slivers():
+ instance_types = node.get('slivers', [])
+ if isinstance(instance_types, list):
+ # iterate over sliver/instance types
+ for instance_type in instance_types:
+ ami_id = default_ami_id
+ aki_id = default_aki_id
+ ari_id = default_ari_id
+ req_image = instance_type.get('disk_images')
+ if req_image and isinstance(req_image, list):
+ req_image_name = req_image[0]['name']
+ disk_image = self.get_disk_image(name=req_image_name)
+ if disk_image:
+ ami_id = CloudController.image_ec2_id(disk_image['ami']['id'])
+ aki_id = CloudController.image_ec2_id(disk_image['aki']['id'])
+ ari_id = CloudController.image_ec2_id(disk_image['ari']['id'])
+ # start the instance
+ self.reserve_instance(ami_id, aki_id, ari_id, \
+ instance_type['name'], keyname, pubkeys)
git://git.onelab.eu / sfa.git / blobdiff