fog-vcloud-director 0.2.2 → 0.3.0

data/lib/fog/vcloud_director/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module VcloudDirector
-    VERSION = "0.2.2".freeze
+    VERSION = "0.3.0".freeze
   end
 end

data/spec/common_assertions.rb

@@ -1,5 +1,5 @@
 def expect_vm(vm, vapp_id:, name:, status:, deployed:, os:, ip:, cpu:, cores_per_socket:, cpu_hot:, mem:, mem_hot:, num_hdds:, num_nics:)
-  vm.must_be_instance_of Fog::Compute::VcloudDirector::Vm
+  vm.must_be_instance_of Fog::VcloudDirector::Compute::Vm
   vm.type.must_equal 'application/vnd.vmware.vcloud.vm+xml'
   vm.vapp_id.must_equal vapp_id
   vm.name.must_equal name
@@ -20,7 +20,7 @@ end
 
 # Basic vApp information which is provided when vApps are only listed for VDC.
 def expect_vapp_skeleton(vapp, id:, name:)
-  vapp.must_be_instance_of Fog::Compute::VcloudDirector::Vapp
+  vapp.must_be_instance_of Fog::VcloudDirector::Compute::Vapp
   vapp.type.must_equal 'application/vnd.vmware.vcloud.vApp+xml'
   vapp.href.must_include '/api/vApp/vapp-'
   vapp.id.must_equal id

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ $LOAD_PATH.unshift "lib"
 require "fog/vcloud_director"
 require "./spec/common_assertions"
 
-include Fog::Generators::Compute::VcloudDirector::ComposeCommon
+include Fog::VcloudDirector::Generators::Compute::ComposeCommon
 
 def secrets
   @secrets ||= File.file?(secrets_path) ? YAML.load_file(secrets_path) : {}

data/spec/vcloud_director/generators/compute/compose_common_spec.rb

@@ -1,6 +1,6 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::ComposeCommon do
+describe Fog::VcloudDirector::Generators::Compute::ComposeCommon do
   describe '.calculate_fence_mode' do
     [
       {
@@ -54,7 +54,7 @@ describe Fog::Generators::Compute::VcloudDirector::ComposeCommon do
       },
     ].each do |args|
       it args[:case].to_s do
-        mode = Fog::Generators::Compute::VcloudDirector::ComposeCommon.send(
+        mode = Fog::VcloudDirector::Generators::Compute::ComposeCommon.send(
           :calculate_fence_mode,
           args[:mode],
           args[:parent],

data/spec/vcloud_director/generators/compute/compose_vapp_spec.rb

@@ -1,6 +1,6 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::ComposeVapp do
+describe Fog::VcloudDirector::Generators::Compute::ComposeVapp do
   describe '.calculate_fence_mode' do
     [
       {
@@ -54,7 +54,7 @@ describe Fog::Generators::Compute::VcloudDirector::ComposeVapp do
       },
     ].each do |args|
       it args[:case].to_s do
-        mode = Fog::Generators::Compute::VcloudDirector::ComposeCommon.send(
+        mode = Fog::VcloudDirector::Generators::Compute::ComposeCommon.send(
           :calculate_fence_mode,
           args[:mode],
           args[:parent],

data/spec/vcloud_director/generators/compute/create_snapshot_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::CreateSnapshot do
+describe Fog::VcloudDirector::Generators::Compute::CreateSnapshot do
 end

data/spec/vcloud_director/generators/compute/customization_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::Customization do
+describe Fog::VcloudDirector::Generators::Compute::Customization do
 end

data/spec/vcloud_director/generators/compute/disks_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::Disks do
+describe Fog::VcloudDirector::Generators::Compute::Disks do
 end

data/spec/vcloud_director/generators/compute/edge_gateway_service_configuration_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::EdgeGatewayServiceConfiguration do
+describe Fog::VcloudDirector::Generators::Compute::EdgeGatewayServiceConfiguration do
 end

data/spec/vcloud_director/generators/compute/instantiate_vapp_template_params_spec.rb

@@ -1,6 +1,6 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams do
+describe Fog::VcloudDirector::Generators::Compute::InstantiateVappTemplateParams do
   describe 'Complete xml' do
     let(:xml) do
       params = {
@@ -39,7 +39,7 @@ describe Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams
 
       }
 
-      output = Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams.new(params).generate_xml
+      output = Fog::VcloudDirector::Generators::Compute::InstantiateVappTemplateParams.new(params).generate_xml
       Nokogiri::XML(output)
     end
 
@@ -222,7 +222,7 @@ describe Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams
             }
           ]
         }
-        output = Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams.new(input).generate_xml
+        output = Fog::VcloudDirector::Generators::Compute::InstantiateVappTemplateParams.new(input).generate_xml
         args[:expect].call(Nokogiri::XML(output))
       end
     end
@@ -371,7 +371,7 @@ describe Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams
           :vapp_networks => args[:vapp_networks],
           :endpoint      => 'ENDPOINT'
         }
