fog 0.1.4 → 0.1.5

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.1.4'
-  s.date              = '2010-05-26'
+  s.version           = '0.1.5'
+  s.date              = '2010-05-27'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -354,6 +354,10 @@ Gem::Specification.new do |s|
     lib/fog/terremark/vcloud.rb
     lib/fog/vcloud.rb
     lib/fog/vcloud/bin.rb
+    lib/fog/vcloud/collection.rb
+    lib/fog/vcloud/model.rb
+    lib/fog/vcloud/models/vdc.rb
+    lib/fog/vcloud/models/vdcs.rb
     lib/fog/vcloud/parser.rb
     lib/fog/vcloud/parsers/get_organization.rb
     lib/fog/vcloud/parsers/get_vdc.rb
@@ -365,6 +369,8 @@ Gem::Specification.new do |s|
     lib/fog/vcloud/requests/login.rb
     lib/fog/vcloud/terremark/all.rb
     lib/fog/vcloud/terremark/ecloud.rb
+    lib/fog/vcloud/terremark/ecloud/models/vdc.rb
+    lib/fog/vcloud/terremark/ecloud/models/vdcs.rb
     lib/fog/vcloud/terremark/ecloud/parsers/get_vdc.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb
     lib/fog/vcloud/terremark/ecloud/requests/login.rb
@@ -389,11 +395,6 @@ Gem::Specification.new do |s|
     spec/aws/models/s3/file_spec.rb
     spec/aws/models/s3/files_spec.rb
     spec/aws/requests/ec2/describe_images_spec.rb
-    spec/aws/requests/ec2/describe_instances_spec.rb
-    spec/aws/requests/ec2/get_console_output_spec.rb
-    spec/aws/requests/ec2/reboot_instances_spec.rb
-    spec/aws/requests/ec2/run_instances_spec.rb
-    spec/aws/requests/ec2/terminate_instances_spec.rb
     spec/aws/requests/s3/copy_object_spec.rb
     spec/aws/requests/s3/delete_bucket_spec.rb
     spec/aws/requests/s3/delete_object_spec.rb
@@ -438,11 +439,15 @@ Gem::Specification.new do |s|
     spec/slicehost/models/servers_spec.rb
     spec/spec_helper.rb
     spec/vcloud/bin_spec.rb
+    spec/vcloud/models/vdc_spec.rb
+    spec/vcloud/models/vdcs_spec.rb
     spec/vcloud/requests/get_organization_spec.rb
     spec/vcloud/requests/get_vdc_spec.rb
     spec/vcloud/requests/get_versions_spec.rb
     spec/vcloud/requests/login_spec.rb
     spec/vcloud/spec_helper.rb
+    spec/vcloud/terremark/ecloud/models/vdc_spec.rb
+    spec/vcloud/terremark/ecloud/models/vdcs_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
     spec/vcloud/terremark/ecloud/requests/login_spec.rb
     spec/vcloud/terremark/vcloud/requests/get_vdc_spec.rb
@@ -450,6 +455,7 @@ Gem::Specification.new do |s|
     tests/aws/helper.rb
     tests/aws/requests/ec2/address_tests.rb
     tests/aws/requests/ec2/availability_zone_tests.rb
+    tests/aws/requests/ec2/instance_tests.rb
     tests/aws/requests/ec2/key_pair_tests.rb
     tests/aws/requests/ec2/region_tests.rb
     tests/aws/requests/ec2/security_group_tests.rb

data/lib/fog.rb

@@ -47,7 +47,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 
   module Mock

data/lib/fog/aws.rb

@@ -57,10 +57,6 @@ module Fog
         "ip-#{ip_address.gsub('.','-')}.ec2.internal"
       end
 
-      def self.console_output
-        'This is my console. There are many like it, but this one is mine. My console is my best friend. It is my life. I must master it as I master my life. My console, without me, is useless. Without my console, I am useless.'
-      end
-
       def self.etag
         hex(32)
       end

data/lib/fog/aws/parsers/ec2/get_console_output.rb

