cf_factory 0.0.4 → 0.0.5

data/lib/cf_factory/ec2/cf_ebs_volume.rb

@@ -1,56 +1,56 @@
-require 'cf_factory/base/cf_base'
-module CfFactory
-class CfEbsVolume
-  include CfBase  
-  
-  def initialize(name, availability_zone, options = {})
-    @name = name
-    @availability_zone = availability_zone
-    
-    @size = options[:size]
-    @snapshot_id = options[:snapshot_id]
-    @iops = options[:iops]
-    @volume_type = options[:volume_type]
-    set_deletion_policy("Delete")
-  end
-
-  def self.create_normal(name, availability_zone, size)
-    CfEbsVolume.new(name, availability_zone, {:size => size}) 
-  end
-  
-  def self.create_piops(name, availability_zone, size, iops)
-    CfEbsVolume.new(name, availability_zone, {:size => size, :volume_type => "io1", :iops => iops})
-  end
-  
-  def self.create_from_snapshot(name, availability_zone, snapshot_id)
-    CfEbsVolume.new(name, availability_zone, {:snapshot_id => snapshot_id})
-  end
-  
-  def set_tags(tag_list)
-    @tag_list = tag_list 
-  end
-  
-  def set_deletion_policy(deletion_policy)
-    @deletion_policy = deletion_policy
-  end
-          
-  def get_cf_type
-    "AWS::EC2::Volume"
-  end
-  
-  def get_cf_attributes
-    result = super
-  end
-  
-  def get_cf_properties
-    result = {} 
-    result["AvailabilityZone"] = @availability_zone
-    result["Size"] = @size unless @size.nil?
-    result["VolumeType"] = @volume_type unless @volume_type.nil?
-    result["SnapshotId"] = @snapshot_id unless @snapshot_id.nil?
-    result["Iops"] = @iops unless @iops.nil?
-    result
-  end
-  
-end
-end
+require 'cf_factory/base/cf_base'
+module CfFactory
+class CfEbsVolume
+  include CfBase  
+  
+  def initialize(name, availability_zone, options = {})
+    @name = name
+    @availability_zone = availability_zone
+    
+    @size = options[:size]
+    @snapshot_id = options[:snapshot_id]
+    @iops = options[:iops]
+    @volume_type = options[:volume_type]
+    set_deletion_policy("Delete")
+  end
+
+  def self.create_normal(name, availability_zone, size)
+    CfEbsVolume.new(name, availability_zone, {:size => size}) 
+  end
+  
+  def self.create_piops(name, availability_zone, size, iops)
+    CfEbsVolume.new(name, availability_zone, {:size => size, :volume_type => "io1", :iops => iops})
+  end
+  
+  def self.create_from_snapshot(name, availability_zone, snapshot_id)
+    CfEbsVolume.new(name, availability_zone, {:snapshot_id => snapshot_id})
+  end
+  
+  def set_tags(tag_list)
+    @tag_list = tag_list 
+  end
+  
+  def set_deletion_policy(deletion_policy)
+    @deletion_policy = deletion_policy
+  end
+          
+  def get_cf_type
+    "AWS::EC2::Volume"
+  end
+  
+  def get_cf_attributes
+    result = super
+  end
+  
+  def get_cf_properties
+    result = {} 
+    result["AvailabilityZone"] = @availability_zone
+    result["Size"] = @size unless @size.nil?
+    result["VolumeType"] = @volume_type unless @volume_type.nil?
+    result["SnapshotId"] = @snapshot_id unless @snapshot_id.nil?
+    result["Iops"] = @iops unless @iops.nil?
+    result
+  end
+  
+end
+end

data/lib/cf_factory/ec2/cf_ec2_instance.rb