-        output = Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams.new(input).generate_xml
+        output = Fog::VcloudDirector::Generators::Compute::InstantiateVappTemplateParams.new(input).generate_xml
         args[:expect].call(vapp_network_config(Nokogiri::XML(output)))
       end
     end
@@ -411,7 +411,7 @@ describe Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams
             }
           ]
         }
-        output = Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams.new(input).generate_xml
+        output = Fog::VcloudDirector::Generators::Compute::InstantiateVappTemplateParams.new(input).generate_xml
         args[:expect].call(guest_customization(Nokogiri::XML(output)))
       end
     end
@@ -527,7 +527,7 @@ describe Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams
             }
           ]
         }
-        output = Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams.new(input).generate_xml
+        output = Fog::VcloudDirector::Generators::Compute::InstantiateVappTemplateParams.new(input).generate_xml
         args[:expect].call(networks(Nokogiri::XML(output)))
       end
     end

data/spec/vcloud_director/generators/compute/metadata_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::MetadataBase do
+describe Fog::VcloudDirector::Generators::Compute::MetadataBase do
 end

data/spec/vcloud_director/generators/compute/org_vdc_network_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::OrgVdcNetwork do
+describe Fog::VcloudDirector::Generators::Compute::OrgVdcNetwork do
 end

data/spec/vcloud_director/generators/compute/recompose_vapp_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::RecomposeVapp do
+describe Fog::VcloudDirector::Generators::Compute::RecomposeVapp do
 end

data/spec/vcloud_director/generators/compute/reconfigure_vm_spec.rb

@@ -1,11 +1,11 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::ReconfigureVm do
+describe Fog::VcloudDirector::Generators::Compute::ReconfigureVm do
   let(:current)  { Nokogiri::XML(File.read('./spec/fixtures/vm.xml')) }
   let(:hardware) { {} }
   let(:networks) { nic_conf.empty? ? [] : [nic_conf] }
   let(:nic_conf) { {} }
-  let(:output)   { Nokogiri::XML(Fog::Generators::Compute::VcloudDirector::ReconfigureVm.generate_xml(current, input)) }
+  let(:output)   { Nokogiri::XML(Fog::VcloudDirector::Generators::Compute::ReconfigureVm.generate_xml(current, input)) }
   let(:input) do
     input = {}
     input[:hardware] = hardware unless hardware.empty?
@@ -65,7 +65,7 @@ describe Fog::Generators::Compute::VcloudDirector::ReconfigureVm do
         let(:disks) { { :id => 'nonexisting', :capacity_mb => 123 } }
 
         it 'resize nonexisting' do
-          -> { output }.must_raise Fog::Compute::VcloudDirector::PreProcessingError
+          -> { output }.must_raise Fog::VcloudDirector::Compute::PreProcessingError
         end
       end
 

data/spec/vcloud_director/generators/compute/vapp_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::Vapp do
+describe Fog::VcloudDirector::Generators::Compute::Vapp do
 end

data/spec/vcloud_director/generators/compute/vm_network_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::VmNetwork do
+describe Fog::VcloudDirector::Generators::Compute::VmNetwork do
 end

