fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

data/lib/fog/aws/models/compute/network_acl.rb

@@ -0,0 +1,170 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class AWS
+
+      class NetworkAcl < Fog::Model
+        ICMP = 1
+        TCP  = 6
+        UDP  = 17
+
+        identity  :network_acl_id, :aliases => 'networkAclId'
+        attribute :vpc_id,         :aliases => 'vpcId'
+        attribute :default
+        attribute :entries,        :aliases => 'entrySet'
+        attribute :associations,   :aliases => 'associationSet'
+        attribute :tags,           :aliases => 'tagSet'
+
+        # Add an inbound rule, shortcut method for #add_rule
+        def add_inbound_rule(rule_number, protocol, rule_action, cidr_block, options = {})
+          add_rule(rule_number, protocol, rule_action, cidr_block, false, options)
+        end
+
+        # Add an outbound rule, shortcut method for #add_rule
+        def add_outbound_rule(rule_number, protocol, rule_action, cidr_block, options = {})
+          add_rule(rule_number, protocol, rule_action, cidr_block, true, options)
+        end
+
+        # Add a new rule
+        #
+        # network_acl.add_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', true, 'PortRange.From' => 22, 'PortRange.To' => 22)
+        #
+        # ==== Parameters
+        # * rule_number<~Integer>   - The rule number for the entry, between 100 and 32766
+        # * protocol<~Integer>      - The IP protocol to which the rule applies. You can use -1 to mean all protocols.
+        # * rule_action<~String>    - Allows or denies traffic that matches the rule. (either allow or deny)
+        # * cidr_block<~String>     - The CIDR range to allow or deny
+        # * egress<~Boolean>        - Indicates whether this rule applies to egress traffic from the subnet (true) or ingress traffic to the subnet (false).
+        # * options<~Hash>:
+        # *   'Icmp.Code'           - ICMP code, required if protocol is 1
+        # *   'Icmp.Type'           - ICMP type, required if protocol is 1
+        # *   'PortRange.From'      - The first port in the range, required if protocol is 6 (TCP) or 17 (UDP)
+        # *   'PortRange.To'        - The last port in the range, required if protocol is 6 (TCP) or 17 (UDP)
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def add_rule(rule_number, protocol, rule_action, cidr_block, egress, options = {})
+          requires :network_acl_id
+
+          service.create_network_acl_entry(network_acl_id, rule_number, protocol, rule_action, cidr_block, egress, options)
+          true
+        end
+
+        # Remove an inbound rule, shortcut method for #remove_rule
+        def remove_inbound_rule(rule_number)
+          remove_rule(rule_number, false)
+        end
+
+        # Remove an outbound rule, shortcut method for #remove_rule
+        def remove_outbound_rule(rule_number)
+          remove_rule(rule_number, true)
+        end
+
+        # Update a specific rule number
+        #
+        # network_acl.remove_rule(100, true)
+        #
+        # ==== Parameters
+        # * rule_number<~Integer>   - The rule number for the entry, between 100 and 32766
+        # * egress<~Boolean>        - Indicates whether this rule applies to egress traffic from the subnet (true) or ingress traffic to the subnet (false).
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def remove_rule(rule_number, egress)
+          requires :network_acl_id
+
+          service.delete_network_acl_entry(network_acl_id, rule_number, egress)
+          true
+        end
+
+        # Update an inbound rule, shortcut method for #update_rule
+        def update_inbound_rule(rule_number, protocol, rule_action, cidr_block, options = {})
+          update_rule(rule_number, protocol, rule_action, cidr_block, false, options)
+        end
+
+        # Update an outbound rule, shortcut method for #update_rule
+        def update_outbound_rule(rule_number, protocol, rule_action, cidr_block, options = {})
+          update_rule(rule_number, protocol, rule_action, cidr_block, true, options)
+        end
+
+        # Update a specific rule number
+        #
+        # network_acl.update_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', true, 'PortRange.From' => 22, 'PortRange.To' => 22)
+        #
+        # ==== Parameters
+        # * rule_number<~Integer>   - The rule number for the entry, between 100 and 32766
+        # * protocol<~Integer>      - The IP protocol to which the rule applies. You can use -1 to mean all protocols.
+        # * rule_action<~String>    - Allows or denies traffic that matches the rule. (either allow or deny)
+        # * cidr_block<~String>     - The CIDR range to allow or deny
+        # * egress<~Boolean>        - Indicates whether this rule applies to egress traffic from the subnet (true) or ingress traffic to the subnet (false).
+        # * options<~Hash>:
+        # *   'Icmp.Code'           - ICMP code, required if protocol is 1
+        # *   'Icmp.Type'           - ICMP type, required if protocol is 1
+        # *   'PortRange.From'      - The first port in the range, required if protocol is 6 (TCP) or 17 (UDP)
+        # *   'PortRange.To'        - The last port in the range, required if protocol is 6 (TCP) or 17 (UDP)
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def update_rule(rule_number, protocol, rule_action, cidr_block, egress, options = {})
+          requires :network_acl_id
+
+          service.replace_network_acl_entry(network_acl_id, rule_number, protocol, rule_action, cidr_block, egress, options)
+          true
+        end
+
+        # Associate a subnet with this network ACL
+        #
+        # network_acl.associate_with(subnet)
+        #
+        # ==== Parameters
+        # * subnet<~Subnet> - Subnet object to associate with this network ACL
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def associate_with(subnet)
+          requires :network_acl_id
+
+          # We have to manually find out the network ACL the subnet is currently associated with
+          old_id = service.network_acls.all('association.subnet-id' => subnet.subnet_id).first.associations.detect { |a| a['subnetId'] == subnet.subnet_id }['networkAclAssociationId']
+          service.replace_network_acl_association(old_id, network_acl_id)
+          true
+        end
+
+        # Removes an existing network ACL
+        #
+        # network_acl.destroy
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def destroy
+          requires :network_acl_id
+
+          service.delete_network_acl(network_acl_id)
+          true
+        end
+
+        # Create a network ACL
+        #
+        #  >> g = AWS.network_acls.new(:vpc_id => 'vpc-abcdefgh')
+        #  >> g.save
+        def save
+          requires :vpc_id
+          data = service.create_network_acl(vpc_id).body['networkAcl']
+          merge_attributes(data)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/compute/network_acls.rb

