From cb91bb4c0a8651f9d22b5a32b6317e66c5e88322 Mon Sep 17 00:00:00 2001 From: nasark Date: Fri, 2 Sep 2022 17:29:50 -0400 Subject: [PATCH] refactor provider cloud network factories --- spec/factories/cloud_network.rb | 24 ------------------------ spec/factories/ext_management_system.rb | 7 ------- 2 files changed, 31 deletions(-) diff --git a/spec/factories/cloud_network.rb b/spec/factories/cloud_network.rb index c981e92490e..81b2832b160 100644 --- a/spec/factories/cloud_network.rb +++ b/spec/factories/cloud_network.rb @@ -3,28 +3,4 @@ sequence(:name) { |n| "cloud_network_#{seq_padded_for_sorting(n)}" } sequence(:ems_ref) { |n| "ems_ref_#{seq_padded_for_sorting(n)}" } end - - factory :cloud_network_openstack, :class => "ManageIQ::Providers::Openstack::NetworkManager::CloudNetwork", - :parent => :cloud_network - factory :cloud_network_private_openstack, - :class => "ManageIQ::Providers::Openstack::NetworkManager::CloudNetwork::Private", - :parent => :cloud_network_openstack - factory :cloud_network_public_openstack, - :class => "ManageIQ::Providers::Openstack::NetworkManager::CloudNetwork::Public", - :parent => :cloud_network_openstack - factory :cloud_network_amazon, :class => "ManageIQ::Providers::Amazon::NetworkManager::CloudNetwork", - :parent => :cloud_network - factory :cloud_network_azure, :class => "ManageIQ::Providers::Azure::NetworkManager::CloudNetwork", - :parent => :cloud_network - factory :cloud_network_google, :class => "ManageIQ::Providers::Google::NetworkManager::CloudNetwork", - :parent => :cloud_network - factory :cloud_network_vmware_vdc, - :class => "ManageIQ::Providers::Vmware::NetworkManager::CloudNetwork::OrgVdcNet", - :parent => :cloud_network - factory :cloud_network_vmware_vapp, - :class => "ManageIQ::Providers::Vmware::NetworkManager::CloudNetwork::VappNet", - :parent => :cloud_network - factory :cloud_network_nsxt, - :class => "ManageIQ::Providers::Nsxt::NetworkManager::CloudNetwork", - :parent => :cloud_network end diff --git a/spec/factories/ext_management_system.rb b/spec/factories/ext_management_system.rb index e49de2916f4..5c33637238d 100644 --- a/spec/factories/ext_management_system.rb +++ b/spec/factories/ext_management_system.rb @@ -287,13 +287,6 @@ authtype { "default" } end - factory :ems_amazon_with_cloud_networks, - :parent => :ems_amazon do - after(:create) do |x| - 2.times { x.cloud_networks << FactoryBot.create(:cloud_network_amazon) } - end - end - factory :ems_azure, :aliases => ["manageiq/providers/azure/cloud_manager"], :class => "ManageIQ::Providers::Azure::CloudManager",