data/spec/vcloud_director/generators/compute/vm_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Generators::Compute::VcloudDirector::Vm do
+describe Fog::VcloudDirector::Generators::Compute::Vm do
 end

data/spec/vcloud_director/models/compute/basic_spec.rb

@@ -1,40 +1,40 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Compute::VcloudDirector do
+describe Fog::VcloudDirector::Compute do
   describe 'No load errors' do
     [
-      Fog::Compute::VcloudDirector::Catalogs,
-      Fog::Compute::VcloudDirector::Catalog,
-      Fog::Compute::VcloudDirector::CatalogItems,
-      Fog::Compute::VcloudDirector::CatalogItem,
-      Fog::Compute::VcloudDirector::CustomFields,
-      Fog::Compute::VcloudDirector::CustomField,
-      Fog::Compute::VcloudDirector::Disks,
-      Fog::Compute::VcloudDirector::Disk,
-      Fog::Compute::VcloudDirector::Medias,
-      Fog::Compute::VcloudDirector::Media,
-      Fog::Compute::VcloudDirector::Networks,
-      Fog::Compute::VcloudDirector::Network,
-      Fog::Compute::VcloudDirector::Organizations,
-      Fog::Compute::VcloudDirector::Organization,
-      Fog::Compute::VcloudDirector::Tags,
-      Fog::Compute::VcloudDirector::Tag,
-      Fog::Compute::VcloudDirector::Tasks,
-      Fog::Compute::VcloudDirector::Task,
-      Fog::Compute::VcloudDirector::TemplateVms,
-      Fog::Compute::VcloudDirector::TemplateVm,
-      Fog::Compute::VcloudDirector::Vapps,
-      Fog::Compute::VcloudDirector::Vapp,
-      Fog::Compute::VcloudDirector::VappTemplates,
-      Fog::Compute::VcloudDirector::VappTemplate,
-      Fog::Compute::VcloudDirector::Vdcs,
-      Fog::Compute::VcloudDirector::Vdc,
-      Fog::Compute::VcloudDirector::Vms,
-      Fog::Compute::VcloudDirector::Vm,
-      Fog::Compute::VcloudDirector::VmCustomizations,
-      Fog::Compute::VcloudDirector::VmCustomization,
-      Fog::Compute::VcloudDirector::VmNetworks,
-      Fog::Compute::VcloudDirector::VmNetwork
+      Fog::VcloudDirector::Compute::Catalogs,
+      Fog::VcloudDirector::Compute::Catalog,
+      Fog::VcloudDirector::Compute::CatalogItems,
+      Fog::VcloudDirector::Compute::CatalogItem,
+      Fog::VcloudDirector::Compute::CustomFields,
+      Fog::VcloudDirector::Compute::CustomField,
+      Fog::VcloudDirector::Compute::Disks,
+      Fog::VcloudDirector::Compute::Disk,
+      Fog::VcloudDirector::Compute::Medias,
+      Fog::VcloudDirector::Compute::Media,
+      Fog::VcloudDirector::Compute::Networks,
+      Fog::VcloudDirector::Compute::Network,
+      Fog::VcloudDirector::Compute::Organizations,
+      Fog::VcloudDirector::Compute::Organization,
+      Fog::VcloudDirector::Compute::Tags,
+      Fog::VcloudDirector::Compute::Tag,
+      Fog::VcloudDirector::Compute::Tasks,
+      Fog::VcloudDirector::Compute::Task,
+      Fog::VcloudDirector::Compute::TemplateVms,
+      Fog::VcloudDirector::Compute::TemplateVm,
+      Fog::VcloudDirector::Compute::Vapps,
+      Fog::VcloudDirector::Compute::Vapp,
+      Fog::VcloudDirector::Compute::VappTemplates,
+      Fog::VcloudDirector::Compute::VappTemplate,
+      Fog::VcloudDirector::Compute::Vdcs,
+      Fog::VcloudDirector::Compute::Vdc,
+      Fog::VcloudDirector::Compute::Vms,
+      Fog::VcloudDirector::Compute::Vm,
+      Fog::VcloudDirector::Compute::VmCustomizations,
+      Fog::VcloudDirector::Compute::VmCustomization,
+      Fog::VcloudDirector::Compute::VmNetworks,
+      Fog::VcloudDirector::Compute::VmNetwork
     ].each do |klass|
       it "Instantiating #{klass}" do
         assert_instance_of(klass, klass.new)