@@ -1,66 +1,80 @@
-require 'cf_factory/base/cf_base'
-module CfFactory
-class CfEc2Instance
-  SUPPORTED_TYPES = ["t1.micro","m1.small","m1.medium","m1.large","m1.xlarge",
-    "m2.xlarge","m2.2xlarge","m2.4xlarge","m3.xlarge","m3.2xlarge","c1.medium", "c1.xlarge",
-    "cc1.4xlarge","cc2.8xlarge", "cg1.4xlarge", "hi1.4xlarge"]
-  include CfBase  
-  
-  def initialize(name, image_id, instance_type, options = {})
-    @name = name
-    @image_id = image_id
-    @instance_type = instance_type
-    @keyname = options[:keyname]
-    @subnet = options[:subnet]
-    @vpc_security_groups = options[:vpc_security_groups]
-    @security_groups = options[:security_groups]      
-    @source_dest_check = options[:source_dest_check]
-    @user_data = options[:user_data]
-    @availability_zone = options[:availability_zone]
-    validate()
-  end
-
-  def set_tags(tag_list)
-    @tag_list = tag_list 
-  end
-    
-  def set_deletion_policy(deletion_policy)
-    @deletion_policy = deletion_policy
-  end
-          
-  def get_cf_type
-    "AWS::EC2::Instance"
-  end
-  
-  def get_cf_attributes
-    result = super
-  end
-  
-  def get_cf_properties
-    result = {"ImageId" => CfHelper.clean(@image_id),
-      "InstanceType" => @instance_type,
-    }
-    result["KeyName"] = @keyname  unless @keyname.nil?
-    result["SubnetId"] = @subnet.generate_ref unless @subnet.nil?
-    result["SecurityGroupIds"] = CfHelper.generate_ref_array(@vpc_security_groups) unless @vpc_security_groups.nil?
-    result["SecurityGroups"] = CfHelper.generate_ref_array(@security_groups) unless @security_groups.nil?      
-    result["SourceDestCheck"] = @source_dest_check unless @source_dest_check.nil?
-    result["UserData"] = CfHelper.base64(@user_data) unless @user_data.nil? 
-    result["AvailabilityZone"] = @availability_zone unless @availability_zone.nil?
-    result
-  end
-
-  def assign_eip
-    #TODo
-  end
-  
-  private
-  
-  def validate
-    unless @instance_type.include?("Ref")
-      raise Exception.new("instance type not supported #{@instance_type}") unless SUPPORTED_TYPES.include?(@instance_type)      
-    end    
-  end
-  
-end
-end
+require 'cf_factory/base/cf_base'
+module CfFactory
+class CfEc2Instance
+  SUPPORTED_TYPES = ["t1.micro","m1.small","m1.medium","m1.large","m1.xlarge",
+    "m2.xlarge","m2.2xlarge","m2.4xlarge","m3.xlarge","m3.2xlarge","c1.medium", "c1.xlarge",
+    "cc1.4xlarge","cc2.8xlarge", "cg1.4xlarge", "hi1.4xlarge"]
+  include CfBase  
+  
+  def initialize(name, image_id, instance_type, options = {})
+    @name = name
+    @image_id = image_id
+    @instance_type = instance_type
+    @keyname = options[:keyname]
+    @subnet = options[:subnet]
+    @vpc_security_groups = options[:vpc_security_groups]
+    @security_groups = options[:security_groups]      
+    @source_dest_check = options[:source_dest_check]
+    @user_data = options[:user_data]
+    @availability_zone = options[:availability_zone]
+    @network_interfaces = options[:network_interfaces]
+    validate()
+  end
+
+  def set_tags(tag_list)
+    @tag_list = tag_list 
+  end
+    
+  def set_deletion_policy(deletion_policy)
+    @deletion_policy = deletion_policy
+  end
+          
+  def get_cf_type
+    "AWS::EC2::Instance"
+  end
+  
+  def get_cf_attributes
+    result = super
+  end
+  
+  def get_cf_properties
+    result = {"ImageId" => CfHelper.clean(@image_id),
+      "InstanceType" => @instance_type,
+    }
+    result["KeyName"] = @keyname  unless @keyname.nil?
+    result["SubnetId"] = @subnet.generate_ref unless @subnet.nil?
+    result["SecurityGroupIds"] = CfHelper.generate_ref_array(@vpc_security_groups) unless @vpc_security_groups.nil?
+    result["SecurityGroups"] = CfHelper.generate_ref_array(@security_groups) unless @security_groups.nil?      
+    result["SourceDestCheck"] = @source_dest_check unless @source_dest_check.nil?
+    result["UserData"] = CfHelper.base64(@user_data) unless @user_data.nil? 
+    result["AvailabilityZone"] = @availability_zone unless @availability_zone.nil?
+    if !@network_interfaces.nil? && @network_interfaces.size > 0
+      nics = []
+      index = 0
+      @network_interfaces.each() {|nic|
+        nics << CfFactory::CfInnerNetworkInterface.new(nic, index)
+        index += 1
+      }
+      result["NetworkInterfaces"] = CfHelper.generate_inner_array(nics)
+    end
+    result
+  end
+
+  def assign_eip
+    #TODo
+  end
+  
+  private
+  
+  def validate
+    unless @instance_type.include?("Ref")
+      raise Exception.new("instance type not supported #{@instance_type}") unless SUPPORTED_TYPES.include?(@instance_type)      
+    end    
+    unless @network_interfaces.nil?
+      raise Exception.new("no security group allowed when ENI specified") unless @security_groups.nil?
+      raise Exception.new("no subnet allowed when ENI specified") unless @subnet.nil?
+    end
+  end
+  
+end
+end

