fog-vsphere 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1090356cd911b5f4d34de083d7ebd0c26fc10d976155a4896767dbc8c4593001
-  data.tar.gz: c52e89e4fb8fbb66654d8555abf1c3d962fa1baf915b8bd5ab45f85a6ae6b789
+  metadata.gz: 18ada3fe97234aa0bf59aaab14ea04ba2ceaa40cb62abc6189026b6214d85759
+  data.tar.gz: 7894e6c462e8501eb2c9a16170300d75516ba8e4431a64be14d5cc6140271fbe
 SHA512:
-  metadata.gz: 5031553aa6291340875c681f9ec771668bc1465e5b09fca9681713a0bab8feda8c5f08e95c11f99f0ffc7a82c18e76e8f1fba6b7dce923641885ccea0dbc1746
-  data.tar.gz: c1207ec44317315c925f77efe93b8c5469677fb0807cf3163654052eb63ea5941320672a20cf4a36f8fd92a91a747153846d9f474cd7c16bad335be4679809bb
+  metadata.gz: 8db1f07c4c800261506a22d0be60cc2c777a2da9e6001cee6a39a22218719af8eb4f105071383732c40f20201818645954a388420f7291bd0d3fecee0adc1a91
+  data.tar.gz: ba9313ddc1af94248d965ae9cda4734766cf36c494f33f5f84fc40581be22532ff96700539f63dce3583d955a60e86b75e367795bd3c0ca29291fa921717d1db

data/.travis.yml

@@ -21,7 +21,3 @@ script: bundle exec rake travis:ci
 notifications:
   email:
     - chrobert@redhat.com