@@ -0,0 +1,138 @@
+require 'fog/core/collection'
+require 'fog/aws/models/compute/network_acl'
+
+module Fog
+  module Compute
+    class AWS
+
+      class NetworkAcls < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Compute::AWS::NetworkAcl
+
+        # Creates a new network ACL
+        #
+        # AWS.network_acls.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new network ACL
+        #
+        #>> <Fog::Compute::AWS::NetworkAcl
+        #     network_acl_id=nil,
+        #     vpc_id=nil,
+        #     default=nil,
+        #     entries=nil,
+        #     associations=nil,
+        #     tags=nil
+        # >
+        #
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        # Returns an array of all network ACLs that have been created
+        #
+        # AWS.network_acls.all
+        #
+        # ==== Returns
+        #
+        # Returns an array of all network ACLs
+        #
+        #>> AWS.network_acls.all
+        #  <Fog::AWS::Compute::NetworkAcls
+        #    filters={}
+        #    [
+        #      <Fog::Compute::AWS::NetworkAcl
+        #        network_acl_id="acl-abcdefgh",
+        #        vpc_id="vpc-abcdefgh",
+        #        default=true,
+        #        entries=[
+        #          {
+        #            "icmpTypeCode" => {},
+        #            "portRange"    => {},
+        #            "ruleNumber"   => 32767,
+        #            "protocol"     => -1,
+        #            "ruleAction"   => "deny",
+        #            "egress"       => false,
+        #            "cidrBlock"    => "0.0.0.0/0"
+        #          },
+        #          {
+        #            "icmpTypeCode" => {},
+        #            "portRange"    => {},
+        #            "ruleNumber"   => 32767,
+        #            "protocol"     => -1,
+        #            "ruleAction"   => "deny",
+        #            "egress"       => true,
+        #            "cidrBlock"    => "0.0.0.0/0"
+        #          }
+        #        ],
+        #        associations=[
+        #          {
+        #            "networkAclAssociationId" => "aclassoc-abcdefgh",
+        #            "networkAclId"            => "acl-abcdefgh",
+        #            "subnetId"                => "subnet-abcdefgh"
+        #          }
+        #        ],
+        #        tags={}
+        #      >
+        #    ]
+        #  >
+        #
+        def all(filters = filters)
+          self.filters = filters
+          data = service.describe_network_acls(filters).body
+          load(data['networkAclSet'])
+        end
+
+        # Used to retrieve a network interface
+        # network interface id is required to get any information
+        #
+        # You can run the following command to get the details:
+        # AWS.network_interfaces.get("eni-11223344")
+        #
+        # ==== Returns
+        #
+        #>> AWS.network_acls.get("acl-abcdefgh")
+        #  <Fog::Compute::AWS::NetworkAcl
+        #    network_acl_id="acl-abcdefgh",
+        #    vpc_id="vpc-abcdefgh",
+        #    default=true,
+        #    entries=[
+        #      {
+        #        "icmpTypeCode" => {},
+        #        "portRange"    => {},
+        #        "ruleNumber"   => 32767,
+        #        "protocol"     => -1,
+        #        "ruleAction"   => "deny",
+        #        "egress"       => false,
+        #        "cidrBlock"    => "0.0.0.0/0"
+        #      },
+        #      {
+        #        "icmpTypeCode" => {},
+        #        "portRange"    => {},
+        #        "ruleNumber"   => 32767,
+        #        "protocol"     => -1,
+        #        "ruleAction"   => "deny",
+        #        "egress"       => true,
+        #        "cidrBlock"    => "0.0.0.0/0"
+        #      }
+        #    ],
+        #    associations=[
+        #      {
+        #        "networkAclAssociationId" => "aclassoc-abcdefgh",
+        #        "networkAclId"            => "acl-abcdefgh",
+        #        "subnetId"                => "subnet-abcdefgh"
+        #      }
+        #    ],
+        #    tags={}
+        #  >
+        def get(nacl_id)
+          self.class.new(:service => service).all('network-acl-id' => nacl_id).first if nacl_id
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/compute/server.rb

