fog 0.3.7 → 0.3.8

data/lib/fog/slicehost/models/compute/image.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Slicehost

data/lib/fog/slicehost/models/compute/images.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/slicehost/models/compute/image'
 
 module Fog

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Slicehost
@@ -70,7 +70,9 @@ module Fog
         end
 
         def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :flavor_id, :image_id, :name
+
           data = connection.create_slice(@flavor_id, @image_id, @name)
           merge_attributes(data.body)
           true

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/slicehost/models/compute/server'
 
 module Fog

data/lib/fog/terremark/ecloud.rb

@@ -1,39 +1,40 @@
 module Fog
   module Terremark
-   module Ecloud
+    module Ecloud
 
-     module Bin
-     end
+      module Bin
+      end
 
-     module Defaults
-       HOST   = 'services.enterprisecloud.terremark.com'
-       PATH   = '/api/v0.8a-ext2.0'
-       PORT   = 443
-       SCHEME = 'https'
-     end
+      module Defaults
+        HOST   = 'services.enterprisecloud.terremark.com'
+        PATH   = '/api/v0.8a-ext2.0'
+        PORT   = 443
+        SCHEME = 'https'
+      end
 
-     extend Fog::Terremark::Shared
+      extend Fog::Terremark::Shared
 
-     def self.new(options={})
+      def self.new(options={})
 
-       unless @required
-         shared_requires
-         @required = true
-       end
+        unless @required
+          shared_requires
+          @required = true
+        end
 
-       check_shared_options(options)
+        check_shared_options(options)
 
-       if Fog.mocking?
+        if Fog.mocking?
           Fog::Terremark::Ecloud::Mock.new(options)
         else
           Fog::Terremark::Ecloud::Real.new(options)
         end
-     end
 
-     class Real
+      end
+
+      class Real
 
-       include Fog::Terremark::Shared::Real
-       include Fog::Terremark::Shared::Parser
+        include Fog::Terremark::Shared::Real
+        include Fog::Terremark::Shared::Parser
 
         def initialize(options={})
           @terremark_password = options[:terremark_ecloud_password]
@@ -47,18 +48,18 @@ module Fog
 
       end
 
-     class Mock
-       include Fog::Terremark::Shared::Mock
-       include Fog::Terremark::Shared::Parser
-
-       def initialize(option = {})
-         super
-         @base_url = Fog::Terremark::Ecloud::Defaults::SCHEME + "://" +
-                     Fog::Terremark::Ecloud::Defaults::HOST +
-                     Fog::Terremark::Ecloud::Defaults::PATH
-         @data = self.class.data[:terremark_ecloud_username]
-       end
-     end
+      class Mock
+        include Fog::Terremark::Shared::Mock
+        include Fog::Terremark::Shared::Parser
+
+        def initialize(option = {})
+          super
+          @base_url = Fog::Terremark::Ecloud::Defaults::SCHEME + "://" +
+          Fog::Terremark::Ecloud::Defaults::HOST +
+          Fog::Terremark::Ecloud::Defaults::PATH
+          @data = self.class.data[:terremark_ecloud_username]
+        end
+      end
 
     end
   end

data/lib/fog/terremark/models/shared/address.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Terremark

data/lib/fog/terremark/models/shared/network.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Terremark

data/lib/fog/terremark/models/shared/server.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Terremark

data/lib/fog/terremark/models/shared/servers.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/terremark/models/shared/server'
 
 module Fog

data/lib/fog/terremark/models/shared/task.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Terremark

data/lib/fog/terremark/models/shared/tasks.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/terremark/models/shared/server'
 
 module Fog

data/lib/fog/terremark/models/shared/vdc.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Terremark

data/lib/fog/terremark/parser.rb

@@ -3,6 +3,7 @@ module Fog
     module Shared
       module Parser
 
+        remove_method :parse
         def parse(data)
           case data['type']
           when 'application/vnd.vmware.vcloud.vApp+xml'