data/spec/vcloud_director/models/compute/vapps_spec.rb

@@ -1,7 +1,7 @@
 require './spec/vcr_spec_helper.rb'
 
-describe Fog::Compute::VcloudDirector::Vapps do
-  let(:subject) { Fog::Compute::VcloudDirector::Vapps.new(:service => vcr_service, :vdc => vdc) }
+describe Fog::VcloudDirector::Compute::Vapps do
+  let(:subject) { Fog::VcloudDirector::Compute::Vapps.new(:service => vcr_service, :vdc => vdc) }
   let(:vdc_id)  { 'cf6ea964-a67f-4ba1-b69e-3dd5d6cb0c89' }
   let(:vdc)     { Object.new.tap { |vapp| vapp.stubs(:id).returns(vdc_id) } }
   let(:vapp_id) { 'vapp-fe8d013d-dd2f-4ac6-9e8a-3a4a18e0a62e' }

data/spec/vcloud_director/models/compute/vms_spec.rb

@@ -1,7 +1,7 @@
 require './spec/vcr_spec_helper.rb'
 
-describe Fog::Compute::VcloudDirector::Vms do
-  let(:subject) { Fog::Compute::VcloudDirector::Vms.new(:service => vcr_service, :vapp => vapp) }
+describe Fog::VcloudDirector::Compute::Vms do
+  let(:subject) { Fog::VcloudDirector::Compute::Vms.new(:service => vcr_service, :vapp => vapp) }
   let(:vapp_id) { 'vapp-fe8d013d-dd2f-4ac6-9e8a-3a4a18e0a62e' }
   let(:vapp)    { Object.new.tap { |vapp| vapp.stubs(:id).returns(vapp_id) } }
   let(:vm_id)   { 'vm-314172f1-1835-4598-b049-5c1d4dce39ad' }

data/spec/vcloud_director/parsers/compute/disks_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Parsers::Compute::VcloudDirector::Disks do
+describe Fog::VcloudDirector::Parsers::Compute::Disks do
 end

data/spec/vcloud_director/parsers/compute/metadata_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Parsers::Compute::VcloudDirector::Metadata do
+describe Fog::VcloudDirector::Parsers::Compute::Metadata do
 end

data/spec/vcloud_director/parsers/compute/network_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Parsers::Compute::VcloudDirector::Network do
+describe Fog::VcloudDirector::Parsers::Compute::Network do
 end

data/spec/vcloud_director/parsers/compute/vm_customization_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Parsers::Compute::VcloudDirector::VmCustomization do
+describe Fog::VcloudDirector::Parsers::Compute::VmCustomization do
 end

data/spec/vcloud_director/parsers/compute/vm_network_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Parsers::Compute::VcloudDirector::VmNetwork do
+describe Fog::VcloudDirector::Parsers::Compute::VmNetwork do
 end

data/spec/vcloud_director/parsers/compute/vm_parser_helper_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Parsers::Compute::VcloudDirector::VmParserHelper do
+describe Fog::VcloudDirector::Parsers::Compute::VmParserHelper do
 end

data/spec/vcloud_director/parsers/compute/vm_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Parsers::Compute::VcloudDirector::Vm do
+describe Fog::VcloudDirector::Parsers::Compute::Vm do
 end

data/spec/vcloud_director/parsers/compute/vms_by_metadata_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Parsers::Compute::VcloudDirector::VmsByMetadata do
+describe Fog::VcloudDirector::Parsers::Compute::VmsByMetadata do
 end

data/spec/vcloud_director/parsers/compute/vms_spec.rb