@@ -14,8 +14,10 @@ module Fog
             when 'instanceId', 'requestId'
               @response[name] = @value
             when 'output'
-              if @value
-                @response[name] = Base64.decode64(@value)
+              @response[name] = if @value
+                Base64.decode64(@value)
+              else
+                nil
               end
             when 'timestamp'
               @response[name] = Time.parse(@value)

data/lib/fog/aws/requests/ec2/associate_address.rb

@@ -45,7 +45,7 @@ module Fog
             }
             response
           elsif !instance
-            raise Fog::AWS::EC2::Error.new("InvalidInstanceID.NotFound => The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::EC2::NotFound.new("The instance ID '#{instance_id}' does not exist")
           elsif !address
             raise Fog::AWS::EC2::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           end

data/lib/fog/aws/requests/ec2/attach_volume.rb

@@ -56,9 +56,9 @@ module Fog
               }.merge!(data)
               response
             elsif !instance
-              raise Fog::AWS::EC2::Error.new("InvalidInstanceID.NotFound => The instance ID '#{instance_id}' does not exist.")
+              raise Fog::AWS::EC2::NotFound.new("The instance ID '#{instance_id}' does not exist.")
             elsif !volume
-              raise Fog::AWS::EC2::Error.new("InvalidVolume.NotFound => The volume '#{volume_id}' does not exist.")
+              raise Fog::AWS::EC2::NotFound.new("The volume '#{volume_id}' does not exist.")
             end
           else
             message = 'MissingParameter => '

data/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb

@@ -76,7 +76,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidGroup.NotFound => The security group '#{options['GroupName']}' does not exist")
+            raise Fog::AWS::EC2::NotFound.new("The security group '#{options['GroupName']}' does not exist")
           end
         end
 

data/lib/fog/aws/requests/ec2/delete_security_group.rb

@@ -36,7 +36,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidGroup.NotFound => The security group '#{name}' does not exist")
+            raise Fog::AWS::EC2::NotFound.new("The security group '#{name}' does not exist")
           end
         end
       end

data/lib/fog/aws/requests/ec2/delete_snapshot.rb

@@ -36,7 +36,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidSnapshot.NotFound => The snapshot '#{snapshot_id}' does not exist.")
+            raise Fog::AWS::EC2::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
           end
         end
 

data/lib/fog/aws/requests/ec2/delete_volume.rb

@@ -38,7 +38,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidVolume.NotFound => The volume '#{volume_id}' does not exist.")
+            raise Fog::AWS::EC2::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
 

data/lib/fog/aws/requests/ec2/describe_addresses.rb

@@ -44,7 +44,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidAddress.NotFound => Address #{public_ip.inspect} not found.")
+            raise Fog::AWS::EC2::NotFound.new("Address #{public_ip.inspect} not found.")
           end
         end
 

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -107,7 +107,7 @@ module Fog
                   'ownerId'       => instance['ownerId'],
                   'reservationId' => instance['reservationId']
                 }
-                reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'blockDeviceMapping', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType'].include?(key)}
+                reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType'].include?(key)}
               end
             end
 
@@ -117,7 +117,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidInstanceID.NotFound => The instance ID #{instance_id.inspect} does not exist")
+            raise Fog::AWS::EC2::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
           end
         end
 

data/lib/fog/aws/requests/ec2/describe_key_pairs.rb

@@ -46,7 +46,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidKeyPair.NotFound => The key pair #{key_name.inspect} does not exist")
+            raise Fog::AWS::EC2::NotFound.new("The key pair #{key_name.inspect} does not exist")
           end
         end
 

data/lib/fog/aws/requests/ec2/describe_security_groups.rb

@@ -54,7 +54,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidGroup.NotFound => The security group #{group_name.inspect} does not exist")
+            raise Fog::AWS::EC2::NotFound.new("The security group #{group_name.inspect} does not exist")
           end
         end
 

data/lib/fog/aws/requests/ec2/describe_snapshots.rb

