fog 0.3.31 → 0.3.32

data/lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb

@@ -28,8 +28,7 @@ module Fog
 
           def generate_configure_network_request(network_data)
             builder = Builder::XmlMarkup.new
-            builder.Network(:"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance",
-                            :xmlns => "urn:tmrk:eCloudExtensions-2.3") {
+            builder.Network(ecloud_xmlns) {
               builder.Id(network_data[:id])
               builder.Href(network_data[:href])
               builder.Name(network_data[:name])

data/lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb

@@ -2,14 +2,19 @@ module Fog
   class Vcloud
     module Terremark
       class Ecloud
-        class Real
+        module Shared
+          private
 
-          def validate_network_ip_data(network_ip_data, configure=false)
+          def validate_network_ip_data(network_ip_data)
             valid_opts = [:id, :href, :name, :status, :server, :rnat]
             unless valid_opts.all? { |opt| network_ip_data.keys.include?(opt) }
               raise ArgumentError.new("Required data missing: #{(valid_opts - network_ip_data.keys).map(&:inspect).join(", ")}")
             end
           end
+        end
+
+        class Real
+          include Shared
 
           def configure_network_ip(network_ip_uri, network_ip_data)
             validate_network_ip_data(network_ip_data)
@@ -28,8 +33,7 @@ module Fog
 
           def generate_configure_network_ip_request(network_ip_data)
             builder = Builder::XmlMarkup.new
-            builder.IpAddress(:"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance",
-                              :xmlns => "urn:tmrk:eCloudExtensions-2.3") {
+            builder.IpAddress(ecloud_xmlns) {
               builder.Id(network_ip_data[:id])
               builder.Href(network_ip_data[:href])
               builder.Name(network_ip_data[:name])
@@ -38,13 +42,24 @@ module Fog
               builder.RnatAddress(network_ip_data[:rnat])
             }
           end
-
         end
 
         class Mock
+          include Shared
 
           def configure_network_ip(network_ip_uri, network_ip_data)
-            Fog::Mock.not_implemented
+            validate_network_ip_data(network_ip_data)
+
+            if network_ip = mock_data.network_ip_from_href(network_ip_uri)
+              network_ip[:rnat] = network_ip_data[:rnat]
+
+              builder = Builder::XmlMarkup.new
+              xml = network_ip_response(builder, network_ip, ecloud_xmlns)
+
+              mock_it 200, xml, { 'Content-Type' => 'application/vnd.tmrk.ecloud.ip+xml' }
+            else
+              mock_error 200, "401 Unauthorized"
+            end
           end
         end
       end

data/lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb

@@ -13,7 +13,8 @@ module Fog
               vdc = virtual_machine._parent
 
               if vdc.internet_service_collection.items.detect {|is| is.node_collection.items.any? {|isn| isn.ip_address == virtual_machine.ip } } ||
-                  virtual_machine.status != 2
+                  virtual_machine.status != 2 ||
+                  virtual_machine.network_ip.rnat_set?
                 mock_it 202, '', {}
               else
                 vdc.virtual_machines.delete(virtual_machine)

data/lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb

@@ -38,26 +38,43 @@ module Fog
           def generate_internet_services(services)
             builder = Builder::XmlMarkup.new
 
-            builder.InternetServices(:xmlns => "urn:tmrk:eCloudExtensions-2.3",:"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance") {|xml|
+            builder.InternetServices("xmlns" => "urn:tmrk:eCloudExtensions-2.5", "xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance") {|xml|
               services.each do |service|
-                xml.InternetService {
-                  xml.Id service.object_id
-                  xml.Href service.href
-                  xml.Name service.name
-                  xml.PublicIpAddress {
-                    xml.Id service._parent._parent.object_id
-                    xml.Href service._parent._parent.href
-                    xml.Name service._parent._parent.name
-                  }
-                  xml.Port service.port
-                  xml.Protocol service.protocol
-                  xml.Enabled service.enabled
-                  xml.Timeout service.timeout
-                  xml.Description service.description
-                  xml.RedirectURL service.redirect_url
-                  xml.Monitor
+                generate_internet_service(xml, service)
+              end
+            }
+          end
+
+          def generate_internet_service(xml, service, by_itself = false)
+            xml.InternetService(by_itself ? { "xmlns" => "urn:tmrk:eCloudExtensions-2.5", "xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance" } : {}) {
+              xml.Id service.object_id
+              xml.Href service.href
+              xml.Name service.name
+              if MockDataClasses::MockBackupInternetService === service
+                xml.PublicIpAddress "i:nil" => true
+              else
+                xml.PublicIpAddress {
+                  xml.Id service._parent._parent.object_id
+                  xml.Href service._parent._parent.href
+                  xml.Name service._parent._parent.name
                 }
               end
+              xml.Port service.port
+              xml.Protocol service.protocol
+              xml.Enabled service.enabled
+              xml.Timeout service.timeout
+              xml.Description service.description
+              xml.RedirectURL service.redirect_url
+              xml.Monitor "i:nil" => true
+              xml.IsBackupService MockDataClasses::MockBackupInternetService === service
+              if MockDataClasses::MockPublicIpInternetService === service && service.backup_service
+                xml.BackupService do
+                  xml.Href service.backup_service.href
+                end
+              else
+                xml.BackupService "i:nil" => true
+              end
+              xml.BackupOf
             }
           end
         end

data/lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb

@@ -12,16 +12,18 @@ module Fog
           def get_network_extensions(network_extension_uri)
             if network_extension = mock_data.network_extension_from_href(ensure_unparsed(network_extension_uri))
               xml = Builder::XmlMarkup.new
-              mock_it 200,
-                xml.Network(:xmlns => "urn:tmrk:eCloudExtensions-2.3", :"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance") {
-                  xml.Address network_extension.address
-                  xml.RnatAddress network_extension.rnat
-                  xml.Href network_extension.href
-                  xml.Id network_extension.object_id
-                  xml.Name network_extension.name
-                  xml.GatewayAddress network_extension.gateway
-                  xml.BroadcastAddress network_extension.broadcast
-                }, { 'Content-Type' => "application/vnd.tmrk.ecloud.network+xml" }
+              mock_it 200, xml.Network(ecloud_xmlns) {
+                xml.Address network_extension.address
+                xml.RnatAddress network_extension.rnat
+                xml.Href network_extension.href
+                xml.Id network_extension.object_id
+                xml.Name network_extension.name
+                xml.GatewayAddress network_extension.gateway
+                xml.BroadcastAddress network_extension.broadcast
+                xml.NetworkType network_extension.type
+                xml.Vlan network_extension.vlan
+                xml.FriendlyName network_extension.friendly_name
+              }, { 'Content-Type' => "application/vnd.tmrk.ecloud.network+xml" }
             else
               mock_error 200, "401 Unauthorized"
             end

data/lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb

@@ -16,16 +16,7 @@ module Fog
           def get_network_ip(network_ip_uri)
             if network_ip = mock_data.network_ip_from_href(network_ip_uri)
               builder = Builder::XmlMarkup.new
-              xml = builder.IpAddress(ecloud_xmlns) do
-                builder.Id network_ip.object_id
-                builder.Href network_ip.href
-                builder.Name network_ip.name
-
-                builder.Status network_ip.status
-                if network_ip.used_by
-                  builder.Server network_ip.used_by
-                end
-              end
+              xml = network_ip_response(builder, network_ip, ecloud_xmlns)
 
               mock_it 200, xml, { 'Content-Type' => 'application/vnd.tmrk.ecloud.ip+xml' }
             else
@@ -33,6 +24,20 @@ module Fog
             end
           end
 
+          def network_ip_response(builder, network_ip, xmlns = {})
+            builder.IpAddress(xmlns) do
+              builder.Id network_ip.object_id
+              builder.Href network_ip.href
+              builder.Name network_ip.name
+
+              builder.Status network_ip.status
+              if network_ip.used_by
+                builder.Server network_ip.used_by.name
+              end
+
+              builder.RnatAddress(network_ip.rnat)
+            end
+          end
         end
       end
     end

data/lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb

@@ -20,18 +20,7 @@ module Fog
               builder = Builder::XmlMarkup.new
               xml = builder.IpAddresses do
                 network_ip_collection.ordered_ips.each do |network_ip|
-                  builder.IpAddress do
-                    builder.Name network_ip.name
-                    builder.Href network_ip.href
-
-                    if network_ip.used_by
-                      builder.Status("Assigned")
-                      builder.Server(network_ip.used_by.name)
-                    else
-                      builder.Status("Available")
-                    end
-                    builder.RnatAddress(network_ip.rnat)
-                  end
+                  network_ip_response(builder, network_ip)
                 end
               end
 

data/lib/fog/zerigo.rb

@@ -0,0 +1,15 @@
+require 'nokogiri'
+
+require File.join(File.dirname(__FILE__), 'core')
+require 'fog/core/parser'
+
+module Fog
+  module Zerigo
+
+    extend Fog::Provider
+
+    service_path 'fog/zerigo'
+    service :dns
+
+  end
+end

data/lib/fog/zerigo/bin.rb

@@ -0,0 +1,25 @@
+class Zerigo < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :dns
+        Fog::Zerigo::DNS
+      else 
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = class_for(key).new
+      end
+      @@connections[service]
+    end
+
+    def services
+      [:dns]
+    end
+
+  end
+end

data/lib/fog/zerigo/dns.rb

@@ -0,0 +1,96 @@
+module Fog
+  module Zerigo
+    class DNS < Fog::Service
+
+      requires :zerigo_email, :zerigo_token
+      recognizes :timeout, :persistent
+
+      # model_path 'fog/zerigo/models/dns'
+      # model       :server
+      # collection  :servers
+
+      request_path 'fog/zerigo/requests/dns'
+      request :list_zones
+      request :count_zones
+      request :get_zone
+      request :get_zone_stats
+      request :create_zone
+      request :update_zone
+      request :delete_zone
+      request :list_hosts
+      request :find_hosts
+      request :count_hosts
+      request :get_host
+      request :create_host
+      request :update_host
+      request :delete_host
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {}
+          end
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          @zerigo_email = options[:zerigo_email]
+          @zerigo_token = options[:zerigo_token]
+          @data = self.class.data[@zerigo_email]
+          @data = self.class.data[@zerigo_password]
+        end
+
+      end
+
+      class Real
+
+        def initialize(options={})
+          @zerigo_email     = options[:zerigo_email]
+          @zerigo_token  = options[:zerigo_token]
+          @host   = options[:host]    || "ns.zerigo.com"
+          @port   = options[:port]    || 80
+          @scheme = options[:scheme]  || 'http'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params)
+          params[:headers] ||= {}
+          key= "#{@zerigo_email}:#{@zerigo_token}"
+          params[:headers].merge!({
+            'Authorization' => "Basic #{Base64.encode64(key).delete("\r\n")}"
+          })
+          case params[:method]
+          when 'DELETE', 'GET', 'HEAD'
+            params[:headers]['Accept'] = 'application/xml'
+          when 'POST', 'PUT'
+            params[:headers]['Content-Type'] = 'application/xml'
+          end
+
+          begin
+            response = @connection.request(params.merge!({:host => @host}))
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+            when Excon::Errors::NotFound
+              Fog::Zerigo::DNS::NotFound.slurp(error)
+            else
+              error
+            end
+          end
+
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/zerigo/parsers/dns/count_hosts.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module Zerigo
+      module DNS
+
+        class CountHosts < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'count'
+              @response[name] = @value.to_i
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/zerigo/parsers/dns/count_zones.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module Zerigo
+      module DNS
+
+        class CountZones < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'count'
+              @response[name] = @value.to_i
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/zerigo/parsers/dns/create_host.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module Zerigo
+      module DNS
+
+        class CreateHost < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'id', 'priority', 'ttl', 'zone-id'
+              @response[name] = @value.to_i
+            when 'data', 'fqdn', 'host-type', 'hostname', 'notes', 'zone-id', 'created-at', 'updated-at'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end