fog-vcloud-director 0.1.10 → 0.3.1

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
@@ -12,7 +12,6 @@ module Fog
           end
 
           def generate_xml
-            attrs = @attrs
             Nokogiri::XML::Builder.new do
               VApp('xmlns' => 'http://www.vmware.com/vcloud/v1.5',
                    'name' => name

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,8 +1,6 @@
-require 'fog/core/model'
-
 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,8 +1,6 @@
-require 'fog/core/model'
-
 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,11 +1,10 @@
-require 'fog/core/collection'
 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

@@ -1,12 +1,11 @@
-require 'fog/core/collection'
 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
 
@@ -14,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,8 +1,6 @@
-require 'fog/core/model'
-
 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,8 +1,6 @@
-require 'fog/core/model'
-
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Disk < Model # there is no lazy_load in disks
         identity  :id
 
@@ -17,13 +15,14 @@ module Fog
         attribute :bus_sub_type
         attribute :bus_type
 
+        remove_method :capacity=
         # TODO Virtual machine disk sizes may only be increased, not decreased.
         def capacity=(new_capacity)
           has_changed = ( capacity != new_capacity.to_i )
           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)
@@ -37,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,17 +1,16 @@
-require 'fog/core/collection'
 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,8 +1,6 @@
-require 'fog/core/model'
-
 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,11 +1,10 @@
-require 'fog/core/collection'
 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,8 +1,6 @@
-require 'fog/core/model'
-
 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,14 +1,13 @@
-require 'fog/core/collection'
 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,8 +1,6 @@
-require 'fog/core/model'
-
 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,11 +1,10 @@
-require 'fog/core/collection'
 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,12 +1,11 @@
-require 'fog/core/model'
-
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Tag < Model
         identity  :id
         attribute :value
 
+        remove_method :value=
         def value=(new_value)
           has_changed = ( value != new_value )
           not_first_set = !value.nil?

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

@@ -1,11 +1,10 @@
-require 'fog/core/collection'
 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,8 +1,6 @@
-require 'fog/core/model'
-
 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,14 +1,13 @@
-require 'fog/core/collection'
 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
 

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

@@ -1,9 +1,8 @@
-require 'fog/core/model'
 require 'fog/vcloud_director/models/compute/vm_customization'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class TemplateVm < Model
         identity  :id
 

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

@@ -1,19 +1,18 @@
-require 'fog/core/collection'
-require 'fog/vcloud_director/models/compute/vm'
+require 'fog/vcloud_director/models/compute/template_vm'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class TemplateVms < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::TemplateVm
+        model Fog::VcloudDirector::Compute::TemplateVm
 
         attribute :vapp_template
 
 
-        def get_single_vm(vm_id)
+        def get_single_template_vm(vm_id)
           item = service.get_template_vm(vm_id).body
           return nil unless item
           new(item[:vm])

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

@@ -1,8 +1,6 @@
-require 'fog/core/model'
-
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vapp < Model
         identity  :id
 
@@ -12,13 +10,32 @@ module Fog
         attribute :description, :aliases => :Description
         attribute :deployed, :type => :boolean
         attribute :status
-        attribute :lease_settings, :aliases => :LeaseSettingsSection
-        attribute :network_section, :aliases => :"ovf:NetworkSection", :squash => :"ovf:Network"
-        attribute :network_config, :aliases => :NetworkConfigSection, :squash => :NetworkConfig
-        attribute :owner, :aliases => :Owner, :squash => :User
-        attribute :InMaintenanceMode, :type => :boolean
+        attribute :lease_settings
+        attribute :network_section
+        attribute :network_config
+        attribute :owner
+        attribute :maintenance, :type => :boolean
+
+        def initialize(attributes = {})
+          # Memorize VMs because their full XML description was already included in the vApp XML description.
+          # Instead simple Array we rather store as Collection in order to provide common interface e.g.
+          #    vapp.vms.all
+          #    vapp.vms.get_by_name
+          if (vms = attributes.delete(:vms))
+            @vms = Fog::VcloudDirector::Compute::Vms.new(
+              :vapp    => self,
+              :service => attributes[:service]
+            ).with_item_list(Array(vms))
+          end
+
+          super(attributes)
+        end
+
+        def vms(force: false)
+          # Return memorized Collection that we parsed based on vApp XML description. This way we prevent
+          # additional API request to be made for each VM in a vApp.
+          return @vms unless @vms.nil? || force
 
-        def vms
           requires :id
           service.vms(:vapp => self)
         end
@@ -33,6 +50,7 @@ module Fog
           service.custom_fields( :vapp => self)
         end
 
+        # https://pubs.vmware.com/vcd-80/index.jsp#com.vmware.vcloud.api.sp.doc_90/GUID-843BE3AD-5EF6-4442-B864-BCAE44A51867.html
         def human_status
           case status
           when '-1', -1
@@ -66,7 +84,7 @@ module Fog
         def undeploy(action='powerOff')
           begin
             response = service.post_undeploy_vapp(id, :UndeployPowerAction => action)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -78,7 +96,7 @@ module Fog
           requires :id
           begin
             response = service.post_power_off_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -90,7 +108,7 @@ module Fog
           requires :id
           begin
             response = service.post_power_on_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -102,7 +120,7 @@ module Fog
           requires :id
           begin
             response = service.post_reboot_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -114,7 +132,7 @@ module Fog
           requires :id
           begin
             response = service.post_reset_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -126,7 +144,7 @@ module Fog
           requires :id
           begin
             response = service.post_shutdown_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -138,7 +156,7 @@ module Fog
           requires :id
           begin
             response = service.post_suspend_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -149,7 +167,7 @@ module Fog
           requires :id
           begin
             response = service.delete_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end