+
import os
+import socket
import base64
import string
import random
def ec2_id(id=None, type=None):
- ec2_id = None
+ ec2_id = None
+ if type == 'ovf':
+ type = 'ami'
if id and type:
ec2_id = CloudController.image_ec2_id(id, type)
return ec2_id
rspec_node['component_manager_id'] = Xrn(self.driver.hrn, 'authority+cm').get_urn()
sliver = instance_to_sliver(instance)
disk_image = image_manager.get_disk_image(instance.image_ref)
- sliver['disk_images'] = [disk_image.to_rspec_object()]
+ sliver['disk_image'] = [disk_image.to_rspec_object()]
rspec_node['slivers'] = [sliver]
rspec_nodes.append(rspec_node)
return rspec_nodes
slivers = []
for instance in instances:
sliver = instance_to_sliver(instance)
- sliver['disk_images'] = disk_image_objects
+ sliver['disk_image'] = disk_image_objects
slivers.append(sliver)
rspec_node['slivers'] = slivers
key = {}
key['user_id'] = username
key['name'] = username
- key['public'] = public_key
+ key['public_key'] = public_key
self.driver.shell.db.key_pair_create(key)
# remove old keys
self.driver.shell.db.key_pair_destroy(username, key.name)
- def create_security_group(self, group_name, fw_rules=[]):
- security_group = SecurityGroup(self.driver)
- security_group.create_security_group(group_name)
- for rule in fw_rules:
- security_group.add_rule_to_group(group_name,
+ def create_security_group(self, slicename, fw_rules=[]):
+ # use default group by default
+ group_name = 'default'
+ if isinstance(fw_rules, list) and fw_rules:
+ # Each sliver get's its own security group.
+ # Keep security group names unique by appending some random
+ # characters on end.
+ random_name = "".join([random.choice(string.letters+string.digits)
+ for i in xrange(6)])
+ group_name = slicename + random_name
+ security_group = SecurityGroup(self.driver)
+ security_group.create_security_group(group_name)
+ for rule in fw_rules:
+ security_group.add_rule_to_group(group_name,
protocol = rule.get('protocol'),
cidr_ip = rule.get('cidr_ip'),
port_range = rule.get('port_range'),
icmp_type_code = rule.get('icmp_type_code'))
+ return group_name
def add_rule_to_security_group(self, group_name, **kwds):
security_group = SecurityGroup(self.driver)
# iterate over sliver/instance types
for instance_type in instance_types:
fw_rules = instance_type.get('fw_rules', [])
- # Each sliver get's its own security group.
- # Keep security group names unique by appending some random
- # characters on end.
- random_name = "".join([random.choice(string.letters+string.digits)
- for i in xrange(6)])
- group_name = slicename + random_name
- self.create_security_group(group_name, fw_rules)
+ group_name = self.create_security_group(slicename, fw_rules)
ami_id = default_image_id
aki_id = default_aki_id
ari_id = default_ari_id
- req_image = instance_type.get('disk_images')
+ req_image = instance_type.get('disk_image')
if req_image and isinstance(req_image, list):
req_image_name = req_image[0]['name']
disk_image = image_manager.get_disk_image(name=req_image_name)