fog 0.3.31 → 0.3.32

data/lib/fog/slicehost/requests/dns/delete_record.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Slicehost
+    class DNS
+      class Real
+
+        # Delete a record from the specified DNS zone
+        # ==== Parameters
+        # * record_id<~Integer> - Id of DNS record to delete
+        #
+        # ==== Returns
+        # * response<~Excon::Response>: - HTTP status code will be result
+        def delete_record(record_id)
+          request(
+            :expects  => 200,
+            :method   => 'DELETE',
+            :path     => "records/#{record_id}.xml"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def delete_record(record_id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/slicehost/requests/dns/delete_zone.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Slicehost
+    class DNS
+      class Real
+
+        # Delete a zone from Slicehost's DNS
+        # ==== Parameters
+        # * zone_id<~Integer> - Id of zone to delete
+        #
+        # ==== Returns
+        # * response<~Excon::Response>: - HTTP status code will be result
+        def delete_zone(zone_id)
+          request(
+            :expects  => 200,
+            :method   => 'DELETE',
+            :path     => "zones/#{zone_id}.xml"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def delete_zone(zone_id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/slicehost/requests/dns/get_record.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Slicehost
+    class DNS
+      class Real
+
+        require 'fog/slicehost/parsers/dns/get_record'
+
+        # Get an individual DNS record from the specified zone 
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'record_type'<~String> - type of DNS record to create (A, CNAME, etc)
+        #     * 'zone_id'<~Integer> - ID of the zone to update
+        #     * 'name'<~String> - host name this DNS record is for 
+        #     * 'data'<~String> - data for the DNS record (ie for an A record, the IP address)
+        #     * 'ttl'<~Integer> - time to live in seconds
+        #     * 'active'<~String> - whether this record is active or not ('Y' or 'N')
+        #     * 'aux'<~String> - extra data required by the record
+        def get_record( record_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::Slicehost::DNS::GetRecords.new,
+            :path     => "records/#{record_id}.xml"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_record(record_id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/slicehost/requests/dns/get_records.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Slicehost
+    class DNS
+      class Real
+
+        require 'fog/slicehost/parsers/dns/get_records'
+
+        # Get all the DNS records across all the DNS zones for this account 
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #     * 'addresses'<~Array> - Ip addresses for the slice
+        #     * 'backup-id'<~Integer> - Id of backup slice was booted from
+        #     * 'flavor_id'<~Integer> - Id of flavor slice was booted from
+        #     * 'id'<~Integer> - Id of the slice
+        #     * 'image-id'<~Integer> - Id of image slice was booted from
+        #     * 'name'<~String> - Name of the slice
+        #     * 'progress'<~Integer> - Progress of current action, in percentage
+        #     * 'status'<~String> - Current status of the slice
+        def get_records
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::Slicehost::DNS::GetRecords.new,
+            :path     => "records.xml"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_records
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/slicehost/requests/dns/get_zone.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Slicehost
+    class DNS
+      class Real
+
+        require 'fog/slicehost/parsers/dns/get_zone'
+
+        # Get details of a DNS zone
+        #
+        # ==== Parameters
+        # * zone_id<~Integer> - Id of zone to lookup
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'origin'<~String> - domain name to host (ie example.com)
+        #     * 'id'<~Integer> - Id of the zone
+        #     * 'ttl'<~Integer> - TimeToLive (ttl) for the domain, in seconds (> 60)
+        #     * 'active'<~String> - whether zone is active in Slicehost DNS server - 'Y' or 'N'
+        def get_zone(zone_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::Slicehost::DNS::GetZone.new,
+            :path     => "/zones/#{zone_id}.xml"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_zone(zone_id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/slicehost/requests/dns/get_zones.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Slicehost
+    class DNS
+      class Real
+
+        require 'fog/slicehost/parsers/dns/get_zones'
+
+        # Get list of all DNS zones hosted on Slicehost (for this account)
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'zones'<~Array>
+        #       * 'origin'<~String> - domain name to host (ie example.com)
+        #       * 'id'<~Integer> - Id of the zone
+        #       * 'ttl'<~Integer> - TimeToLive (ttl) for the domain, in seconds (> 60)
+        #       * 'active'<~String> - whether zone is active in Slicehost DNS server - 'Y' or 'N'
+        def get_zones
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::Slicehost::DNS::GetZones.new,
+            :path     => 'zones.xml'
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_zones
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/terremark.rb

@@ -1,4 +1,6 @@
 require 'nokogiri'
+
+require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'
 
 require 'fog/terremark/shared'

data/lib/fog/terremark/ecloud.rb

@@ -32,10 +32,8 @@ module Fog
       end
 
       class Real
-        # NOTE: When this vbecomes a service, take care to pass the &inject_parameter_specs 
-        # block on call to requires and recognizes        
-        requires :terremark_ecloud_password, :terremark_ecloud_username
-        recognizes :host, :path, :port, :scheme, :persistent
+        # requires :terremark_ecloud_password, :terremark_ecloud_username
+        # recognizes :host, :path, :port, :scheme, :persistent
         
         include Fog::Terremark::Shared::Real
         include Fog::Terremark::Shared::Parser

data/lib/fog/vcloud.rb

@@ -1,4 +1,6 @@
 require 'nokogiri'
+
+require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'
 
 require 'builder'
@@ -19,8 +21,8 @@ end
 module Fog
   class Vcloud < Fog::Service
 
-    requires :username, :password, :module, :versions_uri, &inject_parameter_specs
-    recognizes :version, :persistent, &inject_parameter_specs
+    requires :username, :password, :versions_uri
+    recognizes :version, :persistent
 
     model_path 'fog/vcloud/models'
     model :vdc

data/lib/fog/vcloud/bin.rb

@@ -38,7 +38,9 @@ module Vcloud
       def [](service)
         @@connections ||= Hash.new do |hash, key|
           if credentials = Fog.credentials[:vcloud][key]
-            hash[key] = eval(credentials[:module]).new(credentials)
+            credentials = credentials.dup
+            _module_ = eval(credentials.delete(:module))
+            hash[key] = _module_.new(credentials)
           else
             raise ArgumentError.new("Unregistered service: :#{key}. Registered services are: #{Vcloud.registered_services}")
           end

data/lib/fog/vcloud/mock_data_classes.rb

@@ -47,17 +47,7 @@ module Fog
         end
 
         def inspect
-          "<#{self.class.name} #{object_id} data=#{super} method_data=#{method_data.inspect}>"
-        end
-
-        private
-
-        def unique_methods
-          (public_methods - self.class.superclass.public_instance_methods).reject {|m| m.to_s =~ /!$/ }
-        end
-
-        def method_data
-          (unique_methods + [:href]).sort_by(&:to_s).find_all {|m| method(m).arity == 0 }.inject({}) {|md, m| md.update(m => send(m)) }
+          "<#{self.class.name} #{object_id} data=#{super}>"
         end
       end
 
@@ -131,6 +121,14 @@ module Fog
           find_href_in(href, all_vdc_internet_service_collections)
         end
 
+        def all_backup_internet_services
+          all_vdc_internet_service_collections.map(&:backup_internet_services).flatten
+        end
+
+        def backup_internet_service_from_href(href)
+          find_href_in(href, all_backup_internet_services)
+        end
+
         def all_public_ip_collections
           all_vdcs.map {|v| v.public_ip_collection }.flatten
         end
@@ -434,6 +432,10 @@ module Fog
         def rnat
           self[:rnat] || _parent._parent.rnat
         end
+
+        def rnat_set?
+          !!self[:rnat]
+        end
       end
 
       class MockNetworkExtensions < Base
@@ -456,6 +458,18 @@ module Fog
         def rnat
           _parent.rnat
         end
+
+        def type
+          self[:type] || "DMZ"
+        end
+
+        def vlan
+          object_id.to_s
+        end
+
+        def friendly_name
+          "#{name} (#{type}_#{object_id})"
+        end
       end
 
       class MockVirtualMachine < Base
@@ -495,6 +509,12 @@ module Fog
           disks.inject(0) {|s, d| s + d.vcloud_size }
         end
 
+        def network_ip
+          if network = _parent.networks.detect {|n| n.ip_collection.items[ip] }
+            network.ip_collection.items[ip]
+          end
+        end
+
         # from fog ecloud server's _compose_vapp_data
         def to_configure_vapp_hash
           {
@@ -574,10 +594,52 @@ module Fog
         end
 
         def items
+          public_ip_internet_services + backup_internet_services
+        end
+
+        def public_ip_internet_services
           _parent.public_ip_collection.items.inject([]) do |services, public_ip|
             services + public_ip.internet_service_collection.items
           end
         end
+
+        def backup_internet_services
+          @backup_internet_services ||= []
+        end
+      end
+
+      class MockBackupInternetService < Base
+        def name
+          self[:name] || "Backup Internet Service #{object_id}"
+        end
+
+        def protocol
+          self[:protocol]
+        end
+
+        def port
+          0
+        end
+
+        def enabled
+          self[:enabled].to_s.downcase != "false"
+        end
+
+        def timeout
+          self[:timeout] || 2
+        end
+
+        def description
+          self[:description] || "Description for Backup Service #{name}"
+        end
+
+        def redirect_url
+          nil
+        end
+
+        def node_collection
+          @node_collection ||= MockPublicIpInternetServiceNodes.new({}, self)
+        end
       end
 
       class MockFirewallAcls < Base
@@ -652,6 +714,10 @@ module Fog
         def monitor
           nil
         end
+
+        def backup_service
+          self[:backup_service]
+        end
       end
 
       class MockPublicIpInternetServiceNodes < Base

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

@@ -3,6 +3,9 @@ module Fog
     module Terremark
       class Ecloud < Fog::Vcloud
 
+        requires   :username, :password, :versions_uri
+        recognizes :version
+
         model_path 'fog/vcloud/terremark/ecloud/models'
         model :catalog_item
         model :catalog
@@ -10,6 +13,8 @@ module Fog
         collection :firewall_acls
         model :internet_service
         collection :internet_services
+        model :backup_internet_service
+        collection :backup_internet_services
         model :ip
         collection :ips
         model :network
@@ -27,6 +32,7 @@ module Fog
 
         request_path 'fog/vcloud/terremark/ecloud/requests'
         request :add_internet_service
+        request :add_backup_internet_service
         request :add_node
         request :clone_vapp
         request :configure_internet_service
@@ -62,13 +68,23 @@ module Fog
         request :power_reset
         request :power_shutdown
 
+        module Shared
+          def ecloud_xmlns
+            {
+              "xmlns"     => "urn:tmrk:eCloudExtensions-2.5",
+              "xmlns:i"   => "http://www.w3.org/2001/XMLSchema-instance"
+            }
+          end
+        end
+
         class Mock < Fog::Vcloud::Mock
+          include Shared
 
           def initialize(options={})
           end
 
           def self.base_url
-            "https://fakey.com/api/v0.8b-ext2.3"
+            "https://fakey.com/api/v0.8b-ext2.5"
           end
 
           def self.data_reset
@@ -79,7 +95,7 @@ module Fog
           def self.data( base_url = self.base_url )
             @mock_data ||= Fog::Vcloud::Mock.data(base_url).tap do |vcloud_mock_data|
               vcloud_mock_data.versions.clear
-              vcloud_mock_data.versions << MockVersion.new(:version => "v0.8b-ext2.3")
+              vcloud_mock_data.versions << MockVersion.new(:version => "v0.8b-ext2.5")
 
               vcloud_mock_data.organizations.detect {|o| o.name == "Boom Inc." }.tap do |mock_organization|
                 mock_organization.vdcs.detect {|v| v.name == "Boomstick" }.tap do |mock_vdc|
@@ -128,6 +144,8 @@ module Fog
                   end
 
                   mock_vdc.public_ip_collection.items << MockPublicIp.new(:name => "99.1.9.7")
+
+                  mock_vdc.internet_service_collection.backup_internet_services << MockBackupInternetService.new({ :port => 10000, :protocol => "TCP"}, self)
                 end
 
                 mock_organization.vdcs.detect {|v| v.name == "Rock-n-Roll" }.tap do |mock_vdc|
@@ -149,19 +167,16 @@ module Fog
             end
           end
 
-          def ecloud_xmlns
-            { :xmlns => "urn:tmrk:eCloudExtensions-2.3", :"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance" }
-          end
-
           def mock_data
             Fog::Vcloud::Terremark::Ecloud::Mock.data
           end
         end
 
         class Real < Fog::Vcloud::Real
+          include Shared
 
           def supporting_versions
-            ["v0.8b-ext2.3", "0.8b-ext2.3"]
+            ["v0.8b-ext2.5", "0.8b-ext2.5"]
           end
 
         end