@@ -210,7 +210,7 @@ module Fog
         end
 
         def setup(credentials = {})
-          requires :public_ip_address, :username
+          requires :ssh_ip_address, :username
           require 'net/ssh'
 
           commands = [
@@ -225,7 +225,7 @@ module Fog
           # wait for aws to be ready
           wait_for { sshable?(credentials) }
 
-          Fog::SSH.new(public_ip_address, username, credentials).run(commands)
+          Fog::SSH.new(ssh_ip_address, username, credentials).run(commands)
         end
 
         def start

data/lib/fog/aws/models/compute/servers.rb

@@ -84,9 +84,14 @@ module Fog
               )
             end
           end
-
-          # make sure port 22 is open in the first security group
+        
           security_group = service.security_groups.get(server.groups.first)
+          if security_group.nil?
+            raise Fog::Compute::AWS::Error, "The security group" \
+              " #{server.groups.first} doesn't exist."
+          end
+          
+          # make sure port 22 is open in the first security group
           authorized = security_group.ip_permissions.detect do |ip_permission|
             ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
             ip_permission['fromPort'] == 22 &&

data/lib/fog/aws/models/compute/subnet.rb

@@ -42,14 +42,14 @@ module Fog
         #
         # == Returns:
         #
-        # requestId and a subnetSet object
+        # requestId and a subnet object
         #
 
         def save
           requires :vpc_id, :cidr_block
           options = {}
           options['AvailabilityZone'] = availability_zone if availability_zone
-          data = service.create_subnet(vpc_id, cidr_block, options).body['subnetSet'].first
+          data = service.create_subnet(vpc_id, cidr_block, options).body['subnet']
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true

data/lib/fog/aws/models/elasticache/cluster.rb

@@ -28,6 +28,10 @@ module Fog
           :aliases => 'CacheSecurityGroups', :type => :array
         attribute :notification_config,
           :aliases => 'NotificationConfiguration', :type => :hash
+        attribute :cache_subnet_group_name,
+          :aliases => 'CacheSubnetGroupName'
+        attribute :vpc_security_groups,
+          :aliases => 'VpcSecurityGroups', :type => :array
 
         attr_accessor :parameter_group_name
 
@@ -60,6 +64,8 @@ module Fog
               :preferred_availablility_zone => zone,
               :preferred_maintenance_window => maintenance_window,
               :parameter_group_name         => parameter_group_name || parameter_group['CacheParameterGroupName'],
+              :cache_subnet_group_name      => cache_subnet_group_name,
+              :vpc_security_groups          => vpc_security_groups,
             }
           )
         end

data/lib/fog/aws/models/elasticache/subnet_group.rb

@@ -0,0 +1,35 @@
+require 'fog/core/model'
+
+module Fog
+  module AWS
+    class Elasticache
+
+      class SubnetGroup < Fog::Model
+
+        identity   :id, :aliases => ['CacheSubnetGroupName', :name]
+        attribute  :description, :aliases => 'CacheSubnetGroupDescription'
+        attribute  :vpc_id, :aliases => 'VpcId'
+        attribute  :subnet_ids, :aliases => 'Subnets'
+
+        def ready?
+          # Just returning true, as Elasticache subnet groups
+          # seem to not have a status, unlike RDS subnet groups.
+          true
+        end
+
+        def save
+          requires :description, :id, :subnet_ids
+          service.create_cache_subnet_group(id, subnet_ids, description)
+          reload
+        end
+
+        def destroy
+          requires :id
+          service.delete_cache_subnet_group(id)
+          true
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/elasticache/subnet_groups.rb

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/aws/models/elasticache/subnet_group'
+
+module Fog
+  module AWS
+    class Elasticache
+
+      class SubnetGroups < Fog::Collection
+
+        model Fog::AWS::Elasticache::SubnetGroup
+
+        def all
+          data = service.describe_cache_subnet_groups.body['DescribeCacheSubnetGroupsResult']['CacheSubnetGroups']
+          load(data) # data is an array of attribute hashes
+        end
+
+        def get(identity)
+          data = service.describe_cache_subnet_groups(identity).body['DescribeCacheSubnetGroupsResult']['CacheSubnetGroups'].first
+          new(data) # data is an attribute hash
+        rescue Fog::AWS::Elasticache::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end