fog-vsphere 1.13.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b20db71871f9f8c74e15f8c8c69dbfea6b7f25d3
-  data.tar.gz: 78d13178e6d4023987e32d10cae4d0e5420fde6a
+SHA256:
+  metadata.gz: d0dddb289327d2871f911801e572de9b9f3301a1eb3b0da0e9aeb60f8660fc3d
+  data.tar.gz: 2ed6a2f1ac3c94187cfdfc9dcc683f09c32c382c89872da97914754b4c567514
 SHA512:
-  metadata.gz: 5157b6404305925bda2ea2688c44ef963ea5de21ef0b3a3a33969a6dc1afba77e6da0375a468085fcb23d7bd50d0775e19b0cbb61d0d855ba380a26eeff035f8
-  data.tar.gz: b54b88739bee3002c8b38ac1c95dd4cd63421f6029394220fe3aa770a098f196bce033effcf95f93972e5c7e43e9961bd435d939a628b9dcf498e26635c195b8
+  metadata.gz: 01ca149030adc6f5d6b76b2ee2f4c9e7986dd533f99ab49cea195f6cb8ec56da761851e577f93dab33fbcb3d4e044637b7f0b98dfbee105a2f87fc4f1c4b52da
+  data.tar.gz: c0eb59366051e13703bf0a81ba091e84796dd1f1aae5e31260eb0bc9fa4dca46d56e4e1514daf06691b497b367b7735bb85f1fd102d4d8ad87c34e708e641ba9

data/.travis.yml

@@ -6,8 +6,6 @@ matrix:
     - rvm: jruby-head
   fast_finish: true
   include:
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.1.9.2+
     - rvm: 2.0.0
       gemfile: Gemfile
     - rvm: 2.1.10
@@ -18,8 +16,6 @@ matrix:
       gemfile: Gemfile
     - rvm: 2.4.0
       gemfile: Gemfile
