fog-vcloud-director 0.2.2 → 0.3.0

data/lib/fog/vcloud_director/core.rb

@@ -61,6 +61,9 @@ module Fog
       class TaskError < ServiceError; end
     end
 
+    # Services
+    autoload :Compute, File.expand_path('../compute', __FILE__)
+
     service(:compute, 'Compute')
   end
 end

data/lib/fog/vcloud_director/generators/compute/compose_common.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         module ComposeCommon
 
           def initialize(configuration={})

data/lib/fog/vcloud_director/generators/compute/compose_vapp.rb

@@ -1,9 +1,9 @@
 require 'fog/vcloud_director/generators/compute/compose_common'
 
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         # @see http://pubs.vmware.com/vcd-51/index.jsp#types/ComposeVAppParamsType.html
         class ComposeVapp
 

data/lib/fog/vcloud_director/generators/compute/create_snapshot.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         # @see http://pubs.vmware.com/vcd-56/topic/com.vmware.ICbase/PDF/vcd_56_api_guide.pdf @page 121
         class CreateSnapshot
           attr_reader :attrs

data/lib/fog/vcloud_director/generators/compute/customization.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         # This is the data structure it accepts, this is the output of
         # #get_vm_customization:
         #

data/lib/fog/vcloud_director/generators/compute/disks.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         # This is the data structure it accepts, this is the output of
         # #get_vm_disks:
         #

data/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         class EdgeGatewayServiceConfiguration
           def initialize(configuration={})
             @configuration = configuration

data/lib/fog/vcloud_director/generators/compute/instantiate_vapp_template_params.rb

@@ -1,9 +1,9 @@
 require 'fog/vcloud_director/generators/compute/compose_common'
 
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/VAppType.html
         class InstantiateVappTemplateParams
           attr_reader :options

data/lib/fog/vcloud_director/generators/compute/metadata.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         #   {:metadata=>
         #    {"buenas si"=>"no tanto ya",
         #     "hola"=>"adios"},

data/lib/fog/vcloud_director/generators/compute/org_vdc_network.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/OrgVdcNetworkType.html
         class OrgVdcNetwork
           attr_reader :options

data/lib/fog/vcloud_director/generators/compute/recompose_vapp.rb

@@ -1,9 +1,9 @@
 require 'fog/vcloud_director/generators/compute/compose_common'
 
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         # @see http://pubs.vmware.com/vcd-51/index.jsp#types/RecomposeVAppParamsType.html
         class RecomposeVapp
 

data/lib/fog/vcloud_director/generators/compute/reconfigure_vm.rb

@@ -1,9 +1,9 @@
 require 'fog/vcloud_director/generators/compute/compose_common'
 
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         class ReconfigureVm
           extend ComposeCommon
 
@@ -72,7 +72,7 @@ module Fog
                 item.at('./rasd:HostResource')['ns13:busType'] = type if type
                 item.at('./rasd:HostResource')['ns13:busSubType'] = subtype if subtype
               end
-              raise Fog::Compute::VcloudDirector::PreProcessingError.new("Error resizing disk: disk with id '#{id}' does not exist.") unless hdd_exists
+              raise Fog::VcloudDirector::Compute::PreProcessingError.new("Error resizing disk: disk with id '#{id}' does not exist.") unless hdd_exists
             end
 
             def remove_virtual_hardware_section_item_hdd(xml, id:)

data/lib/fog/vcloud_director/generators/compute/vapp.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/VAppType.html
         class Vapp
           attr_reader :name, :options

data/lib/fog/vcloud_director/generators/compute/vm.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/VmType.html
         class Vm
           attr_reader :attrs

data/lib/fog/vcloud_director/generators/compute/vm_network.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Generators
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Generators
+      module Compute
         # This is the data structure it accepts, this is the output of
         # #get_vm_network
         #

data/lib/fog/vcloud_director/models/compute/catalog.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Catalog < Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/catalog_item.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class CatalogItem < Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/catalog_items.rb

@@ -1,10 +1,10 @@
 require 'fog/vcloud_director/models/compute/catalog_item'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class CatalogItems < Collection
-        model Fog::Compute::VcloudDirector::CatalogItem
+        model Fog::VcloudDirector::Compute::CatalogItem
 
         attribute :catalog
 

data/lib/fog/vcloud_director/models/compute/catalogs.rb

@@ -2,10 +2,10 @@ require 'fog/vcloud_director/models/compute/catalog'
 require 'fog/vcloud_director/models/compute/catalog_item'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Catalogs < Collection