@@ -68,7 +68,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidSnapshot.NotFound => The snapshot #{snapshot_id.inspect} does not exist.")
+            raise Fog::AWS::EC2::NotFound.new("The snapshot #{snapshot_id.inspect} does not exist.")
           end
         end
 

data/lib/fog/aws/requests/ec2/describe_volumes.rb

@@ -74,7 +74,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidVolume.NotFound => The volume #{volume_id.inspect} does not exist.")
+            raise Fog::AWS::EC2::NotFound.new("The volume #{volume_id.inspect} does not exist.")
           end
         end
 

data/lib/fog/aws/requests/ec2/detach_volume.rb

@@ -46,7 +46,7 @@ module Fog
             }.merge!(data)
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidVolume.NotFound => The volume '#{volume_id}' does not exist.")
+            raise Fog::AWS::EC2::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
 

data/lib/fog/aws/requests/ec2/get_console_output.rb

@@ -34,13 +34,13 @@ module Fog
             response.status = 200
             response.body = {
               'instanceId'    => instance_id,
-              'output'        => Fog::AWS::Mock.console_output,
+              'output'        => nil,
               'requestId'     => Fog::AWS::Mock.request_id,
               'timestamp'     => Time.now
             }
             response
           else;
-            raise Fog::AWS::EC2::Error.new("InvalidInstanceID.NotFound => The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::EC2::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
 

data/lib/fog/aws/requests/ec2/reboot_instances.rb

@@ -40,7 +40,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidInstanceID.NotFound => The instance ID #{instance_id.inspect} does not exist")
+            raise Fog::AWS::EC2::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
           end
         end
 

data/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb

@@ -64,7 +64,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidGroup.NotFound => The security group '#{options['GroupName']}' does not exist")
+            raise Fog::AWS::EC2::NotFound.new("The security group '#{options['GroupName']}' does not exist")
           end
         end
 

data/lib/fog/aws/requests/ec2/run_instances.rb

@@ -122,7 +122,7 @@ module Fog
               'instanceState'       => { 'code' => 0, 'name' => 'pending' },
               'instanceType'        => options['InstanceType'] || 'm1.small',
               'kernelId'            => options['KernelId'] || Fog::AWS::Mock.kernel_id,
-              'keyName'             => options['KeyName'] || '',
+              # 'keyName'             => options['KeyName'],
               'launchTime'          => Time.now,
               'monitoring'          => { 'state' => options['Monitoring.Enabled'] || false },
               'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
@@ -134,6 +134,7 @@ module Fog
             }
             instances_set << instance
             @data[:instances][instance_id] = instance.merge({
+              'architecture'        => 'i386',
               'groupSet'            => group_set,
               'ownerId'             => @owner_id,
               'privateIpAddress'    => nil,

data/lib/fog/aws/requests/ec2/terminate_instances.rb

@@ -80,7 +80,7 @@ module Fog
 
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidInstanceID.NotFound => The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::EC2::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
 

data/lib/fog/collection.rb

@@ -35,10 +35,14 @@ module Fog
       end
     end
 
-    def self.model(new_model)
-      @model = new_model
+    def self.model(new_model=nil)
+      if new_model == nil
+        @model
+      else
+        @model = new_model
+      end
     end
-    
+
     def self.aliases
       @aliases ||= {}
     end

data/lib/fog/terremark/shared.rb

@@ -85,7 +85,8 @@ module Fog
       module Mock
         include Common
 
-        DATA = {
+        def self.mock_data
+        {
           :organizations =>
           [
             {
@@ -167,6 +168,7 @@ module Fog
             }
           ]
         }
+        end
 
         def self.error_headers
           {"X-Powered-By"=>"ASP.NET",
@@ -199,7 +201,7 @@ module Fog
           self.class.instance_eval '
             def self.data
               @data ||= Hash.new do |hash, key|
-                hash[key] = Fog::Terremark::Shared::Mock::DATA
+                hash[key] = Fog::Terremark::Shared::Mock.mock_data
               end
             end'
           self.class.instance_eval '

data/lib/fog/vcloud.rb

@@ -39,7 +39,7 @@ module Fog
           end
           org_list = @login_results.body.organizations
           if organization = @login_results.body.organizations.first
-            URI.parse(organization[:href])
+            organization[:href]
           else
             nil
           end
@@ -132,6 +132,23 @@ module Fog
         :versions => [
           { :version => "v0.8", :login_url => "https://fakey.com/api/v0.8/login", :supported => true }
         ],
+        :vdc_resources => [
+          {
+            :type => "application/vnd.vmware.vcloud.vApp+xml",
+            :href => "https://fakey.com/api/v0.8/vapp/61",
+            :name => "Foo App 1"
+          },
+          {
+            :type => "application/vnd.vmware.vcloud.vApp+xml",
+            :href => "https://fakey.com/api/v0.8/vapp/62",
+            :name => "Bar App 1"
+          },
+          {
+            :type => "application/vnd.vmware.vcloud.vApp+xml",
+            :href => "https://fakey.com/api/v0.8/vapp/63",
+            :name => "Bar App 2"
+          }
+        ],
         :organizations =>
         [
           {
@@ -250,7 +267,11 @@ module Fog
     class <<self
       def new(credentials = {})
         unless @required
+          require 'fog/vcloud/model'
+          require 'fog/vcloud/collection'
           require 'fog/vcloud/parser'
+          require 'fog/vcloud/models/vdc'
+          require 'fog/vcloud/models/vdcs'
           require 'fog/vcloud/terremark/vcloud'
           require 'fog/vcloud/terremark/ecloud'
           require 'fog/vcloud/requests/get_organization'
@@ -263,11 +284,12 @@ module Fog
           require 'fog/vcloud/parsers/login'
 
           Struct.new("VcloudLink", :rel, :href, :type, :name)
-          Struct.new("VcloudVdc", :links, :href, :type, :name, :xmlns, :allocation_model, :description)
+          Struct.new("VcloudVdc", :links, :resource_entities, :networks, :cpu_capacity, :storage_capacity, :memory_capacity, :href, :type, :name, :xmlns,
+                                  :allocation_model, :network_quota, :nic_quota, :vm_quota, :enabled, :description)
           Struct.new("VcloudOrganization", :links, :name, :href, :type, :xmlns, :description)
           Struct.new("VcloudVersion", :version, :login_url, :supported)
           Struct.new("VcloudOrgList", :organizations, :xmlns)
-          Struct.new("VcloudOrgLink", :name, :href, :type)
+          Struct.new("VcloudXCapacity", :units, :allocated, :used, :limit)
           @required = true
         end
 

data/lib/fog/vcloud/collection.rb

@@ -0,0 +1,66 @@
+module Fog
+  module Vcloud
+    class Collection < Fog::Collection
+
+      class << self
+
+        def inherited(klass)
+          klass.instance_variable_set(:@model, @model)
+          klass.all_request @all_request
+          klass.vcloud_type @vcloud_type
+          klass.get_request @get_request
+        end
+
+        def all_request(all_request=nil)
+          unless all_request
+            @all_request
+          else
+            @all_request = all_request
+            class_eval <<-EOS, __FILE__, __LINE__
+              def all
+                data = self.class.all_request.call(self).body.links.select do |link|
+                  link.type == self.class.vcloud_type
+                end.map { |link| {:href => link.href, :name => link.name } }
+                load(data)
+              end
+            EOS
+          end
+        end
+
+        def vcloud_type(vcloud_type=nil)
+          unless vcloud_type
+            @vcloud_type
+          else
+            @vcloud_type = vcloud_type
+          end
+        end
+
+        def get_request(get_request=nil)
+          unless get_request
+            @get_request
+          else
+            @get_request = get_request
+            class_eval <<-EOS, __FILE__, __LINE__
+              def get(uri)
+                item = new(:href => uri)
+                item.reload
+              end
+              def get_raw(uri)
+                connection.#{@get_request}(uri)
+              end
+            EOS
+          end
+        end
+      end
+
+      def [](index)
+        self.slice(index).reload
+      end
+
+      def reload
+        self.all
+      end
+
+    end
+  end
+end