fog 1.7.0 → 1.8.0

data/tests/rackspace/requests/dns/helper.rb

@@ -2,24 +2,21 @@ SUBDOMAIN_FORMAT = {
   'name' => String,
   'id' => Integer,
   'created' => String,
-  'updated' => String
+  'updated' => String,
+  'emailAddress' => String
 }
 
+DOMAIN_FORMAT = SUBDOMAIN_FORMAT.merge({
+  'accountId' => Integer
+})
+
 LIST_SUBDOMAINS_FORMAT = {
   'domains' => [SUBDOMAIN_FORMAT],
   'totalEntries' => Integer
 }
 
 LIST_DOMAIN_FORMAT = {
-  'domains' => [
-    {
-      'name' => String,
-      'id' => Integer,
-      'accountId' => Integer,
-      'updated' => String,
-      'created' => String
-    }
-  ],
+  'domains' => [DOMAIN_FORMAT],
   'totalEntries' => Integer,
   'links' => [
     {
@@ -50,16 +47,10 @@ NAME_SERVERS_FORMAT = [{
   'name' => String
 }]
 
-BASIC_DOMAIN_DETAIL_FORMAT = {
-  'name' => String,
-  'id' => Integer,
-  'accountId' => Integer,
-  'updated' => String,
-  'created' =>String,
-  'ttl' => Integer,
-  'emailAddress' => String,
-  'nameservers' => NAME_SERVERS_FORMAT
-}
+BASIC_DOMAIN_DETAIL_FORMAT = DOMAIN_FORMAT.merge({
+  'nameservers' => NAME_SERVERS_FORMAT,
+  'ttl' => Integer
+})
 
 LIST_DOMAIN_DETAILS_WITH_RECORDS = BASIC_DOMAIN_DETAIL_FORMAT.merge({
   'recordsList' => RECORD_LIST_FORMAT
@@ -68,12 +59,7 @@ LIST_DOMAIN_DETAILS_WITH_RECORDS = BASIC_DOMAIN_DETAIL_FORMAT.merge({
 LIST_DOMAIN_DETAILS_WITH_RECORDS_AND_SUBDOMAINS_FORMAT = BASIC_DOMAIN_DETAIL_FORMAT.merge({
   'recordsList'     => RECORD_LIST_FORMAT,
   'subdomains'      => {
-    'domains'   => [{
-      'created' => String,
-      'name'    => String,
-      'id'      => Integer,
-      'updated' => String
-    }],
+    'domains'   => [SUBDOMAIN_FORMAT],
     'totalEntries'  => Integer
   }
 })

data/tests/vsphere/compute_tests.rb

@@ -21,10 +21,10 @@ Shindo.tests('Fog::Compute[:vsphere]', ['vsphere']) do
 
     tests("When converting an incomplete vm object") do
       test("it should return a Hash") do
-        compute.convert_vm_mob_ref_to_attr_hash(fake_vm_mob_ref).kind_of? Hash
+        compute.send(:convert_vm_mob_ref_to_attr_hash, fake_vm_mob_ref).kind_of? Hash
       end
       tests("The converted Hash should") do
-        attr_hash = compute.convert_vm_mob_ref_to_attr_hash(fake_vm_mob_ref)
+        attr_hash = compute.send(:convert_vm_mob_ref_to_attr_hash, fake_vm_mob_ref)
         test("have a name") { attr_hash['name'] == 'fakevm' }
         test("have a mo_ref") {attr_hash['mo_ref'] == 'vm-123' }
         test("have an id") { attr_hash['id'] == 'vm-123' }
@@ -33,7 +33,7 @@ Shindo.tests('Fog::Compute[:vsphere]', ['vsphere']) do
     end
 
     tests("When passed a nil object") do
-      attr_hash = compute.convert_vm_mob_ref_to_attr_hash(nil)
+      attr_hash = compute.send :convert_vm_mob_ref_to_attr_hash, nil
       test("it should return a nil object") do
         attr_hash.nil?
       end

data/tests/vsphere/models/compute/server_tests.rb

@@ -26,8 +26,7 @@ Shindo.tests('Fog::Compute[:vsphere] | server model', ['vsphere']) do
         :connection_state,
         :hypervisor,
         :name,
-        :ipaddress,
-        :is_a_template]
+        :ipaddress]
       tests("The server model should respond to") do
         attributes.each do |attribute|
           test("#{attribute}") { server.respond_to? attribute }

data/tests/vsphere/requests/compute/list_virtual_machines_tests.rb

@@ -1,19 +1,11 @@
 Shindo.tests('Fog::Compute[:vsphere] | list_virtual_machines request', ['vsphere']) do
 
-  key = 'virtual_machines'
-
   tests("When listing all machines") do
 
     response = Fog::Compute[:vsphere].list_virtual_machines
 
     tests("The response data format ...") do
-      test("be a kind of Hash") { response.kind_of? Hash }
-      test("have a #{key} key") do
-        response.has_key? key
-      end
-      test("it should be a kind of Array") do
-        response[key].kind_of? Array
-      end
+      test("be a kind of Hash") { response.kind_of? Array }
     end
   end
 
@@ -26,9 +18,9 @@ Shindo.tests('Fog::Compute[:vsphere] | list_virtual_machines request', ['vsphere
       response = Fog::Compute[:vsphere].list_virtual_machines({'instance_uuid' => uuid})
 
       tests("The response should") do
-        test("contain one vm") { response[key].length == 1 }
-        test("contain that is an attribute hash") { response[key][0].kind_of? Hash }
-        test("find jefftest") { response[key].first['name'] == 'jefftest' }
+        test("contain one vm") { response.length == 1 }
+        test("contain that is an attribute hash") { response[0].kind_of? Hash }
+        test("find jefftest") { response.first[:name] == 'jefftest' }
       end
     end
 
@@ -37,7 +29,7 @@ Shindo.tests('Fog::Compute[:vsphere] | list_virtual_machines request', ['vsphere
         response = Fog::Compute[:vsphere].list_virtual_machines({'instance_uuid' => uuid})
 
         tests("The response should") do
-          test("be empty") { response[key].empty? }
+          test("be empty") { response.empty? }
         end
       end
     end

data/tests/vsphere/requests/compute/vm_clone_tests.rb

@@ -4,7 +4,7 @@ Shindo.tests("Fog::Compute[:vsphere] | vm_clone request", 'vsphere') do
   response = nil
   response_linked = nil
 
-  template = "/Datacenters/Solutions/vm/Jeff/Templates/centos56gm2"
+  template = "/Datacenters/Solutions/vm/rhel64"
   tests("Standard Clone | The return value should") do
     response = compute.vm_clone('path' => template, 'name' => 'cloning_vm', 'wait' => 1)
     test("be a kind of Hash") { response.kind_of? Hash }
@@ -13,7 +13,7 @@ Shindo.tests("Fog::Compute[:vsphere] | vm_clone request", 'vsphere') do
     end
   end
 
-  template = "/Datacenters/Solutions/vm/Jeff/Templates/centos56gm2"
+  template = "/Datacenters/Solutions/vm/rhel64"
   tests("Linked Clone | The return value should") do
     response = compute.vm_clone('path' => template, 'name' => 'cloning_vm_linked', 'wait' => 1, 'linked_clone' => true)
     test("be a kind of Hash") { response.kind_of? Hash }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -204,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -796,6 +796,7 @@ files:
 - lib/fog/aws/parsers/storage/access_control_list.rb
 - lib/fog/aws/parsers/storage/complete_multipart_upload.rb
 - lib/fog/aws/parsers/storage/copy_object.rb
+- lib/fog/aws/parsers/storage/delete_multiple_objects.rb
 - lib/fog/aws/parsers/storage/get_bucket.rb
 - lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb
 - lib/fog/aws/parsers/storage/get_bucket_location.rb
@@ -974,6 +975,7 @@ files:
 - lib/fog/aws/requests/compute/modify_instance_attribute.rb
 - lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
 - lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
+- lib/fog/aws/requests/compute/modify_volume_attribute.rb
 - lib/fog/aws/requests/compute/monitor_instances.rb
 - lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
 - lib/fog/aws/requests/compute/reboot_instances.rb
@@ -1204,6 +1206,7 @@ files:
 - lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb
 - lib/fog/aws/requests/storage/delete_bucket_policy.rb
 - lib/fog/aws/requests/storage/delete_bucket_website.rb
+- lib/fog/aws/requests/storage/delete_multiple_objects.rb
 - lib/fog/aws/requests/storage/delete_object.rb
 - lib/fog/aws/requests/storage/get_bucket.rb
 - lib/fog/aws/requests/storage/get_bucket_acl.rb
@@ -1367,6 +1370,7 @@ files:
 - lib/fog/brightbox/models/compute/users.rb
 - lib/fog/brightbox/models/compute/zone.rb
 - lib/fog/brightbox/models/compute/zones.rb
+- lib/fog/brightbox/oauth2.rb
 - lib/fog/brightbox/requests/compute/activate_console_server.rb
 - lib/fog/brightbox/requests/compute/add_listeners_load_balancer.rb
 - lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb
@@ -1425,6 +1429,7 @@ files:
 - lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb
 - lib/fog/brightbox/requests/compute/remove_servers_server_group.rb
 - lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb
+- lib/fog/brightbox/requests/compute/reset_ftp_password_scoped_account.rb
 - lib/fog/brightbox/requests/compute/reset_secret_api_client.rb
 - lib/fog/brightbox/requests/compute/reset_secret_application.rb
 - lib/fog/brightbox/requests/compute/shutdown_server.rb
@@ -2368,6 +2373,7 @@ files:
 - lib/fog/openstack/requests/compute/get_flavor_details.rb
 - lib/fog/openstack/requests/compute/get_host_details.rb
 - lib/fog/openstack/requests/compute/get_image_details.rb
+- lib/fog/openstack/requests/compute/get_limits.rb
 - lib/fog/openstack/requests/compute/get_metadata.rb
 - lib/fog/openstack/requests/compute/get_quota.rb
 - lib/fog/openstack/requests/compute/get_quota_defaults.rb
@@ -2405,6 +2411,7 @@ files:
 - lib/fog/openstack/requests/compute/release_address.rb
 - lib/fog/openstack/requests/compute/remove_fixed_ip.rb
 - lib/fog/openstack/requests/compute/rescue_server.rb
+- lib/fog/openstack/requests/compute/reset_server_state.rb
 - lib/fog/openstack/requests/compute/resize_server.rb
 - lib/fog/openstack/requests/compute/resume_server.rb
 - lib/fog/openstack/requests/compute/revert_resize_server.rb
@@ -2441,6 +2448,7 @@ files:
 - lib/fog/openstack/requests/identity/list_user_global_roles.rb
 - lib/fog/openstack/requests/identity/list_users.rb
 - lib/fog/openstack/requests/identity/remove_user_from_tenant.rb
+- lib/fog/openstack/requests/identity/set_tenant.rb
 - lib/fog/openstack/requests/identity/update_tenant.rb
 - lib/fog/openstack/requests/identity/update_user.rb
 - lib/fog/openstack/requests/identity/validate_token.rb
@@ -2923,6 +2931,7 @@ files:
 - lib/fog/vcloud/requests/compute/power_reset.rb
 - lib/fog/vcloud/requests/compute/power_shutdown.rb
 - lib/fog/vcloud/requests/compute/undeploy.rb
+- lib/fog/version.rb
 - lib/fog/virtual_box.rb
 - lib/fog/virtual_box/compute.rb
 - lib/fog/virtual_box/models/compute/medium.rb
@@ -2962,15 +2971,46 @@ files:
 - lib/fog/voxel/requests/compute/voxcloud_status.rb
 - lib/fog/vsphere.rb
 - lib/fog/vsphere/compute.rb
+- lib/fog/vsphere/models/compute/cluster.rb
+- lib/fog/vsphere/models/compute/clusters.rb
+- lib/fog/vsphere/models/compute/datacenter.rb
+- lib/fog/vsphere/models/compute/datacenters.rb
+- lib/fog/vsphere/models/compute/datastore.rb
+- lib/fog/vsphere/models/compute/datastores.rb
+- lib/fog/vsphere/models/compute/folder.rb
+- lib/fog/vsphere/models/compute/folders.rb
+- lib/fog/vsphere/models/compute/interface.rb
+- lib/fog/vsphere/models/compute/interfaces.rb
+- lib/fog/vsphere/models/compute/network.rb
+- lib/fog/vsphere/models/compute/networks.rb
+- lib/fog/vsphere/models/compute/resource_pool.rb
+- lib/fog/vsphere/models/compute/resource_pools.rb
 - lib/fog/vsphere/models/compute/server.rb
 - lib/fog/vsphere/models/compute/servers.rb
+- lib/fog/vsphere/models/compute/template.rb
+- lib/fog/vsphere/models/compute/templates.rb
+- lib/fog/vsphere/models/compute/volume.rb
+- lib/fog/vsphere/models/compute/volumes.rb
+- lib/fog/vsphere/requests/compute/create_vm.rb
 - lib/fog/vsphere/requests/compute/current_time.rb
-- lib/fog/vsphere/requests/compute/datacenters.rb
-- lib/fog/vsphere/requests/compute/find_vm_by_ref.rb
+- lib/fog/vsphere/requests/compute/get_cluster.rb
+- lib/fog/vsphere/requests/compute/get_datacenter.rb
+- lib/fog/vsphere/requests/compute/get_datastore.rb
+- lib/fog/vsphere/requests/compute/get_folder.rb
+- lib/fog/vsphere/requests/compute/get_network.rb
+- lib/fog/vsphere/requests/compute/get_resource_pool.rb
+- lib/fog/vsphere/requests/compute/get_virtual_machine.rb
+- lib/fog/vsphere/requests/compute/list_clusters.rb
+- lib/fog/vsphere/requests/compute/list_datacenters.rb
+- lib/fog/vsphere/requests/compute/list_datastores.rb
+- lib/fog/vsphere/requests/compute/list_folders.rb
+- lib/fog/vsphere/requests/compute/list_networks.rb
+- lib/fog/vsphere/requests/compute/list_resource_pools.rb
 - lib/fog/vsphere/requests/compute/list_virtual_machines.rb
+- lib/fog/vsphere/requests/compute/list_vm_interfaces.rb
+- lib/fog/vsphere/requests/compute/list_vm_volumes.rb
 - lib/fog/vsphere/requests/compute/vm_clone.rb
 - lib/fog/vsphere/requests/compute/vm_config_vnc.rb
-- lib/fog/vsphere/requests/compute/vm_create.rb
 - lib/fog/vsphere/requests/compute/vm_destroy.rb
 - lib/fog/vsphere/requests/compute/vm_migrate.rb
 - lib/fog/vsphere/requests/compute/vm_power_off.rb
@@ -3064,6 +3104,9 @@ files:
 - lib/fog/zerigo/requests/dns/list_zones.rb
 - lib/fog/zerigo/requests/dns/update_host.rb
 - lib/fog/zerigo/requests/dns/update_zone.rb
+- lib/tasks/changelog_task.rb
+- lib/tasks/documentation_task.rb
+- lib/tasks/test_task.rb
 - tests/atmos/models/storage/file_update_tests.rb
 - tests/atmos/models/storage/nested_directories_tests.rb
 - tests/aws/credentials_tests.rb
@@ -3235,6 +3278,8 @@ files:
 - tests/bluebox/requests/compute/template_tests.rb
 - tests/bluebox/requests/dns/dns_tests.rb
 - tests/brightbox/compute_tests.rb
+- tests/brightbox/models/compute/account_tests.rb
+- tests/brightbox/oauth2_tests.rb
 - tests/brightbox/requests/compute/account_tests.rb
 - tests/brightbox/requests/compute/api_client_tests.rb
 - tests/brightbox/requests/compute/application_test.rb
@@ -3396,6 +3441,7 @@ files:
 - tests/openstack/requests/compute/helper.rb
 - tests/openstack/requests/compute/image_tests.rb
 - tests/openstack/requests/compute/keypair_tests.rb
+- tests/openstack/requests/compute/limit_tests.rb
 - tests/openstack/requests/compute/quota_tests.rb
 - tests/openstack/requests/compute/security_group_tests.rb
 - tests/openstack/requests/compute/server_tests.rb
@@ -3455,6 +3501,7 @@ files:
 - tests/rackspace/models/load_balancers/nodes_tests.rb
 - tests/rackspace/models/load_balancers/virtual_ip_tests.rb
 - tests/rackspace/models/load_balancers/virtual_ips_tests.rb
+- tests/rackspace/models/storage/file_tests.rb
 - tests/rackspace/requests/block_storage/snapshot_tests.rb
 - tests/rackspace/requests/block_storage/volume_tests.rb
 - tests/rackspace/requests/block_storage/volume_type_tests.rb
@@ -3544,11 +3591,9 @@ files:
 - tests/vsphere/models/compute/server_tests.rb
 - tests/vsphere/models/compute/servers_tests.rb
 - tests/vsphere/requests/compute/current_time_tests.rb
-- tests/vsphere/requests/compute/find_vm_by_ref_tests.rb
 - tests/vsphere/requests/compute/list_virtual_machines_tests.rb
 - tests/vsphere/requests/compute/vm_clone_tests.rb
 - tests/vsphere/requests/compute/vm_config_vnc_tests.rb
-- tests/vsphere/requests/compute/vm_create_tests.rb
 - tests/vsphere/requests/compute/vm_destroy_tests.rb
 - tests/vsphere/requests/compute/vm_migrate_tests.rb
 - tests/vsphere/requests/compute/vm_power_off_tests.rb
@@ -3603,7 +3648,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3012969826581052926
+      hash: -4071252991676114740
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -3788,6 +3833,8 @@ test_files:
 - tests/bluebox/requests/compute/template_tests.rb
 - tests/bluebox/requests/dns/dns_tests.rb
 - tests/brightbox/compute_tests.rb
+- tests/brightbox/models/compute/account_tests.rb
+- tests/brightbox/oauth2_tests.rb
 - tests/brightbox/requests/compute/account_tests.rb
 - tests/brightbox/requests/compute/api_client_tests.rb
 - tests/brightbox/requests/compute/application_test.rb
@@ -3949,6 +3996,7 @@ test_files:
 - tests/openstack/requests/compute/helper.rb
 - tests/openstack/requests/compute/image_tests.rb
 - tests/openstack/requests/compute/keypair_tests.rb
+- tests/openstack/requests/compute/limit_tests.rb
 - tests/openstack/requests/compute/quota_tests.rb
 - tests/openstack/requests/compute/security_group_tests.rb
 - tests/openstack/requests/compute/server_tests.rb
@@ -4008,6 +4056,7 @@ test_files:
 - tests/rackspace/models/load_balancers/nodes_tests.rb
 - tests/rackspace/models/load_balancers/virtual_ip_tests.rb
 - tests/rackspace/models/load_balancers/virtual_ips_tests.rb
+- tests/rackspace/models/storage/file_tests.rb
 - tests/rackspace/requests/block_storage/snapshot_tests.rb
 - tests/rackspace/requests/block_storage/volume_tests.rb
 - tests/rackspace/requests/block_storage/volume_type_tests.rb
@@ -4097,11 +4146,9 @@ test_files:
 - tests/vsphere/models/compute/server_tests.rb
 - tests/vsphere/models/compute/servers_tests.rb
 - tests/vsphere/requests/compute/current_time_tests.rb
-- tests/vsphere/requests/compute/find_vm_by_ref_tests.rb
 - tests/vsphere/requests/compute/list_virtual_machines_tests.rb
 - tests/vsphere/requests/compute/vm_clone_tests.rb
 - tests/vsphere/requests/compute/vm_config_vnc_tests.rb
-- tests/vsphere/requests/compute/vm_create_tests.rb
 - tests/vsphere/requests/compute/vm_destroy_tests.rb
 - tests/vsphere/requests/compute/vm_migrate_tests.rb
 - tests/vsphere/requests/compute/vm_power_off_tests.rb
@@ -4141,3 +4188,4 @@ test_files:
 - tests/xenserver/requests/compute/set_attribute_tests.rb
 - tests/xenserver/xenserver_tests.rb
 - tests/zerigo/requests/dns/dns_tests.rb
+has_rdoc: 

data/lib/fog/vsphere/requests/compute/datacenters.rb

@@ -1,34 +0,0 @@
-module Fog
-  module Compute
-    class Vsphere
-      class Real
-        def datacenters
-          @datacenters ||= datacenters_reload
-          # Hide the values which are the RbVmomi instances
-          @datacenters.keys
-        end
-
-        private
-
-        def datacenters_reload
-          @rootfolder  ||= @connection.rootFolder
-          inventory = @rootfolder.inventory(:Datacenter => [ 'name' ])[@rootfolder]
-          # Convert the inventory into a Hash of the form: We remove the
-          # property selectors.  { "<dc_name>" => #<RbVmomi::VIM::Datacenter> }
-          # The Datacenter instance itself is at index 0 and the properties we
-          # collected are at index 1.
-          inventory.inject({}) do |memo, (name,dc_ary)|
-            memo[name] = dc_ary[0]
-            memo
-          end
-        end
-      end
-
-      class Mock
-        def datacenters
-          [ "Solutions", "Solutions2", "Solutions3" ]
-        end
-      end
-    end
-  end
-end

data/lib/fog/vsphere/requests/compute/find_vm_by_ref.rb

@@ -1,41 +0,0 @@
-module Fog
-  module Compute
-    class Vsphere
-
-      module Shared
-
-        # REVISIT:  This is a naive implementation and not very efficient since
-        # we find ALL VM's and then iterate over them looking for the managed object
-        # reference id...  There should be an easier way to obtain a reference to a
-        # VM using only the name or the _ref.  This request is primarily intended to
-        # reload the attributes of a cloning VM which does not yet have an instance_uuid
-        def find_vm_by_ref(options = {})
-          raise ArgumentError, "Must pass a vm_ref option" unless options['vm_ref']
-
-          # This is the inefficient call
-          all_vm_attributes = list_virtual_machines['virtual_machines']
-          # Find the VM attributes of the reference
-          if vm_attributes = all_vm_attributes.find { |vm| vm['mo_ref'] == options['vm_ref'] }
-            response = { 'virtual_machine' => vm_attributes }
-          else
-            raise Fog::Compute::Vsphere::NotFound, "VirtualMachine with Managed Object Reference #{options['vm_ref']} could not be found."
-          end
-          response
-        end
-
-      end
-
-      # The Real and Mock classes share the same method
-      # because list_virtual_machines will be properly mocked for us
-
-      class Real
-        include Shared
-      end
-
-      class Mock
-        include Shared
-      end
-
-    end
-  end
-end