Add Distributed and Host VirtualSwitch models

Add models for distributed and host virtual switches and set them in the refresh parser.
agrare · Mar 16, 2018 · 8aa7ce5 · 8aa7ce5
1 parent 7fb98b7
commit 8aa7ce5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/app/models/manageiq/providers/vmware/infra_manager.rb b/app/models/manageiq/providers/vmware/infra_manager.rb
@@ -1,5 +1,6 @@
 module ManageIQ::Providers
   class Vmware::InfraManager < InfraManager
+    require_nested :DistributedVirtualSwitch
     require_nested :EventCatcher
     require_nested :EventParser
     require_nested :RefreshWorker
@@ -9,6 +10,7 @@ class Vmware::InfraManager < InfraManager
     require_nested :Refresher
     require_nested :Host
     require_nested :HostEsx
+    require_nested :HostVirtualSwitch
     require_nested :Inventory
     require_nested :Provision
     require_nested :ProvisionViaPxe

diff --git a/app/models/manageiq/providers/vmware/infra_manager/distributed_virtual_switch.rb b/app/models/manageiq/providers/vmware/infra_manager/distributed_virtual_switch.rb
@@ -0,0 +1,2 @@
+class ManageIQ::Providers::Vmware::InfraManager::DistributedVirtualSwitch < Switch
+end
diff --git a/app/models/manageiq/providers/vmware/infra_manager/host_virtual_switch.rb b/app/models/manageiq/providers/vmware/infra_manager/host_virtual_switch.rb
@@ -0,0 +1,2 @@
+class ManageIQ::Providers::Vmware::InfraManager::HostVirtualSwitch < Switch
+end
diff --git a/app/models/manageiq/providers/vmware/infra_manager/refresh_parser.rb b/app/models/manageiq/providers/vmware/infra_manager/refresh_parser.rb
@@ -431,6 +431,7 @@ def self.host_inv_to_switch_hashes(inv, dvswitch_inv, dvswitch_uid_ems)
             :uid_ems           => uid,
             :name              => name,
             :ports             => data['numPorts'],
+            :type              => self.parent::HostVirtualSwitch.name,
 
             :allow_promiscuous => security_policy['allowPromiscuous'].nil? ? nil : security_policy['allowPromiscuous'].to_s.downcase == 'true',
             :forged_transmits  => security_policy['forgedTransmits'].nil? ? nil : security_policy['forgedTransmits'].to_s.downcase == 'true',
@@ -458,6 +459,7 @@ def self.host_inv_to_switch_hashes(inv, dvswitch_inv, dvswitch_uid_ems)
             :uid_ems           => uid,
             :name              => URI.decode(name),
             :ports             => config['numPorts'] || 0,
+            :type              => self.parent::DistributedVirtualSwitch.name,
 
             :allow_promiscuous => allow_promiscuous.nil? ? nil : allow_promiscuous.to_s.casecmp('true') == 0,
             :forged_transmits  => forged_transmits.nil? ? nil : forged_transmits.to_s.casecmp('true') == 0,

diff --git a/spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb b/spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb
@@ -491,6 +491,7 @@ def assert_specific_host
       :uid_ems           => 'dvs-119',
       :name              => 'DC1_DVS',
       :ports             => 26,
+      :type              => 'ManageIQ::Providers::Vmware::InfraManager::DistributedVirtualSwitch',
       :allow_promiscuous => nil,
       :forged_transmits  => nil,
       :mac_changes       => nil,
@@ -525,6 +526,7 @@ def assert_specific_host
       :uid_ems           => "vSwitch0",
       :name              => "vSwitch0",
       :ports             => 128,
+      :type              => 'ManageIQ::Providers::Vmware::InfraManager::HostVirtualSwitch',
       :allow_promiscuous => false,
       :forged_transmits  => true,
       :mac_changes       => true,