@@ -1,4 +1,4 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Parsers::Compute::VcloudDirector::Vms do
+describe Fog::VcloudDirector::Parsers::Compute::Vms do
 end

data/spec/vcloud_director/requests/compute/basic_spec.rb

@@ -1,6 +1,6 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Compute::VcloudDirector::Real do
+describe Fog::VcloudDirector::Compute::Real do
   describe 'Requests exist' do
     let(:service) do
       response =  Object.new
@@ -14,7 +14,7 @@ describe Fog::Compute::VcloudDirector::Real do
         })
       connection = Object.new
       connection.stubs(:request).returns(response)
-      service = Fog::Compute::VcloudDirector::Real.new
+      service = Fog::VcloudDirector::Compute::Real.new
       service.instance_variable_set(:@connection, connection)
       service.stubs(:request).returns(response)
       service.stubs(:ensure_list!).returns(true)

data/spec/vcloud_director/requests/compute/instantiate_vapp_template_spec.rb

@@ -1,13 +1,13 @@
 require './spec/spec_helper.rb'
 
-describe Fog::Compute::VcloudDirector::Real do
+describe Fog::VcloudDirector::Compute::Real do
   before do
     Fog.unmock!
   end
   
 
   let(:xml) do
-    service = Fog::Compute::VcloudDirector.new(
+    service = Fog::VcloudDirector::Compute.new(
     {
       :vcloud_director_host             => 'vcloud-director-host',
       :vcloud_director_password         => 'vcloud_director_password',

data/spec/vcr_spec_helper.rb

@@ -22,7 +22,7 @@ def vcr_service
   end
 
   @vcr_service ||= VCR.use_cassette('authentication') do
-    Fog::Compute::VcloudDirector.new(
+    Fog::VcloudDirector::Compute.new(
       :vcloud_director_username      => username,
       :vcloud_director_password      => password,
       :vcloud_director_host          => hostname,

data/tests/vcloud_director/ensure_list_tests.rb

@@ -3,7 +3,7 @@ Shindo.tests('Compute::VcloudDirector | ensure_list!', ['vclouddirector']) do
   # ensure list is not available in mocking mode
   unless Fog.mocking?
 
-    @service = Fog::Compute::VcloudDirector.new
+    @service = Fog::VcloudDirector::Compute.new
 
     tests('#ensure_list! for single key ensures our key has an array as a value') do
       tests('for key with a hash').returns(Array) do

data/tests/vcloud_director/generators/compute/compose_vapp_tests.rb

@@ -56,7 +56,7 @@ Shindo.tests("Compute::VcloudDirector - ComposeVapp", ['vclouddirector']) do
   }
 
   tests('#check xml from generator').returns(true) do
-    xml = Nokogiri.XML Fog::Generators::Compute::VcloudDirector::ComposeVapp.new(@vapp_configuration).generate_xml
+    xml = Nokogiri.XML Fog::VcloudDirector::Generators::Compute::ComposeVapp.new(@vapp_configuration).generate_xml
 
     tags_with_values = {
       'ComposeVAppParams>Description' => 'a description',

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

@@ -5,7 +5,7 @@ def boolean?(item)
 end
 
 def vcloud_director
-  @vcloud_director ||= Fog::Compute::VcloudDirector.new(
+  @vcloud_director ||= Fog::VcloudDirector::Compute.new(
     :connection_options => {
       :ssl_verify_peer => false,
       :connect_timeout => 200,

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

@@ -7,7 +7,7 @@ Shindo.tests('Compute::VcloudDirector | media', ['vclouddirector']) do
   media_name = VcloudDirector::Compute::Helper.test_name
 
   tests('Compute::VcloudDirector | media', ['create']) do
-    tests('#create').returns(Fog::Compute::VcloudDirector::Media) do
+    tests('#create').returns(Fog::VcloudDirector::Compute::Media) do
       File.open(VcloudDirector::Compute::Helper.fixture('test.iso'), 'rb') do |iso|
         medias.create(media_name, iso).class
       end