fog-vsphere 3.6.0 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 894200caa04d87aa819573c86239ebc6f9f6050ff58f6bd8243f2cdb2ba3de62
-  data.tar.gz: 268630c771bab27449b795987b4368911b5531396ece00817bcab4a19845d162
+  metadata.gz: 7ffd073bf26a6cd8fac5eecedbae2cd0ce3b7f0edb11ca52f3f5fc2b45dd6653
+  data.tar.gz: e3e921ba25609b8e13a0523918dc25b6b5db6cb1dde66a6f66cad15d0809dc87
 SHA512:
-  metadata.gz: c04c8a90cda3331a694eddbe9d4d9e6d0942b47ddf4a824808295fd904dc68b3bed3830a10fde6120ad681a3a8c8534970a1133eee209fd713f5d0b5a1b67994
-  data.tar.gz: 1d18e55c8326a30f9e2c52ddbff9a87d1f90242b959a8e7eea1b86270134901217b5c61d40890e71cd9f5edcb1ced2c79f9464254453a2536c5b7c490f409af8
+  metadata.gz: 48ea23c5093f1e8640d74c856fe40b9d7319c71e8475de3405e28769ebe238284f572c4a1d4b587f6d48b767ff9f652441569935b36746b863f5b2622f26e4a4
+  data.tar.gz: e39985451598902c910e565c38f1e9e110feae3aa15014802e0c69628aa28318dc0e8831ea1002630a2697861d4d9889dd2e60c422b425e1782a29e67f898b7a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.6.2
+* Add disk and partitions info
+
+## 3.6.1
+* Revert Unify network ID attribute for Red Hat Satellite
+
 ## 3.6.0
 * Switch to rbvmomi2 (#281)
 * Raise the minimum Ruby version to 2.7 (#280)

data/lib/fog/vsphere/compute.rb

@@ -160,6 +160,8 @@ module Fog
           tools_version: 'guest.toolsVersionStatus',
           memory_mb: 'config.hardware.memoryMB',
           cpus: 'config.hardware.numCPU',
+          disks: 'config.hardware.device',
+          partitions:  'guest.disk',
           corespersocket: 'config.hardware.numCoresPerSocket',
           overall_status: 'overallStatus',
           guest_id: 'config.guestId',
@@ -252,6 +254,8 @@ module Fog
                         end
               }
 
+              attrs['disks'] = parse_disks(attrs['disks'])
+              attrs['partitions'] = parse_partitions(attrs['partitions'])
               attrs['extra_config'] = parse_extra_config(attrs['extra_config'])
             end
             # This inline rescue catches any standard error.  While a VM is
@@ -317,6 +321,20 @@ module Fog
           vm_extra_config.map { |entry| [entry[:key], entry[:value]] }.to_h
         end
 
+        def parse_disks(vm_disks)
+          return unless vm_disks.is_a?(Array)
+          vm_disks.grep(RbVmomi::VIM::VirtualDisk).map do |d|
+            { :label => d.deviceInfo.label, :capacity => d.capacityInBytes }
+          end
+        end
+
+        def parse_partitions(vm_partitions)
+          return unless vm_partitions.is_a?(Array)
+          vm_partitions.grep(RbVmomi::VIM::GuestDiskInfo).map do |p|
+            { :path => p.diskPath, :free => p.freeSpace, :capacity => p.capacity }
+          end
+        end
+
         # returns vmware managed obj id string
         def managed_obj_id(obj)
           obj.to_s.match(/\("([^"]+)"\)/)[1]

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

@@ -35,6 +35,8 @@ module Fog
         attribute :path
         attribute :memory_mb
         attribute :cpus
+        attribute :disks
+        attribute :partitions
         attribute :corespersocket
         attribute :interfaces
         attribute :volumes

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

@@ -38,7 +38,7 @@ module Fog
             # only the one will do
             proc do |n|
               n._ref == ref_or_name || (
-                n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && (n.name == ref_or_name) &&
+                n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && (n.name == ref_or_name || n.key == ref_or_name) &&
                 (n.config.distributedVirtualSwitch.name == distributedswitch)
               )
             end
@@ -46,12 +46,12 @@ module Fog
             # the first distributed virtual switch will do - selected by network - gives control to vsphere
             proc do |n|
               n._ref == ref_or_name || (
-                n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && (n.name == ref_or_name)
+                n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && (n.name == ref_or_name || n.key == ref_or_name)
               )
             end
           else
             # the first matching network will do, seems like the non-distributed networks come first
-            proc { |n| n._ref == ref_or_name || n.name == ref_or_name }
+            proc { |n| n._ref == ref_or_name || n.name == ref_or_name || (n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && n.key == ref_or_name) }
           end
         end
       end

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

@@ -30,15 +30,17 @@ module Fog
                 virtualswitch: dvswitches[network['config.distributedVirtualSwitch']._ref]
               )
             elsif network.obj.is_a?(RbVmomi::VIM::OpaqueNetwork)
-              map_attrs_to_hash(network, network_attribute_mapping).merge(
+              map_attrs_to_hash(network, network_dvportgroup_attribute_mapping).merge(
+                id: network.obj._ref,
                 opaqueNetworkId: network.obj.summary.opaqueNetworkId
               )
             else
-              map_attrs_to_hash(network, network_attribute_mapping)
+              map_attrs_to_hash(network, network_attribute_mapping).merge(
+                id: network.obj._ref
+              )
             end.merge(
-              _ref: network.obj._ref,
-              id: managed_obj_id(network.obj),
-              datacenter: datacenter_name
+              datacenter: datacenter_name,
+              _ref: network.obj._ref
             )
           end.compact
         end
@@ -54,7 +56,7 @@ module Fog
 
         def network_dvportgroup_attribute_mapping
           network_attribute_mapping.merge(
-            dvp_uuid: 'config.key'
+            id: 'config.key'
           )
         end
 

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '3.6.0'.freeze
+    VERSION = '3.6.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.2
 platform: ruby
 authors:
 - J.R. Garcia
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -359,7 +359,7 @@ homepage: https://github.com/fog/fog-vsphere
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -374,8 +374,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.
 test_files: []