-addons:
-  code_climate:
-    repo_token: 44bcd04b60228fc94f2be3a5e0346441b5ea156e94e89a17fc24c5d3de483721
-

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v3.5.0
+* Clone vm from different datacenter (#263)
+* Fix autoload issues (#267)
+* Add extra_config attribute to server (#268)
+* Expose `_ref` from Compute::Network (#265)
+
 ## v3.4.0
 * list_resource_pools returns incorrect resource pool name (#256)
 * Add ability to create update and delete Resource Pools (#253)

data/lib/fog/vsphere/compute.rb

@@ -168,7 +168,8 @@ module Fog
           memoryHotAddEnabled: 'config.memoryHotAddEnabled',
           firmware: 'config.firmware',
           boot_order: 'config.bootOptions.bootOrder',
-          annotation: 'config.annotation'
+          annotation: 'config.annotation',
+          extra_config: 'config.extraConfig'
         }.freeze
 
         def convert_vm_view_to_attr_hash(vms)
@@ -250,6 +251,8 @@ module Fog
                           nil
                         end
               }
+
+              attrs['extra_config'] = parse_extra_config(attrs['extra_config'])
             end
             # This inline rescue catches any standard error.  While a VM is
             # cloning, a call to the macs method will throw and NoMethodError
@@ -308,6 +311,12 @@ module Fog
           end.compact.uniq
         end
 
+        # Flattens Array of RbVmomi::VIM::OptionValue to simple hash
+        def parse_extra_config(vm_extra_config)
+          return unless vm_extra_config.is_a?(Array)
+          vm_extra_config.map { |entry| [entry[:key], entry[:value]] }.to_h
+        end
+
         # returns vmware managed obj id string
         def managed_obj_id(obj)
           obj.to_s.match(/\("([^"]+)"\)/)[1]

data/lib/fog/vsphere/models/compute/clusters.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Clusters < Fog::Collection
-        autoload :Cluster, File.expand_path('../cluster', __FILE__)
-
         model Fog::Vsphere::Compute::Cluster
         attr_accessor :datacenter
 

data/lib/fog/vsphere/models/compute/customfields.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Customfields < Fog::Collection
-        autoload :Customfield, File.expand_path('../customfield', __FILE__)
-
         model Fog::Vsphere::Compute::Customfield
 
         attr_accessor :vm

data/lib/fog/vsphere/models/compute/customvalues.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Customvalues < Fog::Collection
-        autoload :Customvalue, File.expand_path('../customvalue', __FILE__)
-
         model Fog::Vsphere::Compute::Customvalue
 
         attr_accessor :vm

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

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Datacenters < Fog::Collection
-        autoload :Datacenter, File.expand_path('../datacenter', __FILE__)
-
         model Fog::Vsphere::Compute::Datacenter
 
         def all(filters = {})

data/lib/fog/vsphere/models/compute/datastores.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Datastores < Fog::Collection
-        autoload :Datastore, File.expand_path('../datastore', __FILE__)
-
         model Fog::Vsphere::Compute::Datastore
         attr_accessor :datacenter, :cluster
 

data/lib/fog/vsphere/models/compute/folders.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Folders < Fog::Collection
-        autoload :Folder, File.expand_path('../folder', __FILE__)
-
         model Fog::Vsphere::Compute::Folder
         attr_accessor :datacenter, :type, :path
 

data/lib/fog/vsphere/models/compute/interfaces.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Interfaces < Fog::Collection
-        autoload :Interface, File.expand_path('../interface', __FILE__)
-
         model Fog::Vsphere::Compute::Interface
 
         attribute :server_id

data/lib/fog/vsphere/models/compute/interfacetypes.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Interfacetypes < Fog::Collection
-        autoload :Interfacetype, File.expand_path('../interfacetype', __FILE__)
-
         model Fog::Vsphere::Compute::Interfacetype
         attr_accessor :datacenter
         attr_accessor :servertype

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

@@ -9,6 +9,7 @@ module Fog
         attribute :accessible # reachable by at least one hypervisor
         attribute :virtualswitch
         attribute :vlanid
+        attribute :_ref
 
         def to_s
           name

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

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Networks < Fog::Collection
-        autoload :Network, File.expand_path('../network', __FILE__)
-
         model Fog::Vsphere::Compute::Network
         attr_accessor :datacenter, :cluster
 

data/lib/fog/vsphere/models/compute/resource_pools.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class ResourcePools < Fog::Collection
-        autoload :ResourcePool, File.expand_path('../resource_pool', __FILE__)
-
         model Fog::Vsphere::Compute::ResourcePool
         attr_accessor :datacenter, :cluster
 

data/lib/fog/vsphere/models/compute/rules.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Rules < Fog::Collection
-        autoload :Rule, File.expand_path('../rule', __FILE__)
-
         model Fog::Vsphere::Compute::Rule
         attribute :datacenter
         attribute :cluster

data/lib/fog/vsphere/models/compute/server.rb

@@ -52,6 +52,7 @@ module Fog
         attribute :firmware
         attribute :boot_order
         attribute :annotation
+        attribute :extra_config
 
         def initialize(attributes = {})
           super defaults.merge(attributes)
@@ -157,7 +158,8 @@ module Fog
 
           # Give our path to the request
           req_options['template_path'] = "#{relative_path}/#{name}"
-          req_options['datacenter'] = datacenter.to_s
+          req_options['template_datacenter'] = datacenter.to_s
+          req_options['datacenter'] ||= datacenter.to_s
 
           # Perform the actual clone
           clone_results = service.vm_clone(req_options)

data/lib/fog/vsphere/models/compute/servers.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Servers < Fog::Collection
-        autoload :Server, File.expand_path('../server', __FILE__)
-
         model Fog::Vsphere::Compute::Server
         attr_accessor :datacenter
         attr_accessor :network

data/lib/fog/vsphere/models/compute/servertypes.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Servertypes < Fog::Collection
-        autoload :Servertype, File.expand_path('../servertype', __FILE__)
-
         model Fog::Vsphere::Compute::Servertype
         attr_accessor :datacenter, :id, :fullname
 

data/lib/fog/vsphere/models/compute/templates.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Templates < Fog::Collection
-        autoload :Template, File.expand_path('../template', __FILE__)
-
         model Fog::Vsphere::Compute::Template
 
         def all(filters = {})

data/lib/fog/vsphere/models/compute/tickets.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Tickets < Fog::Collection
-        autoload :Ticket, File.expand_path('../ticket', __FILE__)
-
         model Fog::Vsphere::Compute::Ticket
 
         attr_accessor :server

data/lib/fog/vsphere/models/compute/volumes.rb

@@ -2,8 +2,6 @@ module Fog
   module Vsphere
     class Compute
       class Volumes < Fog::Collection
-        autoload :Volume, File.expand_path('../volume', __FILE__)
-
         attribute :server_id
 
         model Fog::Vsphere::Compute::Volume

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

@@ -6,17 +6,19 @@ module Fog
           cluster = get_raw_cluster(attributes[:cluster], attributes[:datacenter])
 
           root_resource_pool = if attributes[:root_resource_pool_name]
-                                 cluster.resourcePool.find attributes[:root_resource_pool_name]
+                                 cluster.resourcePool.find attributes[:root_resource_pool_name].gsub('/', '%2f')
                                else
                                  cluster.resourcePool
                                end
 
-          root_resource_pool.CreateResourcePool(
+          raise ArgumentError, 'Root resource pool could not be found' if root_resource_pool.nil?
+
+          resource_pool = root_resource_pool.CreateResourcePool(
             name: attributes[:name],
             spec: get_resource_pool_spec(attributes)
           )
 
-          get_resource_pool(attributes[:name], attributes[:cluster], attributes[:datacenter])
+          resource_pool_attributes(resource_pool, attributes[:cluster], attributes[:datacenter])
         end
 
         private

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

@@ -10,7 +10,7 @@ module Fog
             config: get_resource_pool_spec(attributes)
           )
 
-          get_resource_pool(attributes[:name], attributes[:cluster], attributes[:datacenter])
+          resource_pool_attributes(raw_resource_pool, attributes[:cluster], attributes[:datacenter])
         end
 
         private

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

@@ -21,7 +21,10 @@ module Fog
           end
           raise ArgumentError, 'cluster option is required' unless options['resource_pool'][0]
           raise Fog::Vsphere::Compute::NotFound, "Datacenter #{options['datacenter']} Doesn't Exist!" unless get_datacenter(options['datacenter'])
-          raise Fog::Vsphere::Compute::NotFound, "Template #{options['template_path']} Doesn't Exist!" unless get_virtual_machine(options['template_path'], options['datacenter'])
+          if options['template_datacenter'] && !get_datacenter(options['template_datacenter'])
+            raise Fog::Vsphere::Compute::NotFound, "Datacenter #{options['template_datacenter']} Doesn't Exist!"
+          end
+          raise Fog::Vsphere::Compute::NotFound, "Template #{options['template_path']} Doesn't Exist!" unless get_virtual_machine(options['template_path'], options['template_datacenter'] || options['datacenter'])
           raise Fog::Vsphere::Compute::NotFound, "Cluster #{options['resource_pool'][0]} Doesn't Exist in the DC!" unless get_raw_cluster(options["resource_pool"][0], options['datacenter'])
           raise ArgumentError, 'path option is required' unless options.fetch('dest_folder', '/')
           if options.key?('datastore') && !options['datastore'].nil? && !get_raw_datastore(options['datastore'], options['datacenter'])
@@ -50,6 +53,9 @@ module Fog
         #     want to clone FROM. Relative to Datacenter (Example:
         #     "FolderNameHere/VMNameHere")
         #   * 'name'<~String> - *REQUIRED* The VMName of the Destination
+        #   * 'template_datacenter'<~String> - Datacenter name where template
+        #     is. Make sure this datacenter exists, should if you're using
+        #     the clone function in server.rb model.
         #   * 'dest_folder'<~String> - Destination Folder of where 'name' will
         #     be placed on your cluster. Relative Path to Datacenter E.G.
         #     "FolderPlaceHere/anotherSub Folder/onemore"
@@ -104,14 +110,11 @@ module Fog
           # Option handling
           options = vm_clone_check_options(options)
 
-          # Added for people still using options['path']
-          template_path = options['path'] || options['template_path']
-
           # Options['template_path']<~String>
           # Added for people still using options['path']
           template_path = options['path'] || options['template_path']
           # Now find the template itself using the efficient find method
-          vm_mob_ref = get_vm_ref(template_path, options['datacenter'])
+          vm_mob_ref = get_vm_ref(template_path, options['template_datacenter'] || options['datacenter'])
 
           # Options['dest_folder']<~String>
           # Grab the destination folder object if it exists else use cloned mach

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '3.4.0'.freeze
+    VERSION = '3.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.