fog 0.5.3 → 0.6.0

data/lib/fog/compute/requests/aws/create_security_group.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Create a new security group
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/create_tags.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Adds tags to resources
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/delete_key_pair.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Delete a key pair that you own
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/delete_security_group.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Delete a security group that you own
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/delete_snapshot.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Delete a snapshot of an EBS volume that you own
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/delete_tags.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Remove tags from resources
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/delete_volume.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Delete an EBS volume
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/disassociate_address.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Disassociate an elastic IP address from its instance (if any)
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/modify_image_attributes.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Modify image attributes
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/modify_snapshot_attribute.rb

@@ -2,6 +2,8 @@ module Fog
   module AWS
     class Compute
       class Real
+        
+        require 'fog/compute/parsers/aws/basic'
 
         # Modify snapshot attributes
         #

data/lib/fog/compute/requests/aws/reboot_instances.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Reboot specified instances
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/release_address.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Release an elastic IP address.
         #
         # ==== Returns

data/lib/fog/compute/requests/aws/revoke_security_group_ingress.rb

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Remove permissions from a security group
         #
         # ==== Parameters

data/lib/fog/compute/requests/ecloud/add_backup_internet_service.rb

@@ -0,0 +1,109 @@
+module Fog
+  module Ecloud
+    class Compute
+      module Shared
+        def validate_backup_internet_service_data(service_data, configure=false)
+          required_opts = [:name, :protocol, :description, :enabled]
+          if configure
+            required_opts + [ :id, :href, :timeout ]
+          end
+          unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+            raise ArgumentError.new("Required Backup Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
+          end
+        end
+      end
+
+      class Real
+        include Shared
+
+        def add_backup_internet_service(internet_services_uri, service_data)
+          validate_backup_internet_service_data(service_data)
+          if monitor = service_data[:monitor]
+            validate_internet_service_monitor(monitor)
+            ensure_monitor_defaults!(monitor)
+          end
+
+          request(
+            :body     => generate_backup_internet_service_request(service_data),
+            :expects  => 200,
+            :headers  => {'Content-Type' => 'application/xml'},
+            :method   => 'POST',
+            :uri      => internet_services_uri,
+            :parse    => true
+          )
+        end
+
+        private
+
+        def generate_backup_internet_service_request(service_data)
+          builder = Builder::XmlMarkup.new
+          builder.CreateBackupInternetServiceRequest("xmlns" => "urn:tmrk:eCloudExtensions-2.5") {
+            builder.Name(service_data[:name])
+            builder.Protocol(service_data[:protocol])
+            builder.Enabled(service_data[:enabled])
+            builder.Description(service_data[:description])
+            builder.RedirectURL(service_data[:redirect_url])
+            if monitor = service_data[:monitor]
+              generate_monitor_section(builder,monitor)
+            end
+          }
+        end
+      end
+
+      class Mock
+        include Shared
+
+        #
+        # Based on
+        # http://support.theenterprisecloud.com/kb/default.asp?id=729&Lang=1&SID=
+        # and many tears shed.
+        #
+
+        def add_backup_internet_service(internet_services_uri, service_data)
+          validate_backup_internet_service_data(service_data)
+
+          internet_services_uri = ensure_unparsed(internet_services_uri)
+
+          if vdc_internet_service_collection = mock_data.vdc_internet_service_collection_from_href(internet_services_uri)
+            new_backup_internet_service = MockBackupInternetService.new(service_data, vdc_internet_service_collection.backup_internet_services)
+            vdc_internet_service_collection.backup_internet_services << new_backup_internet_service
+            xml = generate_backup_internet_service_added_response(new_backup_internet_service)
+
+            mock_it 200, xml, {'Content-Type' => 'application/vnd.tmrk.ecloud.internetService+xml'}
+          else
+            mock_error 200, "401 Unauthorized"
+          end
+        end
+
+        private
+
+        def generate_backup_internet_service_added_response(new_backup_internet_service)
+          builder = Builder::XmlMarkup.new
+          builder.InternetService("xmlns" => "urn:tmrk:eCloudExtensions-2.5", "xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance") {
+            builder.Id new_backup_internet_service.object_id
+            builder.Href new_backup_internet_service.href
+            builder.Name new_backup_internet_service.name
+            # so broken
+            builder.PublicIpAddress do
+              builder.Id -2147483648
+              builder.Id "http://totally.invalid/1234"
+              builder.Name
+            end
+            builder.Port new_backup_internet_service.port
+            builder.Protocol new_backup_internet_service.protocol
+            builder.Enabled new_backup_internet_service.enabled
+            builder.Timeout new_backup_internet_service.timeout
+            builder.Description new_backup_internet_service.description
+            builder.RedirectURL new_backup_internet_service.redirect_url
+            builder.Monitor "i:nil" => true
+            # so broken
+            builder.IsBackupService false
+            builder.BackupService "i:nil" => true
+            builder.BackupOf "i:nil" => true
+          }
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/compute/requests/ecloud/add_internet_service.rb

@@ -0,0 +1,149 @@
+module Fog
+  module Ecloud
+    class Compute
+      module Shared
+        def validate_internet_service_monitor(monitor)
+          #FIXME: Refactor this type of function into something generic
+          unless ['Disabled','HTTP','ECV'].include?(monitor[:type])
+            raise ArgumentError.new("Supported monitor types are: ECV & HTTP")
+          end
+
+          required_opts = case monitor[:type]
+                          when "Disabled"
+                            [:type, :is_enabled]
+                          else
+                            [:type, :url_send_string, :http_headers, :receive_string, :is_enabled]
+                          end
+
+          unless required_opts.all? { |opt| monitor.keys.include?(opt) && monitor[opt] }
+            raise ArgumentError.new("Required Monitor data missing: #{(required_opts - monitor.keys).map(&:inspect).join(", ")}")
+          end
+
+          case monitor[:type]
+            when "HTTP", "ECV"
+              unless monitor[:http_headers].is_a?(Array) || monitor[:http_headers].is_a?(String)
+                raise ArgumentError.new("Monitor :http_headers must be a String or Array")
+              end
+          end
+
+          unless [true, false, "true", "false"].include?(monitor[:is_enabled])
+            raise ArgumentError.new("Monitor :is_enabled must be true or false")
+          end
+        end
+
+        def validate_internet_service_data(service_data, configure=false)
+          required_opts = [:name, :protocol, :port, :description, :enabled]
+          if configure
+            required_opts + [ :id, :href, :timeout ]
+          end
+          unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+            raise ArgumentError.new("Required Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
+          end
+        end
+
+        def ensure_monitor_defaults!(monitor)
+          if monitor[:http_headers].is_a?(String)
+            monitor[:http_headers] = [ monitor[:http_headers] ]
+          end
+
+          unless monitor[:retries]
+            monitor[:retries] = 3
+          end
+
+          unless monitor[:response_timeout]
+            monitor[:response_timeout] = 2
+          end
+
+          unless monitor[:down_time]
+            monitor[:down_time] = 30
+          end
+
+          unless monitor[:interval]
+            monitor[:interval] = 5
+          end
+        end
+      end
+
+      class Real
+        include Shared
+
+        def add_internet_service(internet_services_uri, service_data)
+          validate_internet_service_data(service_data)
+          if monitor = service_data[:monitor]
+            validate_internet_service_monitor(monitor)
+            ensure_monitor_defaults!(monitor)
+          end
+
+          request(
+            :body     => generate_internet_service_request(service_data),
+            :expects  => 200,
+            :headers  => {'Content-Type' => 'application/vnd.tmrk.ecloud.internetService+xml'},
+            :method   => 'POST',
+            :uri      => internet_services_uri,
+            :parse    => true
+          )
+        end
+
+        private
+
+        def generate_internet_service_request(service_data)
+          builder = Builder::XmlMarkup.new
+          builder.CreateInternetServiceRequest(ecloud_xmlns) {
+            builder.Name(service_data[:name])
+            builder.Protocol(service_data[:protocol])
+            builder.Port(service_data[:port])
+            builder.Enabled(service_data[:enabled])
+            builder.Description(service_data[:description])
+            builder.RedirectURL(service_data[:redirect_url])
+            if monitor = service_data[:monitor]
+              generate_monitor_section(builder,monitor)
+            end
+          }
+        end
+
+        def generate_monitor_section(builder, monitor)
+          builder.Monitor {
+            builder.MonitorType(monitor[:type])
+            case monitor[:type]
+            when "ECV","HTTP"
+              builder.UrlSendString(monitor[:url_send_string])
+              builder.HttpHeader(monitor[:http_headers].join("\n"))
+              builder.ReceiveString(monitor[:receive_string])
+              builder.Interval(monitor[:interval])
+              builder.ResponseTimeOut(monitor[:response_timeout])
+              builder.DownTime(monitor[:downtime])
+              builder.Retries(monitor[:retries])
+            end
+            builder.IsEnabled(monitor[:is_enabled])
+          }
+        end
+
+      end
+
+      class Mock
+        include Shared
+
+        #
+        # Based on
+        # http://support.theenterprisecloud.com/kb/default.asp?id=561&Lang=1&SID=
+        #
+
+        def add_internet_service(internet_services_uri, service_data)
+          validate_internet_service_data(service_data)
+
+          internet_services_uri = ensure_unparsed(internet_services_uri)
+
+          if public_ip_internet_service_collection = mock_data.public_ip_internet_service_collection_from_href(internet_services_uri)
+            new_public_ip_internet_service = MockPublicIpInternetService.new(service_data, public_ip_internet_service_collection)
+            public_ip_internet_service_collection.items << new_public_ip_internet_service
+            xml = generate_internet_service(Builder::XmlMarkup.new, new_public_ip_internet_service, true)
+
+            mock_it 200, xml, {'Content-Type' => 'application/vnd.tmrk.ecloud.internetService+xml'}
+          else
+            mock_error 200, "401 Unauthorized"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/ecloud/add_node.rb

@@ -0,0 +1,62 @@
+module Fog
+  module Ecloud
+    class Compute
+      module Shared
+        private
+
+        def generate_node_request(node_data)
+          builder = Builder::XmlMarkup.new
+          builder.CreateNodeServiceRequest(ecloud_xmlns) {
+            builder.IpAddress(node_data[:ip_address])
+            builder.Name(node_data[:name])
+            builder.Port(node_data[:port])
+            builder.Enabled(node_data[:enabled])
+            builder.Description(node_data[:description])
+          }
+        end
+
+        def validate_node_data(node_data, configure=false)
+          valid_opts = [:name, :port, :enabled, :description, :ip_address]
+          if configure
+            valid_opts.delete_if { |opt| ![:name, :enabled, :description].include?(opt) }
+          end
+          unless valid_opts.all? { |opt| node_data.keys.include?(opt) }
+            raise ArgumentError.new("Required data missing: #{(valid_opts - node_data.keys).map(&:inspect).join(", ")}")
+          end
+        end
+      end
+
+      class Real
+        include Shared
+
+        def add_node(nodes_uri, node_data)
+          validate_node_data(node_data)
+
+          request(
+            :body     => generate_node_request(node_data),
+            :expects  => 200,
+            :headers  => {'Content-Type' => 'application/vnd.tmrk.ecloud.nodeService+xml'},
+            :method   => 'POST',
+            :uri      => nodes_uri,
+            :parse    => true
+          )
+        end
+      end
+
+      class Mock
+        include Shared
+
+        def add_node(nodes_uri, node_data)
+          validate_node_data(node_data)
+          if node_collection = mock_data.public_ip_internet_service_node_collection_from_href(ensure_unparsed(nodes_uri))
+            new_node = MockPublicIpInternetServiceNode.new(node_data, node_collection)
+            node_collection.items << new_node
+            mock_it 200, mock_node_service_response(new_node), { 'Content-Type' => 'application/vnd.tmrk.ecloud.nodeService+xml' }
+          else
+            mock_error 200, "401 Unauthorized"
+          end
+        end
+      end
+    end
+  end
+end