data/lib/cf_factory/ec2/cf_ec2_security_group.rb

@@ -1,42 +1,42 @@
-require 'cf_factory/base/cf_base'
-module CfFactory
-class CfEc2SecurityGroup
-  include CfBase  
-  
-  def initialize(name, description, vpc = nil)
-    @name = name
-    @description = description
-    @vpc = vpc
-    @ingress_rules = []
-    @egress_rules = []
-      #TODO: already check name/description for invalid characters
-  end
-  
-  def get_cf_type
-    "AWS::EC2::SecurityGroup"
-  end
-  
-  def get_cf_attributes
-    {}
-  end
-  
-  def get_cf_properties
-    result = {"GroupDescription" => @description}
-    result["VpcId"] = @vpc.generate_ref unless @vpc.nil?
-    ingress = CfHelper.generate_inner_array(@ingress_rules)
-    result["SecurityGroupIngress"] = ingress unless @ingress_rules.size == 0
-    egress = CfHelper.generate_inner_array(@egress_rules)
-    result["SecurityGroupEgress"] = egress unless @egress_rules.size == 0
-    result
-  end
-  
-  def add_ingress_rule(ingress_rule)
-    @ingress_rules << ingress_rule
-  end
-  
-  def add_egress_rule(egress_rule)
-    @egress_rules << egress_rule
-  end
-  
-end
-end
+require 'cf_factory/base/cf_base'
+module CfFactory
+class CfEc2SecurityGroup
+  include CfBase  
+  
+  def initialize(name, description, vpc = nil)
+    @name = name
+    @description = description
+    @vpc = vpc
+    @ingress_rules = []
+    @egress_rules = []
+      #TODO: already check name/description for invalid characters
+  end
+  
+  def get_cf_type
+    "AWS::EC2::SecurityGroup"
+  end
+  
+  def get_cf_attributes
+    {}
+  end
+  
+  def get_cf_properties
+    result = {"GroupDescription" => @description}
+    result["VpcId"] = @vpc.generate_ref unless @vpc.nil?
+    ingress = CfHelper.generate_inner_array(@ingress_rules)
+    result["SecurityGroupIngress"] = ingress unless @ingress_rules.size == 0
+    egress = CfHelper.generate_inner_array(@egress_rules)
+    result["SecurityGroupEgress"] = egress unless @egress_rules.size == 0
+    result
+  end
+  
+  def add_ingress_rule(ingress_rule)
+    @ingress_rules << ingress_rule
+  end
+  
+  def add_egress_rule(egress_rule)
+    @egress_rules << egress_rule
+  end
+  
+end
+end

data/lib/cf_factory/ec2/cf_ec2_security_group_egress.rb

