From f1e7508668c9cf5df749f15d716bb7cfdcf79812 Mon Sep 17 00:00:00 2001
From: Chris Roberts <chrobert@redhat.com>
Date: Tue, 20 Jun 2023 14:42:28 -0400
Subject: [PATCH 1/2] Revert "Unify network ID attribute"

This reverts commit 9b88e63b8eef2ba9a4fcad49c1df9027cef52624.
---
 lib/fog/vsphere/requests/compute/get_network.rb   |  6 +++---
 lib/fog/vsphere/requests/compute/list_networks.rb | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/fog/vsphere/requests/compute/get_network.rb b/lib/fog/vsphere/requests/compute/get_network.rb
index 9a379d1a..2e8f088e 100644
--- a/lib/fog/vsphere/requests/compute/get_network.rb
+++ b/lib/fog/vsphere/requests/compute/get_network.rb
@@ -38,7 +38,7 @@ def choose_finder(ref_or_name, distributedswitch)
             # 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 @@ def choose_finder(ref_or_name, distributedswitch)
             # 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
diff --git a/lib/fog/vsphere/requests/compute/list_networks.rb b/lib/fog/vsphere/requests/compute/list_networks.rb
index eaa7e689..0ca247d1 100644
--- a/lib/fog/vsphere/requests/compute/list_networks.rb
+++ b/lib/fog/vsphere/requests/compute/list_networks.rb
@@ -30,15 +30,17 @@ def list_networks(filters = {})
                 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 @@ def network_attribute_mapping
 
         def network_dvportgroup_attribute_mapping
           network_attribute_mapping.merge(
-            dvp_uuid: 'config.key'
+            id: 'config.key'
           )
         end
 

From 8053fa51f2b328f382d95f4f9c6478bc248c576c Mon Sep 17 00:00:00 2001
From: Chris Roberts <chrobert@redhat.com>
Date: Tue, 20 Jun 2023 14:44:20 -0400
Subject: [PATCH 2/2] Update version to 3.6.1

---
 CHANGELOG.md               | 3 +++
 lib/fog/vsphere/version.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1304d41..214617a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 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)
diff --git a/lib/fog/vsphere/version.rb b/lib/fog/vsphere/version.rb
index ca88796c..f8ec8d91 100644
--- a/lib/fog/vsphere/version.rb
+++ b/lib/fog/vsphere/version.rb
@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '3.6.0'.freeze
+    VERSION = '3.6.1'.freeze
   end
 end