-        model Fog::Compute::VcloudDirector::Catalog
+        model Fog::VcloudDirector::Compute::Catalog
 
         attribute :organization
 
@@ -13,7 +13,7 @@ module Fog
           item = service.get_catalog_item(item_id).body
           return nil unless item
           item[:vapp_template_id] = item[:Entity][:href].split('/').last
-          Fog::Compute::VcloudDirector::CatalogItem.new(item.merge({ :service => service, :collection => [] }))
+          Fog::VcloudDirector::Compute::CatalogItem.new(item.merge({ :service => service, :collection => [] }))
         end
 
         private

data/lib/fog/vcloud_director/models/compute/custom_field.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
 
       class CustomField < Model
 

data/lib/fog/vcloud_director/models/compute/custom_fields.rb

@@ -2,11 +2,11 @@ require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/custom_field'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
 
       class CustomFields < Collection
-        model Fog::Compute::VcloudDirector::CustomField
+        model Fog::VcloudDirector::Compute::CustomField
 
         attribute :vapp
 

data/lib/fog/vcloud_director/models/compute/disk.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Disk < Model # there is no lazy_load in disks
         identity  :id
 
@@ -22,7 +22,7 @@ module Fog
           not_first_set = !capacity.nil?
           attributes[:capacity] = new_capacity.to_i
           if not_first_set && has_changed
-            data = Fog::Generators::Compute::VcloudDirector::Disks.new(all_disks)
+            data = Fog::VcloudDirector::Generators::Compute::Disks.new(all_disks)
             num_disk = name.scan(/\d+/).first.to_i
             data.modify_hard_disk_size(num_disk, new_capacity)
             response = service.put_disks(attributes[:vm].id, data.disks)
@@ -36,7 +36,7 @@ module Fog
 
         def destroy
           num_disk = name.scan(/\d+/).first.to_i
-          data = Fog::Generators::Compute::VcloudDirector::Disks.new(all_disks)
+          data = Fog::VcloudDirector::Generators::Compute::Disks.new(all_disks)
           data.delete_hard_disk(num_disk)
           response = service.put_disks(attributes[:vm].id, data.disks)
           service.process_task(response.body)

data/lib/fog/vcloud_director/models/compute/disks.rb

@@ -1,16 +1,16 @@
 require 'fog/vcloud_director/models/compute/disk'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Disks < Collection
-        model Fog::Compute::VcloudDirector::Disk
+        model Fog::VcloudDirector::Compute::Disk
 
         attribute :vm
 
         def create(size)
           item_list unless @disks
-          data = Fog::Generators::Compute::VcloudDirector::Disks.new(@disks)
+          data = Fog::VcloudDirector::Generators::Compute::Disks.new(@disks)
           data.add_hard_disk(size)
           response = service.put_disks(vm.id, data.disks)
           service.process_task(response.body)

data/lib/fog/vcloud_director/models/compute/media.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Media < Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/medias.rb

@@ -1,10 +1,10 @@
 require 'fog/vcloud_director/models/compute/media'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Medias < Collection
-        model Fog::Compute::VcloudDirector::Media
+        model Fog::VcloudDirector::Compute::Media
 
         attribute :vdc
 

data/lib/fog/vcloud_director/models/compute/network.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Network < Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/networks.rb

@@ -1,13 +1,13 @@
 require 'fog/vcloud_director/models/compute/network'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Networks < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::Network
+        model Fog::VcloudDirector::Compute::Network
 
         attribute :organization
         attribute :vdc

data/lib/fog/vcloud_director/models/compute/organization.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Organization < Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/organizations.rb

@@ -1,10 +1,10 @@
 require 'fog/vcloud_director/models/compute/organization'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Organizations < Collection
-        model Fog::Compute::VcloudDirector::Organization
+        model Fog::VcloudDirector::Compute::Organization
 
         private
 

data/lib/fog/vcloud_director/models/compute/tag.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Tag < Model
         identity  :id
         attribute :value

data/lib/fog/vcloud_director/models/compute/tags.rb

@@ -1,10 +1,10 @@
 require 'fog/vcloud_director/models/compute/tag'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Tags < Collection
-        model Fog::Compute::VcloudDirector::Tag
+        model Fog::VcloudDirector::Compute::Tag
 
         attribute :vm
 

data/lib/fog/vcloud_director/models/compute/task.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Task < Fog::Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/tasks.rb

@@ -1,13 +1,13 @@
 require 'fog/vcloud_director/models/compute/task'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Tasks < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::Task
+        model Fog::VcloudDirector::Compute::Task
 
         attribute :organization