-    - rvm: jruby-19mode
-      gemfile: gemfiles/Gemfile.1.9.2+
     - rvm: jruby-head
       gemfile: Gemfile
 notifications:

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v2.0.0
+
+* Drop support for ruby versions < 2.0.0
+* Fix regex issue when folder contains the datacenter name (#120)
+* add more attributes to host model (#119)
+* Fixes listing resource pools for clusters nested in folders (#118)
+* Add requests to host (#116)
+* Fix interface code in VM clone (#115)
+
 ## v1.13.1
 
 * Fix typo of local variable name in clone operation (#114)

data/fog-vsphere.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 1.8.7'
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency 'fog-core'
   spec.add_runtime_dependency 'rbvmomi', '~> 1.9'

data/lib/fog/vsphere/compute.rb

@@ -127,6 +127,9 @@ module Fog
       request :vm_remove_snapshot
       request :vm_acquire_ticket
       request :vm_relocate
+      request :host_shutdown
+      request :host_start_maintenance
+      request :host_finish_maintenance
 
       module Shared
         attr_reader :vsphere_is_vcenter
@@ -437,6 +440,7 @@ module Fog
                   :num_cpu_cores => "16",
                   :overall_status => "green",
                   :datacenter => "Solutions",
+                  :full_path => 'Solutionscluster',
                   :klass => "RbVmomi::VIM::ComputeResource"
                  },
                  {:id => "e4195973-102b-4096-bbd6-5429ff0b35c9",
@@ -445,6 +449,7 @@ module Fog
                   :num_cpu_cores => "32",
                   :overall_status => "green",
                   :datacenter => "Solutions",
+                  :full_path => 'Problemscluster',
                   :klass => "RbVmomi::VIM::ComputeResource"
                  },
                  {
@@ -455,6 +460,7 @@ module Fog
                                   :num_cpu_cores => "32",
                                   :overall_status => "green",
                                   :datacenter => "Solutions",
+                                  :full_path => 'Nested/Problemscluster',
                                   :klass => "RbVmomi::VIM::ComputeResource"
                                  },
                                  {:id => "03616b8d-b707-41fd-b3b5-the Second",
@@ -463,6 +469,7 @@ module Fog
                                   :num_cpu_cores => "32",
                                   :overall_status => "green",
                                   :datacenter => "Solutions",
+                                  :full_path => 'Nested/Lastcluster',
                                   :klass => "RbVmomi::VIM::ComputeResource"}
                    ]
                  }
@@ -483,6 +490,19 @@ module Fog
                    :datacenter => 'Solutions',
                    :cluster => 'Solutionscluster',
                    :name => 'host1.example.com',
+                   :model => 'PowerEdge R730',
+                   :vendor => 'Dell Inc.',
+                   :ipaddress => '1.2.3.4',
+                   :ipaddress6 => nil,
+                   :hostname => 'host1',
+                   :domainname => 'example.com',
+                   :product_name => 'VMware ESXi',
+                   :uuid => '4c4c4544-0051-3610-8046-c4c44f584a32',
+                   :cpu_cores => 20,
+                   :cpu_sockets => 2,
+                   :cpu_threads => 40,
+                   :memory => 824597241856,
+                   :product_version => '6.0.0',
                    :vm_ids => ['5032c8a5-9c5e-ba7a-3804-832a03e16381', '502916a3-b42e-17c7-43ce-b3206e9524dc']
                  }
                }

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

@@ -14,7 +14,7 @@ module Fog
         def resource_pools(filters = { })
           self.attributes[:resource_pools] ||= id.nil? ? [] : service.resource_pools({
                                                                                           :service => service,
-                                                                                          :cluster    => name,
+                                                                                          :cluster    => full_path,
                                                                                           :datacenter => datacenter
                                                                                         }.merge(filters))
         end
@@ -22,7 +22,7 @@ module Fog
         def datastores(filters = { })
           self.attributes[:datastores] ||= id.nil? ? [] : service.datastores({
                                                                                           :service => service,
-                                                                                          :cluster    => name,
+                                                                                          :cluster    => full_path,
                                                                                           :datacenter => datacenter
                                                                                         }.merge(filters))
         end
@@ -30,17 +30,17 @@ module Fog
         def networks(filters = { })
           self.attributes[:networks] ||= id.nil? ? [] : service.networks({
                                                                                           :service => service,
-                                                                                          :cluster    => name,
+                                                                                          :cluster    => full_path,
                                                                                           :datacenter => datacenter
                                                                                         }.merge(filters))
         end
 
         def rules
-          service.rules(:datacenter => datacenter, :cluster => name)
+          service.rules(:datacenter => datacenter, :cluster => full_path)
         end
 
         def hosts
-          service.hosts(:datacenter => datacenter, :cluster => name)
+          service.hosts(:datacenter => datacenter, :cluster => full_path)
         end
 
         def to_s

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

@@ -8,10 +8,40 @@ module Fog
         attribute :cluster
         attribute :name
         attribute :vm_ids
+        attribute :cpu_cores
+        attribute :cpu_sockets
+        attribute :cpu_threads
+        attribute :memory
+        attribute :uuid
+
+        # Lazy Loaded Attributes
+        [:vm_ids].each do |attr|
+          define_method attr do
+            attributes[attr] = attributes[attr].call if attributes[attr].is_a?(Proc)
+            attributes[attr]
+          end
+        end
+        # End Lazy Loaded Attributes
 
         def to_s
           name
         end
+
+        def memory_mb
+          memory / 1024 / 1024
+        end
+
+        def shutdown
+          service.host_shutdown(name, cluster, datacenter)
+        end
+
+        def start_maintenance
+          service.host_start_maintenance(name, cluster, datacenter)
+        end
+
+        def finish_maintenance
+          service.host_finish_maintenance(name, cluster, datacenter)
+        end
       end
     end
   end

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

@@ -0,0 +1,14 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def host_finish_maintenance(name, cluster_name, datacenter_name, timeout = 0)
+          host_ref = get_host(name, cluster_name, datacenter_name)
+          task = host_ref.ExitMaintenanceMode_Task(:timeout => timeout)
+          task.wait_for_completion
+          { 'task_state' => task.info.state }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def host_shutdown(name, cluster_name, datacenter_name, force = false)
+          host_ref = get_host(name, cluster_name, datacenter_name)
+          task = host_ref.ShutdownHost_Task(:force => force)
+          task.wait_for_completion
+          { 'task_state' => task.info.state }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def host_start_maintenance(name, cluster_name, datacenter_name, timeout = 0, evacuate_powered_off_vms = false)
+          host_ref = get_host(name, cluster_name, datacenter_name)
+          task = host_ref.EnterMaintenanceMode_Task(:timeout => timeout, :evacuatePoweredOffVms => evacuate_powered_off_vms)
+          task.wait_for_completion
+          { 'task_state' => task.info.state }
+        end
+     end
+    end
+  end
+end

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

@@ -47,7 +47,7 @@ module Fog
 
         def cluster_path(cluster, datacenter_name)
           datacenter = find_raw_datacenter(datacenter_name)
-          cluster.pretty_path.gsub(%r{(#{Regexp.escape(datacenter_name)}|#{Regexp.escape(datacenter.hostFolder.name)})\/}, '')
+          cluster.pretty_path.gsub(%r{(^#{Regexp.escape(datacenter_name)}|#{Regexp.escape(datacenter.hostFolder.name)})\/}, '')
         end
       end
 

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

@@ -11,13 +11,27 @@ module Fog
 
         def host_attributes(host, filters)
           {
-            datacenter: filters[:datacenter],
-            cluster:    filters[:cluster],
-            name:       host[:name],
-            vm_ids:     host[:vm].map {|vm| vm.config.instanceUuid }
+            datacenter:      filters[:datacenter],
+            cluster:         filters[:cluster],
+            name:            host[:name],
+            cpu_cores:       host.hardware.cpuInfo.numCpuCores,
+            cpu_sockets:     host.hardware.cpuInfo.numCpuPackages,
+            cpu_threads:     host.hardware.cpuInfo.numCpuThreads,
+            memory:          host.hardware.memorySize,
+            uuid:            host.hardware.systemInfo.uuid,
+            model:           host.hardware.systemInfo.model,
+            vendor:          host.hardware.systemInfo.vendor,
+            ipaddress:       (host.config.network.vnic.first.spec.ip.ipAddress rescue nil),
+            ipaddress6:      (host.config.network.vnic.first.spec.ip.ipV6Config.ipV6Address.first.ipAddress rescue nil),
+            product_name:    host.summary.config.product.name,
+            product_version: host.summary.config.product.version,
+            hostname:        (host.config.network.dnsConfig.hostName rescue nil),
+            domainname:      (host.config.network.dnsConfig.domainName rescue nil),
+            vm_ids:          Proc.new { host[:vm].map {|vm| vm.config.instanceUuid } }
           }
         end
       end
+
       class Mock
         def list_hosts(filters = {})
           self.data[:hosts].values.select {|r| r[:datacenter] == filters[:datacenter] && r[:cluster] == filters[:cluster]}

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

@@ -766,7 +766,8 @@ module Fog
                 device: template_nic
               }
             else
-              specs << create_interface(template_nic, template_nic.key, :remove, :datacenter => datacenter)
+              interface = Fog::Compute::Vsphere::Interface.new(raw_to_hash(template_nic))
+              specs << create_interface(interface, interface.key, :remove, :datacenter => datacenter)
             end
           end
 

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '1.13.1'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 2.0.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -140,7 +140,6 @@ files:
 - README.md
 - Rakefile
 - fog-vsphere.gemspec
-- gemfiles/Gemfile.1.9.2+
 - lib/fog/bin/vsphere.rb
 - lib/fog/vsphere.rb
 - lib/fog/vsphere/compute.rb
@@ -209,6 +208,9 @@ files:
 - lib/fog/vsphere/requests/compute/get_template.rb
 - lib/fog/vsphere/requests/compute/get_virtual_machine.rb
 - lib/fog/vsphere/requests/compute/get_vm_first_scsi_controller.rb
+- lib/fog/vsphere/requests/compute/host_finish_maintenance.rb
+- lib/fog/vsphere/requests/compute/host_shutdown.rb
+- lib/fog/vsphere/requests/compute/host_start_maintenance.rb
 - lib/fog/vsphere/requests/compute/list_child_snapshots.rb
 - lib/fog/vsphere/requests/compute/list_clusters.rb
 - lib/fog/vsphere/requests/compute/list_compute_resources.rb
@@ -314,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -322,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.

data/gemfiles/Gemfile.1.9.2+

@@ -1,9 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'codeclimate-test-reporter', '~> 1.0',  group: :test, require: nil
-gem 'json',    '~> 1.8.0'
-gem 'net-ssh', '~> 2.9'
-gem 'rubocop', '~> 0.41.0'
-gem 'simplecov', '~> 0.12.0'
-
-gemspec :path => '..'