data/lib/fog/terremark/vcloud.rb

@@ -25,9 +25,9 @@ module Fog
 
        if Fog.mocking?
           Fog::Terremark::Vcloud::Mock.new(options)
-        else
+       else
           Fog::Terremark::Vcloud::Real.new(options)
-        end
+       end
      end
 
      class Real
@@ -91,7 +91,7 @@ module Fog
             nil
           end
         end
-      end
+     end
 
      class Mock
        include Fog::Terremark::Shared::Mock
@@ -106,7 +106,7 @@ module Fog
        end
      end
 
-    end
+   end
   end
 end
 

data/lib/fog/vcloud.rb

@@ -31,6 +31,7 @@ module Fog
     class UnsupportedVersion < Exception ; end
 
     module Shared
+      attr_reader :versions_uri
 
       def default_organization_uri
         @default_organization_uri ||= begin
@@ -81,9 +82,6 @@ module Fog
       include Shared
       extend Fog::Vcloud::Generators
 
-      attr_accessor :login_uri
-      attr_reader :versions_uri
-
       def supporting_versions
         ["0.8"]
       end
@@ -295,6 +293,14 @@ module Fog
                   :storage => { :used => "105", :allocated => "200" },
                   :cpu => { :allocated => "10000" },
                   :memory => { :allocated => "20480" },
+                  :catalog => {
+                     :name => "The catalog",
+                     :items => [
+                        { :id => "0", :name => "Item 0" },
+                        { :id => "1", :name => "Item 1" },
+                        { :id => "2", :name => "Item 2" },
+                     ]
+                  },
                   :networks => [
                     { :id => "31",
                       :href => "#{base_url}/network/31",
@@ -367,9 +373,11 @@ module Fog
 
       def vdc_from_uri(uri)
         match = Regexp.new(%r:.*/vdc/(\d+):).match(uri.to_s)
-        if match
-          mock_data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:id] == match[1] }
-        end
+        match && vdc_from_id(match[1])
+      end
+
+      def vdc_from_id(id)
+        mock_data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:id] == id }
       end
 
       def ip_from_uri(uri)
@@ -415,4 +423,4 @@ module Fog
 end
 
 require 'fog/vcloud/terremark/ecloud'
-require 'fog/vcloud/terremark/vcloud'
+require 'fog/vcloud/terremark/vcloud'

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

@@ -102,7 +102,7 @@ module Fog
                         { :id => "72", :href => extension_url + "/internetService/72", :port => "7000", :protocol => 'HTTP', :enabled => "true",
                           :timeout => "2", :name => 'An SSH Map', :description => 'SSH 1', :redirect_url => '',
                           :nodes => [ {:id => "83", :href => extension_url + "/nodeService/83", :ip_address => "1.2.3.5",
-                                       :name => "SSH", :port => "22", :enabled => "true", :description => "web ssh" } 
+                                       :name => "SSH", :port => "22", :enabled => "true", :description => "web ssh" }
                                     ] }
                       ]
                     },
@@ -157,6 +157,18 @@ module Fog
             "#{base_url}/extensions/internetService/#{internet_service[:id]}"
           end
 
+          def self.vapp_href(options)
+            "#{base_url}/vapp/#{options[:id]}"
+          end
+
+          def self.vapp_template_href(options)
+            "#{base_url}/vappTemplate/#{options[:id]}"
+          end
+
+          def self.catalog_item_customization_href(options)
+            "#{base_url}/extensions/template/#{options[:id]}/options/customization"
+          end
+
           def ecloud_xmlns
             { :xmlns => "urn:tmrk:eCloudExtensions-2.3", :"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance" }
           end
@@ -167,8 +179,8 @@ module Fog
 
           def mock_ip_and_service_from_service_url(uri)
             if ip = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.map { |vdc| vdc[:public_ips] }.flatten.compact.detect { |pip| pip[:services].detect { |service| service[:href] == uri } }
