fog 0.3.8 → 0.3.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.8)
+    fog (0.3.9)
       builder
       excon (>= 0.2.4)
       formatador (>= 0.0.15)

data/README.rdoc

@@ -2,12 +2,6 @@ http://geemus.com/fog.png
 
 fog is the Ruby cloud computing library.
 
-################################################################################
-
-Thursday, October 14, 2010 10:00 am PST, hear it straight from {geemus}[http://github.com/geemus] in the {fog webinar}[http://pages.engineyard.com/FogWebinar.html]
-
-################################################################################
-
 The quick and dirty, top to bottom:
 * Collections provide a simplified interface, making clouds easier to work with and switch between.
 * Requests allow power users to get the most out of the features of each individual cloud.

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.3.8'
-  s.date              = '2010-10-14'
+  s.version           = '0.3.9'
+  s.date              = '2010-10-18'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -650,9 +650,11 @@ Gem::Specification.new do |s|
     spec/vcloud/terremark/ecloud/requests/get_nodes_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb
+    spec/vcloud/terremark/ecloud/requests/get_vapp_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
     spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb
     spec/vcloud/terremark/ecloud/requests/login_spec.rb
+    spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
     spec/vcloud/vcloud_spec.rb
     tests/aws/helper.rb
     tests/aws/models/storage/directory_tests.rb

data/lib/fog.rb

@@ -24,7 +24,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.8'
+    VERSION = '0.3.9'
   end
 
   module Mock

data/lib/fog/aws.rb

@@ -170,7 +170,7 @@ module Fog
       end
 
       private
-
+      
       def self.random_selection(characters, length)
         selection = ''
         length.times do
@@ -194,7 +194,7 @@ module Fog
 
       def self.hex(length)
         max = ('f' * length).to_i(16)
-        rand(max).to_s(16)
+        rand(max).to_s(16).rjust(length, '0')
       end
 
       def self.base64(length)

data/lib/fog/rackspace/models/storage/directories.rb

@@ -15,11 +15,16 @@ module Fog
         end
 
         def get(key, options = {})
-          data = connection.get_container(key, options).body
+          data = connection.get_container(key, options)
           directory = new(:key => key)
+          for key, value in data.headers
+            if ['X-Container-Bytes-Used', 'X-Container-Object-Count'].include?(key)
+              directory.merge_attributes(key => value)
+            end
+          end
           directory.files.merge_attributes(options)
           directory.files.instance_variable_set(:@loaded, true)
-          data.each do |file|
+          data.body.each do |file|
             directory.files << directory.files.new(file)
           end
           directory

data/lib/fog/rackspace/models/storage/directory.rb

@@ -12,8 +12,8 @@ module Fog
 
         identity  :key, :aliases => 'name'
 
-        attribute :bytes
-        attribute :count
+        attribute :bytes, :aliases => 'X-Container-Bytes-Used'
+        attribute :count, :aliases => 'X-Container-Object-Count'
 
         def destroy
           requires :key

data/lib/fog/rackspace/models/storage/file.rb

@@ -6,13 +6,13 @@ module Fog
 
       class File < Fog::Model
 
-        identity  :key,             :aliases => 'Key'
+        identity  :key,             :aliases => 'name'
 
         attr_writer :body
-        attribute :content_length,  :aliases => 'Content-Length'
-        attribute :content_type,    :aliases => 'Content-Type'
-        attribute :etag,            :aliases => 'Etag'
-        attribute :last_modified,   :aliases => 'Last-Modified'
+        attribute :content_length,  :aliases => ['bytes', 'Content-Length']
+        attribute :content_type,    :aliases => ['content_type', 'Content-Type']
+        attribute :etag,            :aliases => ['hash', 'Etag']
+        attribute :last_modified,   :aliases => ['last_modified', 'Last-Modified']
 
         def body
           @body ||= if last_modified

data/lib/fog/vcloud.rb

@@ -296,7 +296,7 @@ module Fog
                   :catalog => {
                      :name => "The catalog",
                      :items => [
-                        { :id => "0", :name => "Item 0" },
+                        { :id => "0", :name => "Item 0", :disks => [{ :size => 25 }] },
                         { :id => "1", :name => "Item 1" },
                         { :id => "2", :name => "Item 2" },
                      ]
@@ -328,13 +328,19 @@ module Fog
                     },
                   ],
                   :vms => [
-                    { :href => "#{base_url}/vap/41",
-                      :name => "Broom 1"
+                    { :href => "#{base_url}/vapp/41",
+                      :name => "Broom 1",
+                      :ip   => "1.2.3.3",
+                      :memory => 1024,
+                      :cpus => 1,
+                      :disks => [{ :size => 25 }],
+                      :status => 2
                     },
-                    { :href => "#{base_url}/vap/42",
-                      :name => "Broom 2"
+                    { :href => "#{base_url}/vapp/42",
+                      :name => "Broom 2",
+                      :ip => "1.2.3.4"
                     },
-                    { :href => "#{base_url}/vap/43",
+                    { :href => "#{base_url}/vapp/43",
                       :name => "Email!"
                     }
                   ]
@@ -360,7 +366,7 @@ module Fog
                     }
                   ],
                   :vms => [
-                    { :href => "#{base_url}/vap/44",
+                    { :href => "#{base_url}/vapp/44",
                       :name => "Master Blaster"
                     }
                   ]
@@ -387,6 +393,26 @@ module Fog
         end
       end
 
+      def vapp_and_vdc_from_vapp_uri(uri)
+        if vdc = mock_data[:organizations].map {|o| o[:vdcs] }.flatten.detect {|vd| vd[:vms].detect {|vm| uri =~ %r{^#{Regexp.escape(vm[:href])}($|/)} } }
+          vapp = vdc[:vms].detect {|v| uri =~ %r{^#{Regexp.escape(v[:href])}($|/)} }
+          if vapp
+            [vapp, vdc]
+          end
+        end
+      end
+
+      def catalog_item_and_vdc_from_catalog_item_uri(uri)
+        catalog_item_id, vdc_id = uri.split("/").last.split("-")
+        vdc = vdc_from_id(vdc_id)
+        if vdc
+          catalog_item = vdc[:catalog][:items].detect {|ci| ci[:id] == catalog_item_id }
+          if catalog_item
+            [catalog_item, vdc]
+          end
+        end
+      end
+
       def initialize(options = {})
         @versions_uri = URI.parse('https://vcloud.fakey.com/api/versions')
       end

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

@@ -15,29 +15,25 @@ module Fog
           #
 
           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
+            if catalog_item_and_vdc = catalog_item_and_vdc_from_catalog_item_uri(catalog_item_uri)
+              catalog_item, vdc = catalog_item_and_vdc
+              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
 

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

@@ -9,7 +9,74 @@ module Fog
 
         class Mock
           def get_vapp(vapp_uri)
-            Fog::Mock.not_implemented
+            xml = nil
+
+            if vapp_and_vdc = vapp_and_vdc_from_vapp_uri(vapp_uri)
+              xml = generate_get_vapp_response(*vapp_and_vdc)
+            end
+
+            if xml
+              mock_it 200, xml, "Content-Type" => "application/vnd.vmware.vcloud.vApp+xml"
+            else
+              mock_error 200, "401 Unauthorized"
+            end
+          end
+
+          private
+
+          def generate_get_vapp_response(vapp, vdc)
+            builder = Builder::XmlMarkup.new
+            builder.VApp(xmlns.merge(
+                                     :href => vapp[:href],
+                                     :type => "application/vnd.vmware.vcloud.vApp+xml",
+                                     :name => vapp[:name],
+                                     :status => vapp[:status] || 4
+                                     )) do
+              builder.Link(:rel => "up", :href => vdc[:href], :type => "application/vnd.vmware.vcloud.vdc+xml")
+
+              builder.NetworkConnectionSection(:xmlns => "http://schemas.dmtf.org/ovf/envelope/1") do
+                builder.NetworkConnection(:Network => "Internal", :xmlns => "http://www.vmware.com/vcloud/v0.8") do
+                  builder.IpAddress vapp[:ip]
+                end
+              end
+
+              builder.OperatingSystemSection(
+                                             "d2p1:id" => 4,
+                                             :xmlns => "http://schemas.dmtf.org/ovf/envelope/1",
+                                             "xmlns:d2p1" => "http://schemas.dmtf.org/ovf/envelope/1") do
+                builder.Info "The kind of installed guest operating system"
+                builder.Description "Red Hat Enterprise Linux 5 (64-bit)"
+              end
+
+              builder.VirtualHardwareSection(:xmlns => "http://schemas.dmtf.org/ovf/envelope/1") do
+                builder.Info
+                builder.System
+                builder.Item do
+                  # CPUs
+                  builder.VirtualQuantity vapp[:cpus] || 1
+                  builder.ResourceType 3
+                end
+                builder.Item do
+                  # memory
+                  builder.VirtualQuantity vapp[:memory] || 1024
+                  builder.ResourceType 4
+                end
+                builder.Item do
+                  # SCSI controller
+                  builder.Address 0
+                  builder.ResourceType 6
+                  builder.InstanceId 3
+                end
+                builder.Item do
+                  # Hard Disk 1
+                  builder.Parent 3
+                  builder.VirtualQuantity vapp[:disks].first[:size] * 1024 # MB
+                  builder.HostResource vapp[:disks].first[:size] * 1024 # MB
+                  builder.ResourceType 17
+                  builder.AddressOnParent 0
+                end
+              end
+            end
           end
         end
       end

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

@@ -103,12 +103,13 @@ module Fog
 
           def instantiate_vapp_template(catalog_item_uri, options = {})
             validate_instantiate_vapp_template_options(catalog_item_uri, options)
+            catalog_item, _ = catalog_item_and_vdc_from_catalog_item_uri(catalog_item_uri)
 
             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)
+              vapp_id = rand(1000)
+              vapp_uri = Fog::Vcloud::Terremark::Ecloud::Mock.vapp_href(:id => vapp_id)
+              options.update(:id => vapp_id.to_s, :href => vapp_uri, :disks => catalog_item[:disks], :ip => random_ip_in_network(options[:network_uri]), :status => 2)
               vdc[:vms] << options
 
               xml = generate_instantiate_vapp_template_response(vdc[:href], options[:name], vapp_uri)
@@ -123,6 +124,13 @@ module Fog
 
           private
 
+          def random_ip_in_network(network_uri)
+            network = mock_data[:organizations].map { |org| org[:vdcs].map { |vdc| vdc[:networks] } }.flatten.detect { |network| network[:href] == network_uri }
+            subnet_ipaddr = IPAddr.new(network[:subnet])
+            ips = subnet_ipaddr.to_range.to_a[3..-2]
+            ips[rand(ips.size)].to_s
+          end
+
           def generate_instantiate_vapp_template_response(vdc_uri, vapp_name, vapp_uri)
             builder = Builder::XmlMarkup.new
             builder.VApp(xmlns.merge(

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

@@ -8,8 +8,17 @@ module Fog
         end
 
         class Mock
-          def power_on(on_uri)
-            Fog::Mock.not_implemented
+          def power_on(vapp_uri)
+            vapp, vdc = vapp_and_vdc_from_vapp_uri(vapp_uri)
+
+            if vapp
+              vapp[:status] = 4
+
+              builder = Builder::XmlMarkup.new
+              mock_it 200, builder.Task(xmlns)
+            else
+              mock_error 200, "401 Unauthorized"
+            end
           end
         end
       end

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

@@ -0,0 +1,109 @@
+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_vapp }
+
+    describe "#get_vapp" do
+      context "with a valid vapp_uri" do
+        before { @vapp = @vcloud.get_vapp(vm_data[:href]) }
+        subject { @vapp }
+        let(:vapp_id) { @vapp.body[:href].split("/").last }
+        let(:vm_data) { @vcloud.mock_data[:organizations].first[:vdcs].first[:vms].first }
+        let(:vdc) { @vcloud.vdcs.first }
+
+        it_should_behave_like "all responses"
+        it { should have_headers_denoting_a_content_type_of "application/vnd.vmware.vcloud.vApp+xml" }
+
+        describe "#body" do
+          subject { @vapp.body }
+
+          specify { subject.keys.sort_by(&:to_s).should == [:Link, :NetworkConnectionSection, :OperatingSystemSection, :VirtualHardwareSection, :href, :name, :status, :type, :xmlns, :xmlns_xsd, :xmlns_xsi] }
+
+          it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
+
+          its(:href) { should == vm_data[:href] }
+          its(:name) { should == vm_data[:name] }
+          its(:status) { should == vm_data[:status].to_s }
+          its(:size) { (vm_data[:disks].inject(0) {|s, d| s += d[:size] } * 1024).to_s }
+
+          describe "Link" do
+            subject { @vapp.body[:Link] }
+
+            its(:rel)  { should == "up" }
+            its(:type) { should == "application/vnd.vmware.vcloud.vdc+xml" }
+            its(:href) { should == vdc.href }
+          end
+
+          describe "NetworkConnectionSection" do
+            subject { @vapp.body[:NetworkConnectionSection] }
+
+            it { should include :NetworkConnection }
+
+            describe "NetworkConnection" do
+              subject { @vapp.body[:NetworkConnectionSection][:NetworkConnection] }
+
+              its(:IpAddress) { should == vm_data[:ip] }
+            end
+          end
+
+          describe "OperatingSystemSection" do
+            subject { @vapp.body[:OperatingSystemSection] }
+
+            its(:Info) { should == "The kind of installed guest operating system" }
+            its(:Description) { should == "Red Hat Enterprise Linux 5 (64-bit)" }
+          end
+
+          describe "VirtualHardwareSection" do
+            subject { @vapp.body[:VirtualHardwareSection] }
+
+            specify { subject.keys.sort_by(&:to_s).should == [:Info, :Item, :System, :xmlns] }
+
+            describe "Item" do
+              subject { @vapp.body[:VirtualHardwareSection][:Item] }
+
+              it { should have(4).items }
+
+              specify { subject.map {|i| i[:ResourceType] }.sort.should == %w(3 4 6 17).sort }
+
+              describe "CPU" do
+                subject { @vapp.body[:VirtualHardwareSection][:Item].detect {|i| i[:ResourceType] == "3" } }
+
+                its(:VirtualQuantity) { should == vm_data[:cpus].to_s }
+              end
+
+              describe "memory" do
+                subject { @vapp.body[:VirtualHardwareSection][:Item].detect {|i| i[:ResourceType] == "4" } }
+
+                its(:VirtualQuantity) { should == vm_data[:memory].to_s }
+              end
+
+              describe "SCSI controller" do
+                subject { @vapp.body[:VirtualHardwareSection][:Item].detect {|i| i[:ResourceType] == "6" } }
+
+                its(:Address) { should == "0" }
+              end
+
+              describe "Hard Disk 1" do
+                subject { @vapp.body[:VirtualHardwareSection][:Item].detect {|i| i[:ResourceType] == "17" } }
+
+                its(:AddressOnParent) { should == "0" }
+                its(:VirtualQuantity) { should == (vm_data[:disks].first[:size] * 1024).to_s }
+                its(:HostResource)    { should == (vm_data[:disks].first[:size] * 1024).to_s }
+              end
+            end
+          end
+        end
+      end
+
+      context "with a vapp uri that doesn't exist" do
+        subject { lambda { @vcloud.get_vapp(URI.parse('https://www.fakey.com/api/v0.8/vApp/99999')) } }
+
+        it_should_behave_like "a request for a resource that doesn't exist"
+      end
+    end
+  end
+else
+end

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

@@ -9,6 +9,7 @@ if Fog.mocking?
     describe "#instantiate_vapp_template" do
       let(:vdc) { @vcloud.vdcs.first }
       let(:catalog_item) { vdc.catalog.first }
+      let(:catalog_item_data) { @vcloud.catalog_item_and_vdc_from_catalog_item_uri(catalog_item.href).first }
       let(:new_vapp_data) do
         {
           :name => "foobar",
@@ -20,6 +21,7 @@ if Fog.mocking?
           :vdc_uri => vdc.href
         }
       end
+      let(:added_mock_data) { @vcloud.vdc_from_uri(vdc.href)[:vms].last }
 
       context "with a valid data" do
         let(:template_instantiation) { @vcloud.instantiate_vapp_template(catalog_item.href, new_vapp_data) }
@@ -33,14 +35,25 @@ if Fog.mocking?
         end
 
         describe "added mock data" do
-          subject { template_instantiation; @vcloud.vdc_from_uri(vdc.href)[:vms].last }
+          subject { template_instantiation; added_mock_data }
 
           it { should include :id }
           it { should include :href }
+          it { should include :disks }
+          it { should include :ip }
+          its(:status) { should == 2 }
+
+          its(:disks) { should == catalog_item_data[:disks] }
 
           specify { subject.values_at(*new_vapp_data.keys).should == new_vapp_data.values }
         end
 
+        describe "server based on added mock data" do
+          subject { template_instantiation; vdc.servers.reload.detect {|s| s.href == added_mock_data[:href] }.reload }
+
+          its(:name) { should == new_vapp_data[:name] }
+        end
+
         describe "#body" do
           subject { template_instantiation.body }
 

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

@@ -0,0 +1,35 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+
+if Fog.mocking?
+  describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do
+    subject { @vcloud }
+
+    it { should respond_to :power_on }
+
+    describe :power_on, :type => :vcloud_request do
+      context "with a valid vapp uri" do
+        let(:vm_data) { @vcloud.mock_data[:organizations].first[:vdcs].first[:vms].first }
+        before { vm_data[:status] = 2; @power_on = @vcloud.power_on(@vcloud.vdcs.first.servers.first.href + "/power/action/powerOn") }
+        subject { @power_on }
+
+        it_should_behave_like "all responses"
+        #it { should have_headers_denoting_a_content_type_of "application/vnd.vmware.vcloud.network+xml" }
+
+        specify { vm_data[:status].should == 4 }
+
+        describe :body do
+          subject { @power_on.body }
+
+          it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
+        end
+      end
+
+      context "with a vapp uri that doesn't exist" do
+        subject { lambda { @vcloud.get_network(URI.parse('https://www.fakey.com/api/v0.8/vapp/9999')) } }
+        it_should_behave_like "a request for a resource that doesn't exist"
+      end
+    end
+  end
+else
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -07:00
+date: 2010-10-18 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -757,9 +757,11 @@ files:
 - spec/vcloud/terremark/ecloud/requests/get_nodes_spec.rb
 - spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb
 - spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb
+- spec/vcloud/terremark/ecloud/requests/get_vapp_spec.rb
 - spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
 - spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb
 - spec/vcloud/terremark/ecloud/requests/login_spec.rb
+- spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
 - spec/vcloud/vcloud_spec.rb
 - tests/aws/helper.rb
 - tests/aws/models/storage/directory_tests.rb