fog 0.3.7 → 0.3.8

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

@@ -2,21 +2,7 @@ module Fog
   class Vcloud
     module Terremark
       class Ecloud
-        class Real
-
-          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
-
+        module Shared
           private
 
           def generate_node_request(node_data)
@@ -43,7 +29,25 @@ module Fog
           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)

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

@@ -2,7 +2,8 @@ module Fog
   class Vcloud
     module Terremark
       class Ecloud
-        class Real
+        module Shared
+          private
 
           def generate_internet_service_response(service_data,ip_address_data)
             builder = Builder::XmlMarkup.new
@@ -34,6 +35,10 @@ module Fog
               raise ArgumentError.new("Required Internet Service data missing: #{(valid_opts - ip_address_data.keys).map(&:inspect).join(", ")}")
             end
           end
+        end
+
+        class Real
+          include Shared
 
           def configure_internet_service(internet_service_uri, service_data, ip_address_data)
             validate_internet_service_data(service_data, true)
@@ -58,6 +63,8 @@ module Fog
         end
 
         class Mock
+          include Shared
+
           #
           # Based on
           # http://support.theenterprisecloud.com/kb/default.asp?id=583&Lang=1&SID=

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

@@ -2,7 +2,23 @@ module Fog
   class Vcloud
     module Terremark
       class Ecloud
+        module Shared
+          private
+
+          def generate_configure_node_request(node_data)
+            builder = Builder::XmlMarkup.new
+            builder.NodeService(:"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance",
+                                    :xmlns => "urn:tmrk:eCloudExtensions-2.0") {
+              builder.Name(node_data[:name])
+              builder.Enabled(node_data[:enabled].to_s)
+              builder.Description(node_data[:description])
+            }
+          end
+
+        end
+
         class Real
+          include Shared
 
           def configure_node(node_uri, node_data)
             validate_node_data(node_data, true)
@@ -17,21 +33,10 @@ module Fog
             )
           end
 
-          private
-
-          def generate_configure_node_request(node_data)
-            builder = Builder::XmlMarkup.new
-            builder.NodeService(:"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance",
-                                    :xmlns => "urn:tmrk:eCloudExtensions-2.0") {
-              builder.Name(node_data[:name])
-              builder.Enabled(node_data[:enabled].to_s)
-              builder.Description(node_data[:description])
-            }
-          end
-
         end
 
         class Mock
+          include Shared
 
           def configure_node(node_uri, node_data)
             node_uri = ensure_unparsed(node_uri)

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

@@ -9,7 +9,35 @@ module Fog
 
         class Mock
           def get_catalog(catalog_uri)
-            Fog::Mock.not_implemented
+            catalog_uri = ensure_unparsed(catalog_uri)
+            xml = nil
+
+            if vdc = vdc_from_uri(catalog_uri)
+              builder = Builder::XmlMarkup.new
+
+              xml = builder.Catalog(xmlns.merge(
+                                                :type => "application/vnd.vmware.vcloud.catalog+xml",
+                                                :href => catalog_uri,
+                                                :name => vdc[:catalog][:name]
+                                    )) do |xml|
+                xml.CatalogItems do |xml|
+                  vdc[:catalog][:items].each do |catalog_item|
+                    xml.CatalogItem(
+                                    :type => "application/vnd.vmware.vcloud.catalogItem+xml",
+                                    :href => "#{self.class.base_url}/catalogItem/#{catalog_item[:id]}-#{vdc[:id]}",
+                                    :name => catalog_item[:name]
+                                    )
+                  end
+                end
+              end
+            end
+
+            if xml
+              mock_it 200,
+                xml, { 'Content-Type' => 'application/vnd.vmware.vcloud.catalog+xml' }
+            else
+              mock_error 200, "401 Unauthorized"
+            end
           end
         end
       end

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

@@ -8,8 +8,44 @@ module Fog
         end
 
         class Mock