@@ -1,30 +1,30 @@
-require 'cf_factory/base/cf_inner'
-
-module CfFactory
-class CfEc2SecurityGroupEgress
-  include CfInner
-    
-  def additional_indent
-    2
-  end  
-  
-  def initialize(ip_protocol, from_port, to_port, cidr = nil, dest_group = nil)
-    @ip_protocol = ip_protocol
-    @from_port = from_port
-    @to_port = to_port
-    @cidr = cidr
-    @dest_group = dest_group 
-  end
-  
-  def get_cf_attributes
-    result = {}
-    result["CidrIp"] = @cidr unless @cidr.nil?
-    result["DestinationSecurityGroupId"] = @dest_group.generate_ref unless @dest_group.nil?
-    result["FromPort"] = @from_port
-    result["ToPort"] = @to_port
-    result["IpProtocol"] = @ip_protocol
-    result
-  end
-  
-end
-end
+require 'cf_factory/base/cf_inner'
+
+module CfFactory
+class CfEc2SecurityGroupEgress
+  include CfInner
+    
+  def additional_indent
+    2
+  end  
+  
+  def initialize(ip_protocol, from_port, to_port, cidr = nil, dest_group = nil)
+    @ip_protocol = ip_protocol
+    @from_port = from_port
+    @to_port = to_port
+    @cidr = cidr
+    @dest_group = dest_group 
+  end
+  
+  def get_cf_attributes
+    result = {}
+    result["CidrIp"] = @cidr unless @cidr.nil?
+    result["DestinationSecurityGroupId"] = @dest_group.generate_ref unless @dest_group.nil?
+    result["FromPort"] = @from_port
+    result["ToPort"] = @to_port
+    result["IpProtocol"] = @ip_protocol
+    result
+  end
+  
+end
+end

data/lib/cf_factory/ec2/cf_ec2_security_group_ingress.rb

@@ -1,41 +1,41 @@
-require 'cf_factory/base/cf_inner'
-
-module CfFactory
-class CfEc2SecurityGroupIngress
-  include CfInner
-    
-  def additional_indent
-    2
-  end  
-
-  def initialize(ip_protocol, from_port, to_port, cidr = nil, source_group = nil, options = {})
-    @ip_protocol = ip_protocol
-    @from_port = from_port
-    @to_port = to_port
-    @cidr = cidr
-    @source_group = source_group
-    @source_group_owner_id = options[:source_group_owner_id]
-    @use_sg_id = true
-  end
-  
-  def set_use_sg_id(flag)
-    @use_sg_id = flag
-  end
-  
-  def get_cf_attributes
-    result = {}
-    result["CidrIp"] = @cidr unless @cidr.nil?
-    if @use_sg_id
-      result["SourceSecurityGroupId"] = @source_group.generate_ref unless @source_group.nil?
-    else
-      result["SourceSecurityGroupName"] = @source_group.generate_ref unless @source_group.nil?      
-    end      
-    result["SourceSecurityGroupOwnerId"] = @source_group_owner_id unless @source_group_owner_id.nil?
-    result["FromPort"] = @from_port
-    result["ToPort"] = @to_port
-    result["IpProtocol"] = @ip_protocol
-    result
-  end
-  
-end
-end
+require 'cf_factory/base/cf_inner'
+
+module CfFactory
+class CfEc2SecurityGroupIngress
+  include CfInner
+    
+  def additional_indent
+    2
+  end  
+
+  def initialize(ip_protocol, from_port, to_port, cidr = nil, source_group = nil, options = {})
+    @ip_protocol = ip_protocol
+    @from_port = from_port
+    @to_port = to_port
+    @cidr = cidr
+    @source_group = source_group
+    @source_group_owner_id = options[:source_group_owner_id]
+    @use_sg_id = true
+  end
+  
+  def set_use_sg_id(flag)
+    @use_sg_id = flag
+  end
+  
+  def get_cf_attributes
+    result = {}
+    result["CidrIp"] = @cidr unless @cidr.nil?
+    if @use_sg_id
+      result["SourceSecurityGroupId"] = @source_group.generate_ref unless @source_group.nil?
+    else
+      result["SourceSecurityGroupName"] = @source_group.generate_ref unless @source_group.nil?      
+    end      
+    result["SourceSecurityGroupOwnerId"] = @source_group_owner_id unless @source_group_owner_id.nil?
+    result["FromPort"] = @from_port
+    result["ToPort"] = @to_port
+    result["IpProtocol"] = @ip_protocol
+    result
+  end
+  
+end
+end

