right_aws 1.8.1 → 1.9.0

data/lib/awsbase/right_awsbase.rb

@@ -120,7 +120,7 @@ module RightAws
     def self.caching=(caching)
       @@caching = caching
     end
-    
+
       # Current aws_access_key_id
     attr_reader :aws_access_key_id
       # Last HTTP request object
@@ -175,10 +175,13 @@ module RightAws
     def cache_hits?(function, response, do_raise=:raise)
       result = false
       if caching?
-        function     = function.to_sym
+        function = function.to_sym
+        # get rid of requestId (this bad boy was added for API 2008-08-08+ and it is uniq for every response)
+        response = response.sub(%r{<requestId>.+?</requestId>}, '')
         response_md5 = MD5.md5(response).to_s
-        # well, the response is new, reset cache data
+        # check for changes
         unless @cache[function] && @cache[function][:response_md5] == response_md5
+          # well, the response is new, reset cache data
           update_cache(function, {:response_md5 => response_md5, 
                                   :timestamp    => Time.now, 
                                   :hits         => 0, 
@@ -282,6 +285,27 @@ module RightAws
       raise
     end
 
+    def request_cache_or_info(method, link, parser_class, benchblock, use_cache=true) #:nodoc:
+      # We do not want to break the logic of parsing hence will use a dummy parser to process all the standard
+      # steps (errors checking etc). The dummy parser does nothig - just returns back the params it received.
+      # If the caching is enabled and hit then throw  AwsNoChange.
+      # P.S. caching works for the whole images list only! (when the list param is blank)
+      # check cache
+      response, params = request_info(link, RightDummyParser.new)
+      cache_hits?(method.to_sym, response.body) if use_cache
+      parser = parser_class.new(:logger => @logger)
+      benchblock.xml.add!{ parser.parse(response, params) }
+      result = block_given? ? yield(parser) : parser.result
+      # update parsed data
+      update_cache(method.to_sym, :parsed => result) if use_cache
+      result
+    end
+
+    # Returns Amazons request ID for the latest request
+    def last_request_id
+      @last_response && @last_response.body.to_s[%r{<requestId>(.+?)</requestId>}] && $1
+    end
+
   end
 
 
@@ -674,5 +698,20 @@ module RightAws
     end
   end
 
+  # Dummy parser - does nothing
+  # Returns the original params back
+  class RightDummyParser  # :nodoc:
+    attr_accessor :result
+    def parse(response, params={})
+      @result = [response, params]
+    end
+  end
+
+  class RightHttp2xxParser < RightAWSParser # :nodoc:
+    def parse(response)
+      @result = response.is_a?(Net::HTTPSuccess)
+    end
+  end
+
 end
 

data/lib/ec2/right_ec2.rb

@@ -68,7 +68,7 @@ module RightAws
     include RightAwsBaseInterface
     
     # Amazon EC2 API version being used
-    API_VERSION       = "2008-05-05"
+    API_VERSION       = "2008-08-08"
     DEFAULT_HOST      = "ec2.amazonaws.com"
     DEFAULT_PATH      = '/'
     DEFAULT_PROTOCOL  = 'https'
@@ -106,6 +106,10 @@ module RightAws
     # * <tt>:multi_thread</tt>: true=HTTP connection per thread, false=per process
     # * <tt>:logger</tt>: for log messages, default: RAILS_DEFAULT_LOGGER else STDOUT
     # * <tt>:signature_version</tt>:  The signature version : '0' or '1'(default)
+    # * <tt>:cache</tt>: true/false: caching for: ec2_describe_images, describe_instances,
+    # describe_images_by_owner, describe_images_by_executable_by, describe_availability_zones,
+    # describe_security_groups, describe_key_pairs, describe_addresses, 
+    # describe_volumes, describe_snapshots methods, default: false.
     #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
       init({ :name             => 'EC2', 
@@ -126,7 +130,7 @@ module RightAws
                       "Timestamp"         => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S.000Z"),
                       "SignatureVersion"  => signature_version }
       service_hash.update(params)
-      # prepare string to sight
+      # prepare string to sign
       string_to_sign = case signature_version
                        when '0' then service_hash["Action"] + service_hash["Timestamp"]
                        when '1' then service_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
@@ -149,22 +153,6 @@ module RightAws
       request_info_impl(thread[:ec2_connection], @@bench, request, parser)
     end
 
-    def request_cache_or_info(method, link, parser_class, use_cache=true) #:nodoc:
-      # We do not want to break the logic of parsing hence will use a dummy parser to process all the standart 
-      # steps (errors checking etc). The dummy parser does nothig - just returns back the params it received.
-      # If the caching is enabled and hit then throw  AwsNoChange. 
-      # P.S. caching works for the whole images list only! (when the list param is blank)      response, params = request_info(link, QEc2DummyParser.new)
-      # check cache
-      response, params = request_info(link, QEc2DummyParser.new)
-      cache_hits?(method.to_sym, response.body) if use_cache
-      parser = parser_class.new(:logger => @logger)
-      @@bench.xml.add!{ parser.parse(response, params) }
-      result = block_given? ? yield(parser) : parser.result
-      # update parsed data
-      update_cache(method.to_sym, :parsed => result) if use_cache
-      result
-    end
-
     def hash_params(prefix, list) #:nodoc:
       groups = {}
       list.each_index{|i| groups.update("#{prefix}.#{i+1}"=>list[i])} if list
@@ -175,11 +163,19 @@ module RightAws
   #      Images
   #-----------------------------------------------------------------
 
-    def ec2_describe_images(list, list_by='ImageId', image_type=nil) #:nodoc:
-      request_hash = hash_params(list_by, list.to_a)
+    # params: 
+    #   { 'ImageId'      => ['id1', ..., 'idN'],
+    #     'Owner'        => ['self', ..., 'userN'],
+    #     'ExecutableBy' => ['self', 'all', ..., 'userN']
+    #   } 
+    def ec2_describe_images(params={}, image_type=nil, cache_for=nil) #:nodoc:
+      request_hash = {}
+      params.each do |list_by, list|
+        request_hash.merge! hash_params(list_by, list.to_a)
+      end
       request_hash['ImageType'] = image_type if image_type
       link = generate_request("DescribeImages", request_hash)
-      request_cache_or_info :describe_images, link,  QEc2DescribeImagesParser, (list.blank? && list_by == 'ImageId' && image_type.blank?)
+      request_cache_or_info cache_for, link,  QEc2DescribeImagesParser, @@bench, cache_for
     rescue Exception
       on_exception
     end
@@ -210,7 +206,9 @@ module RightAws
       #      :aws_image_type => "machine"}]
       #
     def describe_images(list=[], image_type=nil)
-      ec2_describe_images(list, 'ImageId', image_type)
+      list = list.to_a
+      cache_for = list.empty? && !image_type ? :describe_images : nil
+      ec2_describe_images({ 'ImageId' => list }, image_type, cache_for)
     end
 
       #
@@ -219,8 +217,10 @@ module RightAws
       #   ec2.describe_images_by_owner('522821470517')
       #   ec2.describe_images_by_owner('self')
       #
-    def describe_images_by_owner(list, image_type=nil)
-      ec2_describe_images(list, 'Owner', image_type)
+    def describe_images_by_owner(list=['self'], image_type=nil)
+      list = list.to_a
+      cache_for = list==['self'] && !image_type ? :describe_images_by_owner : nil
+      ec2_describe_images({ 'Owner' => list }, image_type, cache_for)
     end
 
       #
@@ -228,9 +228,12 @@ module RightAws
       #
       #   ec2.describe_images_by_executable_by('522821470517')
       #   ec2.describe_images_by_executable_by('self')
+      #   ec2.describe_images_by_executable_by('all')
       #
-    def describe_images_by_executable_by(list, image_type=nil)
-      ec2_describe_images(list, 'ExecutableBy', image_type)
+    def describe_images_by_executable_by(list=['self'], image_type=nil)
+      list = list.to_a
+      cache_for = list==['self'] && !image_type ? :describe_images_by_executable_by : nil
+      ec2_describe_images({ 'ExecutableBy' => list }, image_type, cache_for)
     end
 
 
@@ -398,7 +401,7 @@ module RightAws
       #
     def describe_instances(list=[])
       link = generate_request("DescribeInstances", hash_params('InstanceId',list.to_a))
-      request_cache_or_info(:describe_instances, link,  QEc2DescribeInstancesParser, list.blank?) do |parser|
+      request_cache_or_info(:describe_instances, link,  QEc2DescribeInstancesParser, @@bench, list.blank?) do |parser|
         get_desc_instances(parser.result)
       end
     rescue Exception
@@ -412,7 +415,7 @@ module RightAws
       #
     def confirm_product_instance(instance, product_code)
       link = generate_request("ConfirmProductInstance", { 'ProductCode' => product_code,
-                                                          'InstanceId'  => instance })
+                                'InstanceId'  => instance })
       request_info(link, QEc2ConfirmProductInstanceParser.new(:logger => @logger))
     end
     
@@ -573,7 +576,127 @@ module RightAws
     rescue Exception
       on_exception
     end
+
+  #-----------------------------------------------------------------
+  #      Instances: Windows addons
+  #-----------------------------------------------------------------
+  
+      # Get initial Windows Server setup password from an instance console output.
+      #
+      #  my_awesome_key = ec2.create_key_pair('my_awesome_key') #=>
+      #    {:aws_key_name    => "my_awesome_key",
+      #     :aws_fingerprint => "01:02:03:f4:25:e6:97:e8:9b:02:1a:26:32:4e:58:6b:7a:8c:9f:03",
+      #     :aws_material    => "-----BEGIN RSA PRIVATE KEY-----\nMIIEpQIBAAK...Q8MDrCbuQ=\n-----END RSA PRIVATE KEY-----"}
+      #
+      #  my_awesome_instance = ec2.run_instances('ami-a000000a',1,1,['my_awesome_group'],'my_awesome_key', 'WindowsInstance!!!') #=>
+      #   [{:aws_image_id       => "ami-a000000a",
+      #     :aws_instance_id    => "i-12345678",
+      #     ...
+      #     :aws_availability_zone => "us-east-1b"
+      #     }]
+      #
+      #  # wait until instance enters 'operational' state and get it's initial password
+      #
+      #  puts ec2.get_initial_password(my_awesome_instance[:aws_instance_id], my_awesome_key[:aws_material]) #=> "MhjWcgZuY6"
+      #
+    def get_initial_password(instance_id, private_key)
+      console_output = get_console_output(instance_id)
+      crypted_password = console_output[:aws_output][%r{<Password>(.+)</Password>}m] && $1
+      unless crypted_password
+        raise AwsError.new("Initial password was not found in console output for #{instance_id}")
+      else
+        OpenSSL::PKey::RSA.new(private_key).private_decrypt(Base64.decode64(crypted_password))
+      end
+    rescue Exception
+      on_exception
+    end
+
+    # Bundle a Windows image.
+    # Internally, it queues the bundling task and shuts down the instance.
+    # It then takes a snapshot of the Windows volume bundles it, and uploads it to
+    # S3. After bundling completes, Rightaws::Ec2#register_image may be used to
+    # register the new Windows AMI for subsequent launches.
+    #
+    #   ec2.bundle_instance('i-e3e24e8a', 'my-awesome-bucket', 'my-win-image-1') #=>
+    #    [{:aws_update_time => "2008-10-16T13:58:25.000Z",
+    #      :s3_bucket       => "kd-win-1",
+    #      :s3_prefix       => "win2pr",
+    #      :aws_state       => "pending",
+    #      :aws_id          => "bun-26a7424f",
+    #      :aws_instance_id => "i-878a25ee",
+    #      :aws_start_time  => "2008-10-16T13:58:02.000Z"}]
+    #
+    def bundle_instance(instance_id, s3_bucket, s3_prefix, 
+                        s3_owner_aws_access_key_id=nil, s3_owner_aws_secret_access_key=nil,
+                        s3_expires = S3Interface::DEFAULT_EXPIRES_AFTER,
+                        s3_upload_policy='ec2-bundle-read')
+      # S3 access and signatures
+      s3_owner_aws_access_key_id     ||= @aws_access_key_id
+      s3_owner_aws_secret_access_key ||= @aws_secret_access_key
+      s3_expires = Time.now.utc + s3_expires if s3_expires.is_a?(Fixnum) && (s3_expires < S3Interface::ONE_YEAR_IN_SECONDS)
+      # policy
+      policy = { 'expiration' => s3_expires.strftime('%Y-%m-%dT%H:%M:%SZ'),
+                 'conditions' => [ { 'bucket' => s3_bucket },
+                                   { 'acl'    => s3_upload_policy },
+                                   [ 'starts-with', '$key', s3_prefix ] ] }.to_json
+      policy64        = Base64.encode64(policy).gsub("\n","")
+      signed_policy64 = AwsUtils.sign(s3_owner_aws_secret_access_key, policy64)
+      # fill request params
+      params = { 'InstanceId'                       => instance_id,
+                 'Storage.S3.AWSAccessKeyId'        => s3_owner_aws_access_key_id,
+                 'Storage.S3.UploadPolicy'          => policy64,
+                 'Storage.S3.UploadPolicySignature' => signed_policy64,
+                 'Storage.S3.Bucket'                => s3_bucket,
+                 'Storage.S3.Prefix'                => s3_prefix,
+                 }
+      link = generate_request("BundleInstance", params)
+      request_info(link, QEc2BundleInstanceParser.new)
+    rescue Exception
+      on_exception
+    end
     
+      # Describe the status of the Windows AMI bundlings.
+      # If +list+ is omitted the returns the whole list of tasks.
+      #
+      #  ec2.describe_bundle_tasks(['bun-4fa74226']) #=>
+      #    [{:s3_bucket         => "my-awesome-bucket"
+      #      :aws_id            => "bun-0fa70206",
+      #      :s3_prefix         => "win1pr",
+      #      :aws_start_time    => "2008-10-14T16:27:57.000Z",
+      #      :aws_update_time   => "2008-10-14T16:37:10.000Z",
+      #      :aws_error_code    => "Client.S3Error",
+      #      :aws_error_message =>
+      #       "AccessDenied(403)- Invalid according to Policy: Policy Condition failed: [\"eq\", \"$acl\", \"aws-exec-read\"]",
+      #      :aws_state         => "failed",
+      #      :aws_instance_id   => "i-e3e24e8a"}]
+      #
+    def describe_bundle_tasks(list=[])
+      link = generate_request("DescribeBundleTasks", hash_params('BundleId', list.to_a))
+      request_info(link, QEc2DescribeBundleTasksParser.new)
+    rescue Exception
+      on_exception
+    end
+
+      # Cancel an in‐progress or pending bundle task by id.
+      #
+      #  ec2.cancel_bundle_task('bun-73a7421a') #=>
+      #   [{:s3_bucket         => "my-awesome-bucket"
+      #     :aws_id            => "bun-0fa70206",
+      #     :s3_prefix         => "win02",
+      #     :aws_start_time    => "2008-10-14T13:00:29.000Z",
+      #     :aws_error_message => "User has requested bundling operation cancellation",
+      #     :aws_state         => "failed",
+      #     :aws_update_time   => "2008-10-14T13:01:31.000Z",
+      #     :aws_error_code    => "Client.Cancelled",
+      #     :aws_instance_id   => "i-e3e24e8a"}
+      #
+    def cancel_bundle_task(bundle_id)
+      link = generate_request("CancelBundleTask", { 'BundleId' => bundle_id })
+      request_info(link, QEc2BundleInstanceParser.new)
+    rescue Exception
+      on_exception
+    end
+
   #-----------------------------------------------------------------
   #      Security groups
   #-----------------------------------------------------------------
@@ -595,7 +718,7 @@ module RightAws
       #
     def describe_security_groups(list=[])
       link = generate_request("DescribeSecurityGroups", hash_params('GroupName',list.to_a))
-      request_cache_or_info( :describe_security_groups, link,  QEc2DescribeSecurityGroupsParser, list.blank?) do |parser|
+      request_cache_or_info( :describe_security_groups, link,  QEc2DescribeSecurityGroupsParser, @@bench, list.blank?) do |parser|
         result = []     
         parser.result.each do |item|
           perms = []
@@ -640,7 +763,7 @@ module RightAws
       # EC2 doesn't like an empty description...
       description = " " if description.blank?
       link = generate_request("CreateSecurityGroup", 
-                              'GroupName'        => name.to_s, 
+                              'GroupName'        => name.to_s,
                               'GroupDescription' => description.to_s)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
@@ -666,8 +789,8 @@ module RightAws
       #
     def authorize_security_group_named_ingress(name, owner, group)
       link = generate_request("AuthorizeSecurityGroupIngress", 
-                              'GroupName'                  => name.to_s, 
-                              'SourceSecurityGroupName'    => group.to_s, 
+                              'GroupName'                  => name.to_s,
+                                'SourceSecurityGroupName'    => group.to_s,
                               'SourceSecurityGroupOwnerId' => owner.to_s.gsub(/-/,''))
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
@@ -680,8 +803,8 @@ module RightAws
       #
     def revoke_security_group_named_ingress(name, owner, group)
       link = generate_request("RevokeSecurityGroupIngress", 
-                              'GroupName'                  => name.to_s, 
-                              'SourceSecurityGroupName'    => group.to_s, 
+                              'GroupName'                  => name.to_s,
+                              'SourceSecurityGroupName'    => group.to_s,
                               'SourceSecurityGroupOwnerId' => owner.to_s.gsub(/-/,''))
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
@@ -695,10 +818,10 @@ module RightAws
       #
     def authorize_security_group_IP_ingress(name, from_port, to_port, protocol='tcp', cidr_ip='0.0.0.0/0')
       link = generate_request("AuthorizeSecurityGroupIngress", 
-                              'GroupName'  => name.to_s, 
-                              'IpProtocol' => protocol.to_s, 
-                              'FromPort'   => from_port.to_s, 
-                              'ToPort'     => to_port.to_s, 
+                              'GroupName'  => name.to_s,
+                              'IpProtocol' => protocol.to_s,
+                              'FromPort'   => from_port.to_s,
+                              'ToPort'     => to_port.to_s,
                               'CidrIp'     => cidr_ip.to_s)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
@@ -711,10 +834,10 @@ module RightAws
       #
     def revoke_security_group_IP_ingress(name, from_port, to_port, protocol='tcp', cidr_ip='0.0.0.0/0')
       link = generate_request("RevokeSecurityGroupIngress", 
-                              'GroupName'  => name.to_s, 
-                              'IpProtocol' => protocol.to_s, 
-                              'FromPort'   => from_port.to_s, 
-                              'ToPort'     => to_port.to_s, 
+                              'GroupName'  => name.to_s,
+                              'IpProtocol' => protocol.to_s,
+                              'FromPort'   => from_port.to_s,
+                              'ToPort'     => to_port.to_s,
                               'CidrIp'     => cidr_ip.to_s)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
@@ -735,7 +858,7 @@ module RightAws
       #
     def describe_key_pairs(list=[])
       link = generate_request("DescribeKeyPairs", hash_params('KeyName',list.to_a))
-      request_cache_or_info :describe_key_pairs, link,  QEc2DescribeKeyPairParser, list.blank?
+      request_cache_or_info :describe_key_pairs, link,  QEc2DescribeKeyPairParser, @@bench, list.blank?
     rescue Exception
       on_exception
     end
@@ -754,7 +877,7 @@ module RightAws
     rescue Exception
       on_exception
     end
-      
+
       # Delete a key pair. Returns +true+ or an exception.
       #
       #  ec2.delete_key_pair('my_awesome_key') #=> true
@@ -808,7 +931,7 @@ module RightAws
     def describe_addresses(list=[])
       link = generate_request("DescribeAddresses", 
                               hash_params('PublicIp',list.to_a))
-      request_cache_or_info :describe_addresses, link,  QEc2DescribeAddressesParser, list.blank?
+      request_cache_or_info :describe_addresses, link,  QEc2DescribeAddressesParser, @@bench, list.blank?
     rescue Exception
       on_exception
     end
@@ -855,7 +978,7 @@ module RightAws
     def describe_availability_zones(list=[])
       link = generate_request("DescribeAvailabilityZones", 
                               hash_params('ZoneName',list.to_a))
-      request_cache_or_info :describe_availability_zones, link,  QEc2DescribeAvailabilityZonesParser, list.blank?
+      request_cache_or_info :describe_availability_zones, link,  QEc2DescribeAvailabilityZonesParser, @@bench, list.blank?
     rescue Exception
       on_exception
     end
@@ -887,7 +1010,7 @@ module RightAws
     def describe_volumes(list=[])
       link = generate_request("DescribeVolumes", 
                               hash_params('VolumeId',list.to_a))
-      request_cache_or_info :describe_volumes, link,  QEc2DescribeVolumesParser, list.blank?
+      request_cache_or_info :describe_volumes, link,  QEc2DescribeVolumesParser, @@bench, list.blank?
     rescue Exception
       on_exception
     end
@@ -989,7 +1112,7 @@ module RightAws
     def describe_snapshots(list=[])
       link = generate_request("DescribeSnapshots", 
                               hash_params('SnapshotId',list.to_a))
-      request_cache_or_info :describe_snapshots, link,  QEc2DescribeSnapshotsParser, list.blank?
+      request_cache_or_info :describe_snapshots, link,  QEc2DescribeSnapshotsParser, @@bench, list.blank?
     rescue Exception
       on_exception
     end
@@ -1255,6 +1378,7 @@ module RightAws
           when 'launchTime'       then @instance[:aws_launch_time]    = @text
           when 'kernelId'         then @instance[:aws_kernel_id]      = @text
           when 'ramdiskId'        then @instance[:aws_ramdisk_id]     = @text
+          when 'platform'         then @instance[:aws_platform]       = @text
           when 'availabilityZone' then @instance[:aws_availability_zone] = @text
           when 'item'
             if @xmlpath == 'DescribeInstancesResponse/reservationSet/item/instancesSet' || # DescribeInstances property
@@ -1319,18 +1443,54 @@ module RightAws
     end
 
   #-----------------------------------------------------------------
-  #      PARSERS: Fake
+  #      Instances: Wondows related part
   #-----------------------------------------------------------------
-  
-    # Dummy parser - does nothing
-    # Returns the original params back
-    class QEc2DummyParser  # :nodoc:
-      attr_accessor :result
-      def parse(response, params={})
-        @result = [response, params]
+    class QEc2DescribeBundleTasksParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        @bundle = {} if name == 'item'
+      end
+      def tagend(name)
+        case name
+#        when 'requestId'  then @bundle[:request_id]    = @text
+        when 'instanceId' then @bundle[:aws_instance_id]   = @text
+        when 'bundleId'   then @bundle[:aws_id]            = @text
+        when 'bucket'     then @bundle[:s3_bucket]         = @text
+        when 'prefix'     then @bundle[:s3_prefix]         = @text
+        when 'startTime'  then @bundle[:aws_start_time]    = @text
+        when 'updateTime' then @bundle[:aws_update_time]   = @text
+        when 'state'      then @bundle[:aws_state]         = @text
+        when 'progress'   then @bundle[:aws_progress]      = @text
+        when 'code'       then @bundle[:aws_error_code]    = @text
+        when 'message'    then @bundle[:aws_error_message] = @text
+        when 'item'       then @result                    << @bundle
+        end
+      end
+      def reset
+        @result = []
       end
     end
-    
+
+    class QEc2BundleInstanceParser < RightAWSParser #:nodoc:
+      def tagend(name)
+        case name
+#        when 'requestId'  then @result[:request_id]    = @text
+        when 'instanceId' then @result[:aws_instance_id]   = @text
+        when 'bundleId'   then @result[:aws_id]            = @text
+        when 'bucket'     then @result[:s3_bucket]         = @text
+        when 'prefix'     then @result[:s3_prefix]         = @text
+        when 'startTime'  then @result[:aws_start_time]    = @text
+        when 'updateTime' then @result[:aws_update_time]   = @text
+        when 'state'      then @result[:aws_state]         = @text
+        when 'progress'   then @result[:aws_progress]      = @text
+        when 'code'       then @result[:aws_error_code]    = @text
+        when 'message'    then @result[:aws_error_message] = @text
+        end
+      end
+      def reset
+        @result = {}
+      end
+    end
+
   #-----------------------------------------------------------------
   #      PARSERS: Elastic IPs
   #-----------------------------------------------------------------