-          def get_catalog(catalog_uri)
-            Fog::Mock.not_implemented
+
+          #
+          # Based on
+          # http://support.theenterprisecloud.com/kb/default.asp?id=542&Lang=1&SID=
+          #
+
+          def get_catalog_item(catalog_item_uri)
+            catalog_item_id, vdc_id = catalog_item_uri.split("/").last.split("-")
+            xml = nil
+
+            if vdc = vdc_from_id(vdc_id)
+              if catalog_item = vdc[:catalog][:items].detect {|ci| ci[:id] == catalog_item_id }
+                builder = Builder::XmlMarkup.new
+
+                xml = builder.CatalogItem(xmlns.merge(:href => catalog_item_uri, :name => catalog_item[:name])) do
+                  builder.Link(
+                              :rel => "down",
+                              :href => Fog::Vcloud::Terremark::Ecloud::Mock.catalog_item_customization_href(:id => catalog_item_id),
+                              :type => "application/vnd.tmrk.ecloud.catalogItemCustomizationParameters+xml",
+                              :name => "Customization Options"
+                              )
+
+                  builder.Entity(
+                                 :href => Fog::Vcloud::Terremark::Ecloud::Mock.vapp_template_href(:id => catalog_item_id),
+                                 :type => "application/vnd.vmware.vcloud.vAppTemplate+xml",
+                                 :name => catalog_item[:name]
+                                 )
+
+                  builder.Property(0, :key => "LicensingCost")
+                end
+              end
+            end
+
+            if xml
+              mock_it 200, xml, {'Content-Type' => 'application/vnd.vmware.vcloud.catalogItem+xml'}
+            else
+              mock_error 200, "401 Unauthorized"
+            end
           end
         end
       end

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

@@ -8,8 +8,14 @@ module Fog
         end
 
         class Mock
-          def get_customization_options( options_uri )
-            Fog::Mock.not_implemented
+          def get_customization_options(options_uri)
+            builder = Builder::XmlMarkup.new
+            xml = builder.CustomizationParameters(xmlns) do
+              builder.CustomizeNetwork "true"
+              builder.CustomizePassword "false"
+            end
+
+            mock_it 200, xml, "Content-Type" => "application/vnd.tmrk.ecloud.catalogItemCustomizationParameters+xml"
           end
         end
       end

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

@@ -2,8 +2,8 @@ module Fog
   class Vcloud
     module Terremark
       class Ecloud
-
-        class Real
+        module Shared
+          private
 
           def validate_instantiate_vapp_template_options(catalog_item_uri, options)
             valid_opts = [:name, :vdc_uri, :network_uri, :cpus, :memory, :row, :group]
@@ -74,6 +74,10 @@ module Fog
               }
             }
           end
+        end
+
+        class Real
+          include Shared
 
           def instantiate_vapp_template(catalog_item_uri, options = {})
             validate_instantiate_vapp_template_options(catalog_item_uri, options)
@@ -90,8 +94,46 @@ module Fog
         end
 
         class Mock
-          def instantiate_vapp_template(vdc_uri)
-            Fog::Mock.not_implemented
+          include Shared
+
+          #
+          # Based on
+          # http://support.theenterprisecloud.com/kb/default.asp?id=554&Lang=1&SID=
+          #
+
+          def instantiate_vapp_template(catalog_item_uri, options = {})
+            validate_instantiate_vapp_template_options(catalog_item_uri, options)
+
+            xml = nil
+            if vdc = vdc_from_uri(options[:vdc_uri])
+              id = rand(1000)
+              vapp_uri = Fog::Vcloud::Terremark::Ecloud::Mock.vapp_href(:id => id)
+              options.update(:id => id.to_s, :href => vapp_uri)
+              vdc[:vms] << options
+
+              xml = generate_instantiate_vapp_template_response(vdc[:href], options[:name], vapp_uri)
+            end
+
+            if xml
+              mock_it 200, xml, {'Content-Type' => 'application/xml'}
+            else
+              mock_error 200, "401 Unauthorized"
+            end
+          end
+
+          private
+
+          def generate_instantiate_vapp_template_response(vdc_uri, vapp_name, vapp_uri)
+            builder = Builder::XmlMarkup.new
+            builder.VApp(xmlns.merge(
+                                     :href => vapp_uri,
+                                     :type => "application/vnd.vmware.vcloud.vApp+xml",
+                                     :name => vapp_name,
+                                     :status => 0,
+                                     :size => 4
+                                     )) {
+              builder.Link(:rel => "up", :href => vdc_uri, :type => "application/vnd.vmware.vcloud.vdc+xml")
+            }
           end
         end
       end

data/spec/aws/models/compute/server_spec.rb

@@ -23,6 +23,7 @@ describe 'Fog::AWS::Compute::Server' do
     it "should remap attributes from parser" do
       server = @servers.new({
         'amiLaunchIndex'    => 'ami_launch_index',
+        'clientToken'       => 'client_token',
         'dnsName'           => 'dns_name',
         'imageId'           => 'image_id',
         'instanceId'        => 'instance_id',
@@ -35,6 +36,7 @@ describe 'Fog::AWS::Compute::Server' do
         'ramdiskId'         => 'ramdisk_id'
       })
       server.ami_launch_index.should == 'ami_launch_index'
+      server.client_token.should == 'client_token'
       server.dns_name.should == 'dns_name'
       server.image_id.should == 'image_id'
       server.id.should == 'instance_id'