data/lib/cf_factory/ec2/cf_eip.rb

@@ -1,28 +1,28 @@
-require 'cf_factory/base/cf_base'
-module CfFactory
-class CfEip
-  include CfBase  
-  
-  def initialize(name, instance = nil, is_vpc = false)
-    @name = name
-    @instance = instance
-    @domain = is_vpc ? "vpc" : nil
-  end
-  
-  def get_cf_type
-    "AWS::EC2::EIP"
-  end
-  
-  def get_cf_attributes
-    {}
-  end
-  
-  def get_cf_properties
-    result = {}
-    result["InstanceId"] = @instance.generate_ref unless @instance.nil?      
-    result["Domain"] = @domain unless @domain.nil?
-    result
-  end
-
-end
-end
+require 'cf_factory/base/cf_base'
+module CfFactory
+class CfEip
+  include CfBase  
+  
+  def initialize(name, instance = nil, is_vpc = false)
+    @name = name
+    @instance = instance
+    @domain = is_vpc ? "vpc" : nil
+  end
+      
+  def get_cf_type
+    "AWS::EC2::EIP"
+  end
+  
+  def get_cf_attributes
+    {}
+  end
+  
+  def get_cf_properties
+    result = {}
+    result["InstanceId"] = @instance.generate_ref unless @instance.nil?      
+    result["Domain"] = @domain unless @domain.nil?
+    result
+  end
+
+end
+end

data/lib/cf_factory/ec2/cf_eip_association.rb

@@ -1,31 +1,33 @@
-require 'cf_factory/base/cf_base'
-
-module CfFactory
-class CfEipAssociation
-  include CfBase
-    
-  def initialize(name, eip, instance, network_interface, is_vpc = false) #TODO: network interface
-    @name = name
-    @eip = eip      
-    @instance = instance
-    @is_vpc = is_vpc
-  end
-  
-  def get_cf_type
-    "AWS::EC2::EIPAssociation"
-  end
-  
-  def get_cf_attributes
-    {}
-  end
-  
-  def get_cf_properties
-    result = {}
-    result["InstanceId"] = @instance.generate_ref unless @instance.nil?
-    result["EIP"] = @eip.generate_ref unless @is_vpc
-    result["AllocationId"] = @eip.retrieve_attribute("AllocationId") if @is_vpc
-    result
-  end
-  
-end
-end
+require 'cf_factory/base/cf_base'
+
+module CfFactory
+class CfEipAssociation
+  include CfBase
+    
+  def initialize(name, options = {})
+    @name = name
+    @eip = options[:eip]      
+    @instance = options[:instance]
+    @network_interface = options[:network_interface]
+    @is_vpc = options[:is_vpc] || false
+  end
+  
+  def get_cf_type
+    "AWS::EC2::EIPAssociation"
+  end
+  
+  def get_cf_attributes
+    {}
+  end
+  
+  def get_cf_properties
+    result = {}
+    result["InstanceId"] = @instance.generate_ref unless @instance.nil?
+    result["EIP"] = @eip.generate_ref unless @is_vpc
+    result["AllocationId"] = @eip.retrieve_attribute("AllocationId") if @is_vpc
+    result["NetworkInterfaceId"] = @network_interface.generate_ref unless @network_interface.nil?
+    result
+  end
+  
+end
+end

data/lib/cf_factory/ec2/cf_inner_network_interface.rb

@@ -0,0 +1,26 @@
+require 'cf_factory/base/cf_inner'
+
+module CfFactory
+class CfInnerNetworkInterface
+  include CfInner
+    
+  def additional_indent
+    2
+  end  
+
+  def initialize(network_interface, device_index, options = {})
+    @network_interface = network_interface
+    @device_index = device_index
+    @delete_on_termination = options[:delete_on_termination]
+  end
+    
+  def get_cf_attributes
+    result = {}
+    result["NetworkInterfaceId"] = @network_interface.generate_ref
+    result["DeviceIndex"] = @device_index
+    result["DeleteOnTermination"] = @delete_on_termination unless @delete_on_termination.nil? 
+    result
+  end
+  
+end
+end