fog-vcloud-director 0.2.2 → 0.3.0

data/tests/vcloud_director/models/compute/network_tests.rb

@@ -5,7 +5,7 @@ Shindo.tests("Compute::VcloudDirector | networks", ['vclouddirector', 'all']) do
   # unless there is at least one network we cannot run these tests
   pending if organization.networks.empty?
 
-  service = Fog::Compute::VcloudDirector.new
+  service = Fog::VcloudDirector::Compute.new
 
   networks = organization.networks
   network_raw = nil

data/tests/vcloud_director/models/compute/tasks_tests.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 Shindo.tests('Compute::VcloudDirector | tasks', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new()
+  @service = Fog::VcloudDirector::Compute.new()
 
   if Fog.mocking?
     # add a bunch of tasks

data/tests/vcloud_director/models/compute/vapp_template_tests.rb

@@ -16,7 +16,7 @@ Shindo.tests("Compute::VcloudDirector | vapp_templates", ['vclouddirector', 'all
   end
   
   tests("Compute::VcloudDirector | vapp_template vms") do
-    tests("#vms").returns(Fog::Compute::VcloudDirector::TemplateVms) { vapp.vms.class }
+    tests("#vms").returns(Fog::VcloudDirector::Compute::TemplateVms) { vapp.vms.class }
     pending if Fog.mock?
     vm = vapp.vms[0]
     tests("#name").returns(String){ vm.name.class }

data/tests/vcloud_director/models/compute/vms_tests.rb

@@ -11,7 +11,7 @@ Shindo.tests("Compute::VcloudDirector | vms", ['vclouddirector', 'all']) do
   vm = vms.first
 
   tests("Compute::VcloudDirector | vm") do
-    tests("#model").returns(Fog::Compute::VcloudDirector::Vm){vm.class}
+    tests("#model").returns(Fog::VcloudDirector::Compute::Vm){vm.class}
     tests("#id").returns(String){ vm.id.class }
     tests("#name").returns(String){ vm.name.class }
     tests("#href").returns(String){ vm.href.class }
@@ -33,8 +33,8 @@ Shindo.tests("Compute::VcloudDirector | vms", ['vclouddirector', 'all']) do
   end
 
   tests("Compute::VcloudDirector | vm | disks") do
-    tests("#collection").returns(Fog::Compute::VcloudDirector::Disks){ vm.disks.class }
-    tests("#get_by_name").returns(Fog::Compute::VcloudDirector::Disk) { vm.disks.get_by_name("Hard disk 1").class }
+    tests("#collection").returns(Fog::VcloudDirector::Compute::Disks){ vm.disks.class }
+    tests("#get_by_name").returns(Fog::VcloudDirector::Compute::Disk) { vm.disks.get_by_name("Hard disk 1").class }
 
     hard_disk = vm.disks.get_by_name("Hard disk 1")
     tests("#id").returns(2000){ hard_disk.id }
@@ -50,7 +50,7 @@ Shindo.tests("Compute::VcloudDirector | vms", ['vclouddirector', 'all']) do
 
   tests("Compute::VcloudDirector | vm | customization") do
     customization = vm.customization
-    tests("#model").returns(Fog::Compute::VcloudDirector::VmCustomization){customization.class}
+    tests("#model").returns(Fog::VcloudDirector::Compute::VmCustomization){customization.class}
     tests("#id").returns(String){ customization.id.class }
     tests("#href").returns(String){ customization.href.class }
     tests("#type").returns("application/vnd.vmware.vcloud.guestCustomizationSection+xml"){ customization.type }
@@ -66,7 +66,7 @@ Shindo.tests("Compute::VcloudDirector | vms", ['vclouddirector', 'all']) do
 
   tests("Compute::VcloudDirector | vm | network") do
     network = vm.network
-    tests("#model").returns(Fog::Compute::VcloudDirector::VmNetwork){network.class}
+    tests("#model").returns(Fog::VcloudDirector::Compute::VmNetwork){network.class}
     tests("#id").returns(String){ network.id.class }
     tests("#href").returns(String){ network.href.class }
     tests("#type").returns("application/vnd.vmware.vcloud.networkConnectionSection+xml"){ network.type }
@@ -82,7 +82,7 @@ Shindo.tests("Compute::VcloudDirector | vms", ['vclouddirector', 'all']) do
 
   tests("Compute::VcloudDirector | vm | tags") do
     tags = vm.tags
-    tests("#collection").returns(Fog::Compute::VcloudDirector::Tags){ tags.class }
+    tests("#collection").returns(Fog::VcloudDirector::Compute::Tags){ tags.class }
   end
 
   # We should also be able to find this VM via Query API

data/tests/vcloud_director/requests/compute/admin_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | admin requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
 
   tests('#get_vcloud').data_matches_schema(VcloudDirector::Compute::Schema::VCLOUD_TYPE) do
      @service.get_vcloud.body

data/tests/vcloud_director/requests/compute/catalog_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | catalog requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
 
   tests('#get_catalog').data_matches_schema(VcloudDirector::Compute::Schema::CATALOG_TYPE) do
@@ -35,7 +35,7 @@ Shindo.tests('Compute::VcloudDirector | catalog requests', ['vclouddirector']) d
     end
   end
 
-  tests('Retrieve non-existent Catalog').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Retrieve non-existent Catalog').raises(Fog::VcloudDirector::Compute::Forbidden) do
     @service.get_catalog('00000000-0000-0000-0000-000000000000')
   end
 

data/tests/vcloud_director/requests/compute/disk_tests.rb

@@ -1,27 +1,27 @@
 Shindo.tests('Compute::VcloudDirector | disk requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
   @disk_name = VcloudDirector::Compute::Helper.test_name
 
   tests('error conditions') do
     tests('#post_upload_disk') do
-      tests('Invalid size').raises(Fog::Compute::VcloudDirector::BadRequest) do
+      tests('Invalid size').raises(Fog::VcloudDirector::Compute::BadRequest) do
         @service.post_upload_disk('00000000-0000-0000-0000-000000000000', @disk_name, -1)
       end
     end
-    tests('Upload to non-existent vDC').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('Upload to non-existent vDC').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.post_upload_disk('00000000-0000-0000-0000-000000000000', @disk_name, 0)
     end
-    tests('Retrieve non-existent Disk').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('Retrieve non-existent Disk').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_disk('00000000-0000-0000-0000-000000000000')
     end
-    tests('Retrieve owner of non-existent Disk').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('Retrieve owner of non-existent Disk').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_disk_owner('00000000-0000-0000-0000-000000000000')
     end
-    tests('Retrieve VM list for non-existent Disk').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('Retrieve VM list for non-existent Disk').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_vms_disk_attached_to('00000000-0000-0000-0000-000000000000')
     end
-    tests('Delete non-existent Disk').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('Delete non-existent Disk').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.delete_disk('00000000-0000-0000-0000-000000000000')
     end
   end
@@ -147,17 +147,17 @@ Shindo.tests('Compute::VcloudDirector | disk requests', ['vclouddirector']) do
   end
 
   tests('Disk no longer exists') do
-    tests("#get_disk(#{@disk_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests("#get_disk(#{@disk_id})").raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_disk(@disk_id)
     end
-    tests("#get_disk_owner(#{@disk_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests("#get_disk_owner(#{@disk_id})").raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_disk_owner(@disk_id)
     end
-    tests("#get_disk_metadata(#{@disk_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests("#get_disk_metadata(#{@disk_id})").raises(Fog::VcloudDirector::Compute::Forbidden) do
       pending if Fog.mocking?
       @service.get_disk_metadata(@disk_id)
     end
-    tests("#delete_disk(#{@disk_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests("#delete_disk(#{@disk_id})").raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.delete_disk(@disk_id)
     end
   end

data/tests/vcloud_director/requests/compute/edge_gateway_tests.rb

@@ -87,7 +87,7 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
       }
   }.merge!(@vpn_configuration).merge!(@dhcp_configuration)
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
 
   tests('Get first vDC with an EdgeGatewayRecord') do
@@ -106,7 +106,7 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
   tests('#get_org_vdc_gateways').data_matches_schema(VcloudDirector::Compute::Schema::QUERY_RESULT_RECORDS_TYPE) do
     begin
       @edge_gateways = @service.get_org_vdc_gateways(@vdc_id).body
-    rescue Fog::Compute::VcloudDirector::Unauthorized # bug, may be localised
+    rescue Fog::VcloudDirector::Compute::Unauthorized # bug, may be localised
       retry
     end
     @edge_gateways
@@ -172,7 +172,7 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
     end
 
     tests('#check VPN xml from generator').returns(true) do
-      xml = Nokogiri.XML Fog::Generators::Compute::VcloudDirector::EdgeGatewayServiceConfiguration.new(@vpn_configuration).generate_xml
+      xml = Nokogiri.XML Fog::VcloudDirector::Generators::Compute::EdgeGatewayServiceConfiguration.new(@vpn_configuration).generate_xml
       #Not comprehensive, only checks that the generator actually knows how to handle it and that the output looks vagely sane
       paths = {
         'GatewayIpsecVpnService>IsEnabled' => 'true',
@@ -184,7 +184,7 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
     end
 
     tests('#check DHCP xml from generator').returns(true) do
-      xml = Nokogiri.XML Fog::Generators::Compute::VcloudDirector::EdgeGatewayServiceConfiguration.new(@dhcp_configuration).generate_xml
+      xml = Nokogiri.XML Fog::VcloudDirector::Generators::Compute::EdgeGatewayServiceConfiguration.new(@dhcp_configuration).generate_xml
       paths = {
           'GatewayDhcpService>IsEnabled' => "true",
           'GatewayDhcpService>Pool>IsEnabled' => "true",
@@ -198,18 +198,18 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
 
 end
 
-  tests('Retrieve non-existent edge gateway').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Retrieve non-existent edge gateway').raises(Fog::VcloudDirector::Compute::Forbidden) do
     begin
       @service.get_edge_gateway('00000000-0000-0000-0000-000000000000')
-    rescue Fog::Compute::VcloudDirector::Unauthorized # bug, may be localised
+    rescue Fog::VcloudDirector::Compute::Unauthorized # bug, may be localised
       retry
     end
   end
 
-  tests('Configure non-existent edge gateway').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Configure non-existent edge gateway').raises(Fog::VcloudDirector::Compute::Forbidden) do
     begin
       @service.post_configure_edge_gateway_services('00000000-0000-0000-0000-000000000000', {})
-    rescue Fog::Compute::VcloudDirector::Unauthorized # bug, may be localised
+    rescue Fog::VcloudDirector::Compute::Unauthorized # bug, may be localised
       retry
     end
   end

data/tests/vcloud_director/requests/compute/groups_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | groups requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
 
   tests('#get_groups_from_query') do
     pending if Fog.mocking?

data/tests/vcloud_director/requests/compute/media_tests.rb

@@ -1,26 +1,26 @@
 Shindo.tests('Compute::VcloudDirector | media requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
 
   tests('error conditions') do
     tests('#post_upload_media') do
-      tests('Invalid image_type').raises(Fog::Compute::VcloudDirector::BadRequest) do
+      tests('Invalid image_type').raises(Fog::VcloudDirector::Compute::BadRequest) do
         @service.post_upload_media('00000000-0000-0000-0000-000000000000', 'test.iso', 'isox', 0)
       end
-      tests('Invalid size').raises(Fog::Compute::VcloudDirector::BadRequest) do
+      tests('Invalid size').raises(Fog::VcloudDirector::Compute::BadRequest) do
         @service.post_upload_media('00000000-0000-0000-0000-000000000000', 'test.iso', 'iso', -1)
       end
     end
-    tests('Upload to non-existent vDC').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('Upload to non-existent vDC').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.post_upload_media('00000000-0000-0000-0000-000000000000', 'test.iso', 'iso', 0)
     end
-    tests('Retrieve non-existent Media').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('Retrieve non-existent Media').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_media('00000000-0000-0000-0000-000000000000')
     end
-    tests('Retrieve owner of non-existent Media').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('Retrieve owner of non-existent Media').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_media_owner('00000000-0000-0000-0000-000000000000')
     end
-    tests('Delete non-existent Media').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('Delete non-existent Media').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.delete_media('00000000-0000-0000-0000-000000000000')
     end
   end
@@ -164,17 +164,17 @@ Shindo.tests('Compute::VcloudDirector | media requests', ['vclouddirector']) do
   end
 
   tests('Media item no longer exists') do
-    tests("#get_media(#{@media_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests("#get_media(#{@media_id})").raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_media(@media_id)
     end
-    tests("#get_media_owner(#{@media_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests("#get_media_owner(#{@media_id})").raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_media_owner(@media_id)
     end
-    tests("#get_media_metadata(#{@media_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests("#get_media_metadata(#{@media_id})").raises(Fog::VcloudDirector::Compute::Forbidden) do
       pending if Fog.mocking?
       @service.get_media_metadata(@media_id)
     end
-    tests("#delete_media(#{@media_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests("#delete_media(#{@media_id})").raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.delete_media(@media_id)
     end
   end

data/tests/vcloud_director/requests/compute/network_tests.rb

@@ -21,23 +21,23 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
     }]
   }
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
   @created_net_id = nil
 
-  tests('Create network in non-existent vDC').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Create network in non-existent vDC').raises(Fog::VcloudDirector::Compute::Forbidden) do
     @service.post_create_org_vdc_network('00000000-0000-0000-0000-000000000000', 'bob')
   end
 
-  tests('Delete non-existent OrgNetwork').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Delete non-existent OrgNetwork').raises(Fog::VcloudDirector::Compute::Forbidden) do
     @service.delete_network('00000000-0000-0000-0000-000000000000')
   end
 
-  tests('Retrieve non-existent OrgNetwork (get_network)').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Retrieve non-existent OrgNetwork (get_network)').raises(Fog::VcloudDirector::Compute::Forbidden) do
     @service.get_network('00000000-0000-0000-0000-000000000000')
   end
 
-  tests('Retrieve non-existent OrgNetwork (get_network_complete)').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Retrieve non-existent OrgNetwork (get_network_complete)').raises(Fog::VcloudDirector::Compute::Forbidden) do
     @service.get_network_complete('00000000-0000-0000-0000-000000000000')
   end
 
@@ -178,7 +178,7 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
   tests('#delete_network') do
     @delete_task = @service.delete_network(@created_net_id).body
     @service.process_task(@delete_task)
-    tests('created network has been deleted').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('created network has been deleted').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_network(@created_net_id)
     end
   end

data/tests/vcloud_director/requests/compute/organization_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | organization requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
 
   tests('#get_organizations').data_matches_schema(VcloudDirector::Compute::Schema::ORG_LIST_TYPE) do
     @org_list = @service.get_organizations.body
@@ -30,7 +30,7 @@ Shindo.tests('Compute::VcloudDirector | organization requests', ['vclouddirector
     end
   end
 
-  tests('retrieve non-existent Org').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('retrieve non-existent Org').raises(Fog::VcloudDirector::Compute::Forbidden) do
     @service.get_organization('00000000-0000-0000-0000-000000000000')
   end
 

data/tests/vcloud_director/requests/compute/ovf_descriptor_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | ovf requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
 
   tests('Get first vDC') do

data/tests/vcloud_director/requests/compute/query_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | query requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
 
   tests('retrieve a summary list of all typed queries types') do
     tests('#get_execute_query') do

data/tests/vcloud_director/requests/compute/session_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | session requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
 
   tests('#post_login_sessions').data_matches_schema(VcloudDirector::Compute::Schema::SESSION_TYPE) do
     pending

data/tests/vcloud_director/requests/compute/supported_systems_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | supported_systems requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
 
   if @service.api_version.to_f >= 5.1
     tests('#get_supported_systems_info').formats(VcloudDirector::Compute::Schema::SUPPORTED_OPERATING_SYSTEMS_INFO_TYPE) do

data/tests/vcloud_director/requests/compute/task_tests.rb

@@ -1,15 +1,15 @@
 Shindo.tests('Compute::VcloudDirector | task requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
 
   tests('error conditions') do
-    tests('retrieve non-existent TasksList').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('retrieve non-existent TasksList').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_task_list('00000000-0000-0000-0000-000000000000')
     end
-    tests('retrieve non-existent Task').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('retrieve non-existent Task').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.get_task('00000000-0000-0000-0000-000000000000')
     end
-    tests('cancel non-existent Task').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    tests('cancel non-existent Task').raises(Fog::VcloudDirector::Compute::Forbidden) do
       @service.post_cancel_task('00000000-0000-0000-0000-000000000000')
     end
   end

data/tests/vcloud_director/requests/compute/users_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | users requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
 
   tests('#get_users_from_query') do
     pending if Fog.mocking?

data/tests/vcloud_director/requests/compute/vapp_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | vapp requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
 
   tests('Each vDC') do
@@ -106,16 +106,16 @@ Shindo.tests('Compute::VcloudDirector | vapp requests', ['vclouddirector']) do
     end
   end
 
-  tests('Retrieve non-existent vApp').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Retrieve non-existent vApp').raises(Fog::VcloudDirector::Compute::Forbidden) do
     pending if Fog.mocking?
     @service.get_vapp('00000000-0000-0000-0000-000000000000')
   end
 
-  tests('Retrieve owner of non-existent vApp').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Retrieve owner of non-existent vApp').raises(Fog::VcloudDirector::Compute::Forbidden) do
     @service.get_vapp_owner('00000000-0000-0000-0000-000000000000')
   end
 
-  tests('Delete non-existent vApp').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Delete non-existent vApp').raises(Fog::VcloudDirector::Compute::Forbidden) do
     pending if Fog.mocking?
     @service.delete_vapp('00000000-0000-0000-0000-000000000000')
   end

data/tests/vcloud_director/requests/compute/vdc_storage_profile_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | vdc_storage_profile requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
   @vdc_id = VcloudDirector::Compute::Helper.first_vdc_id(@org)
   @vdc = @service.get_vdc(@vdc_id).body
@@ -20,7 +20,7 @@ Shindo.tests('Compute::VcloudDirector | vdc_storage_profile requests', ['vcloudd
     end
   end
 
-  tests('Retrieve non-existent vDC storage profile').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Retrieve non-existent vDC storage profile').raises(Fog::VcloudDirector::Compute::Forbidden) do
     @service.get_vdc_storage_class('00000000-0000-0000-0000-000000000000')
   end
 

data/tests/vcloud_director/requests/compute/vdc_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Compute::VcloudDirector | vdc requests', ['vclouddirector']) do
 
-  @service = Fog::Compute::VcloudDirector.new
+  @service = Fog::VcloudDirector::Compute.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
 
   tests('#get_vdc').data_matches_schema(VcloudDirector::Compute::Schema::VDC_TYPE) do
@@ -29,7 +29,7 @@ Shindo.tests('Compute::VcloudDirector | vdc requests', ['vclouddirector']) do
     end
   end
 
-  tests('Retrieve non-existent vDC').raises(Fog::Compute::VcloudDirector::Forbidden) do
+  tests('Retrieve non-existent vDC').raises(Fog::VcloudDirector::Compute::Forbidden) do
     @service.get_vdc('00000000-0000-0000-0000-000000000000')
   end