data/spec/aws/requests/simpledb/select_spec.rb

@@ -13,6 +13,7 @@ describe 'SimpleDB.select' do
     end
 
     it 'should return multi-value attributes when present' do
+      pending if Fog.mocking?
       @item = "someitem_fog_domain_#{Time.now.to_i}"
       AWS[:sdb].put_attributes(@domain_name, @item, { "attr" => "foo" })
       AWS[:sdb].put_attributes(@domain_name, @item, { "attr" => "foo2" })

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'spec'
 require 'open-uri'
 require 'fog'
 Fog.bin = true
-require 'fog/bin'
+require 'fog/core/bin'
 require 'fog/vcloud/bin'
 
 if ENV["FOG_MOCK"] == "true"

data/spec/vcloud/spec_helper.rb

@@ -21,7 +21,7 @@ srand 1234
 
 current_directory = File.dirname(__FILE__)
 require "#{current_directory}/../../lib/fog"
-require "#{current_directory}/../../lib/fog/bin"
+require "#{current_directory}/../../lib/fog/core/bin"
 
 Fog.mock! if ENV['FOG_MOCK']
 

data/spec/vcloud/terremark/ecloud/requests/get_catalog_item_spec.rb

@@ -0,0 +1,62 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+
+if Fog.mocking?
+  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+    subject { @vcloud }
+
+    it { should respond_to :get_catalog_item }
+
+    describe "#get_catalog_item" do
+      context "with a valid catalog_item_uri" do
+        before { @catalog_item = @vcloud.get_catalog_item(@vcloud.vdcs.first.catalog.first.href) }
+        subject { @catalog_item }
+        let(:catalog_item_id) { @catalog_item.body[:href].split("/").last.split("-").first }
+
+        it_should_behave_like "all responses"
+        it { should have_headers_denoting_a_content_type_of "application/vnd.vmware.vcloud.catalogItem+xml" }
+
+        describe "#body" do
+          subject { @catalog_item.body }
+
+          it { should have(8).items }
+
+          it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
+
+          its(:name) { should == "Item 0" }
+
+          it { should include :Entity }
+          it { should include :Link }
+          it { should include :Property }
+
+          describe "Entity" do
+            subject { @catalog_item.body[:Entity] }
+
+            it { should have(3).items }
+
+            its(:name) { should == "Item 0" }
+            its(:type) { should == "application/vnd.vmware.vcloud.vAppTemplate+xml" }
+            its(:href) { should == Fog::Vcloud::Terremark::Ecloud::Mock.vapp_template_href(:id => catalog_item_id) }
+          end
+
+          describe "Link" do
+            subject { @catalog_item.body[:Link] }
+
+            it { should have(4).items }
+
+            its(:rel)  { should == "down" }
+            its(:href) { should == Fog::Vcloud::Terremark::Ecloud::Mock.catalog_item_customization_href(:id => catalog_item_id) }
+            its(:name) { should == "Customization Options" }
+            its(:type) { should == "application/vnd.tmrk.ecloud.catalogItemCustomizationParameters+xml" }
+          end
+        end
+      end
+
+      context "with a catalog uri that doesn't exist" do
+        subject { lambda { @vcloud.get_catalog(URI.parse('https://www.fakey.com/api/v0.8/vdc/999/catalog')) } }
+
+        it_should_behave_like "a request for a resource that doesn't exist"
+      end
+    end
+  end
+else
+end

data/spec/vcloud/terremark/ecloud/requests/get_catalog_spec.rb

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+
+if Fog.mocking?
+  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+    subject { @vcloud }
+
+    it { should respond_to :get_catalog }
+
+    describe "#get_catalog" do
+      context "with a valid vdc catalog_uri" do
+        before { @catalog = @vcloud.get_catalog(@mock_vdc[:href] + "/catalog") }
+        subject { @catalog }
+
+        it_should_behave_like "all responses"
+        it { should have_headers_denoting_a_content_type_of "application/vnd.vmware.vcloud.catalog+xml" }
+
+        describe "#body" do
+          subject { @catalog.body }
+
+          it { should have(7).items }
+
+          it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
+
+          its(:name) { should == "The catalog" }
+
+          it { should include :CatalogItems }
+
+          describe "CatalogItems" do
+            subject { @catalog.body[:CatalogItems] }
+
+            it { should have(1).items }
+          end
+        end
+      end
+
+      context "with a catalog uri that doesn't exist" do
+        subject { lambda { @vcloud.get_catalog(URI.parse('https://www.fakey.com/api/v0.8/vdc/999/catalog')) } }
+
+        it_should_behave_like "a request for a resource that doesn't exist"
+      end
+    end
+  end
+else
+end