-              if service = ip[:services].detect { |service| service[:href] == uri }
-                [ip, service]
+              if desired_service = ip[:services].detect { |service| service[:href] == uri }
+                [ip, desired_service]
               else
                 [ip, nil]
               end

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

@@ -1,4 +1,4 @@
-require 'lib/fog/vcloud/terremark/ecloud/models/firewall_acl'
+require 'fog/vcloud/terremark/ecloud/models/firewall_acl'
 
 module Fog
   class Vcloud

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

@@ -1,4 +1,4 @@
-require 'lib/fog/vcloud/terremark/ecloud/models/internet_service'
+require 'fog/vcloud/terremark/ecloud/models/internet_service'
 
 module Fog
   class Vcloud

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

@@ -1,4 +1,4 @@
-require 'lib/fog/vcloud/terremark/ecloud/models/ip'
+require 'fog/vcloud/terremark/ecloud/models/ip'
 
 module Fog
   class Vcloud

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

@@ -1,4 +1,4 @@
-require 'lib/fog/vcloud/terremark/ecloud/models/network'
+require 'fog/vcloud/terremark/ecloud/models/network'
 
 module Fog
   class Vcloud

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

@@ -1,4 +1,4 @@
-require 'lib/fog/vcloud/terremark/ecloud/models/node'
+require 'fog/vcloud/terremark/ecloud/models/node'
 
 module Fog
   class Vcloud

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

@@ -1,4 +1,4 @@
-require 'lib/fog/vcloud/terremark/ecloud/models/public_ip'
+require 'fog/vcloud/terremark/ecloud/models/public_ip'
 
 module Fog
   class Vcloud

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

@@ -1,4 +1,4 @@
-require 'lib/fog/vcloud/terremark/ecloud/models/server'
+require 'fog/vcloud/terremark/ecloud/models/server'
 
 module Fog
   class Vcloud

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

@@ -1,4 +1,4 @@
-require 'lib/fog/vcloud/terremark/ecloud/models/task'
+require 'fog/vcloud/terremark/ecloud/models/task'
 
 module Fog
   class Vcloud

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

@@ -1,4 +1,4 @@
-require 'lib/fog/vcloud/terremark/ecloud/models/vdc'
+require 'fog/vcloud/terremark/ecloud/models/vdc'
 
 module Fog
   class Vcloud

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

@@ -2,7 +2,60 @@ module Fog
   class Vcloud
     module Terremark
       class Ecloud
+        module Shared
+          def validate_internet_service_monitor(monitor)
+            #FIXME: Refactor this type of function into something generic
+            required_opts = [:type, :url_send_string, :http_headers, :receive_string, :is_enabled]
+
+            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
+
+            unless ['HTTP','ECV'].include?(monitor[:type])
+              raise ArgumentError.new("Supported monitor types are: ECV & HTTP")
+            end
+
+            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
+
+            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
+        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
@@ -35,37 +88,6 @@ module Fog
             }
           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 validate_internet_service_monitor(monitor)
-            #FIXME: Refactor this type of function into something generic
-            required_opts = [:type, :url_send_string, :http_headers, :receive_string, :is_enabled]
-
-            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
-
-            unless ['HTTP','ECV'].include?(monitor[:type])
-              raise ArgumentError.new("Supported monitor types are: ECV & HTTP")
-            end
-
-            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
-
-            unless [true, false, "true", "false"].include?(monitor[:is_enabled])
-              raise ArgumentError.new("Monitor :is_enabled must be true or false")
-            end
-          end
-
           def ensure_monitor_defaults!(monitor)
             if monitor[:http_headers].is_a?(String)
               monitor[:http_headers] = [ monitor[:http_headers] ]
@@ -87,27 +109,11 @@ module Fog
               monitor[:interval] = 5
             end
           end
-
-          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
-
         end
 
         class Mock
+          include Shared
+
           #
           # Based on
           # http://support.theenterprisecloud.com/kb/default.asp?id=561&Lang=1&SID=