From 59ebfa017223cf849fcb53d04f04dbfb561313ac Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Tue, 11 Oct 2016 16:08:58 -0400 Subject: [PATCH 01/11] Added manageiq-providers-lenovo to Gemfile Now we have Physical Infra Managers, adding our first Provider Lenovo --- Gemfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 64966d06773..16e938d9ae0 100644 --- a/Gemfile +++ b/Gemfile @@ -29,6 +29,10 @@ unless dependencies.detect { |d| d.name == "manageiq-ui-classic" } gem "manageiq-ui-classic", :git => "https://github.com/ManageIQ/manageiq-ui-classic", :branch => "master" end +unless dependencies.detect { |d| d.name == "manageiq-providers-lenovo" } + gem "manageiq-providers-lenovo", :git => "https://github.com/ManageIQ/manageiq-providers-lenovo", :branch => "master" +end + # Unmodified gems gem "activerecord-session_store", "~>1.0.0" gem "acts_as_list", "~>0.7.2" From f4efdb438ee28b8bfd642d54ee02c5fa5ae80e27 Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Sat, 15 Oct 2016 16:09:28 -0400 Subject: [PATCH 02/11] Added Lenovo XClarity to required test files - ext_management_systems types & descriptions hash - permissions.tmpl.yml --- config/permissions.tmpl.yml | 1 + spec/models/ext_management_system_spec.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/permissions.tmpl.yml b/config/permissions.tmpl.yml index a6696685e09..eed5d619d37 100644 --- a/config/permissions.tmpl.yml +++ b/config/permissions.tmpl.yml @@ -36,6 +36,7 @@ - ems-type:openstack_infra - ems-type:openstack_network - ems-type:physical_infra_manager +- ems-type:lenovo_ph_infra - ems-type:rhevm - ems-type:scvmm - ems-type:swift diff --git a/spec/models/ext_management_system_spec.rb b/spec/models/ext_management_system_spec.rb index d3f47e44d5f..a27f0bdb43d 100644 --- a/spec/models/ext_management_system_spec.rb +++ b/spec/models/ext_management_system_spec.rb @@ -37,7 +37,8 @@ "openstack" => "OpenStack", "openstack_infra" => "OpenStack Platform Director", "openstack_network" => "OpenStack Network", - "physical_infra_manager" => "PhysicalInfraManager", # TODO: (julian) remove once we have a physical_infra_manager implementation + "physical_infra_manager" => "PhysicalInfraManager", # TODO: (Julian) Do we still need this? Test fails without it :( + "lenovo_ph_infra" => "Lenovo XClarity", "nuage_network" => "Nuage Network Manager", "rhevm" => "Red Hat Virtualization Manager", "scvmm" => "Microsoft System Center VMM", From 1b4e1e350bfe68714eff4217d849904d6d8fbf20 Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Sat, 15 Oct 2016 18:56:32 -0400 Subject: [PATCH 03/11] Added exception for Lenovo As it is tested externally same as Amazon --- spec/models/ext_management_system_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/models/ext_management_system_spec.rb b/spec/models/ext_management_system_spec.rb index a27f0bdb43d..d3f47e44d5f 100644 --- a/spec/models/ext_management_system_spec.rb +++ b/spec/models/ext_management_system_spec.rb @@ -37,8 +37,7 @@ "openstack" => "OpenStack", "openstack_infra" => "OpenStack Platform Director", "openstack_network" => "OpenStack Network", - "physical_infra_manager" => "PhysicalInfraManager", # TODO: (Julian) Do we still need this? Test fails without it :( - "lenovo_ph_infra" => "Lenovo XClarity", + "physical_infra_manager" => "PhysicalInfraManager", # TODO: (julian) remove once we have a physical_infra_manager implementation "nuage_network" => "Nuage Network Manager", "rhevm" => "Red Hat Virtualization Manager", "scvmm" => "Microsoft System Center VMM", From 7f93bb786a7050c234fccd0ff594c1abac3f79c5 Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Mon, 17 Oct 2016 05:44:38 -0400 Subject: [PATCH 04/11] Removing references to physical_infra Need to check that this is correct, as am passing tests, but doesn't seem other providers are doing it like this. --- spec/lib/miq_automation_engine/miq_ae_service_spec.rb | 2 ++ spec/models/ext_management_system_spec.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/lib/miq_automation_engine/miq_ae_service_spec.rb b/spec/lib/miq_automation_engine/miq_ae_service_spec.rb index a9d23dbad69..f2f8759cf43 100644 --- a/spec/lib/miq_automation_engine/miq_ae_service_spec.rb +++ b/spec/lib/miq_automation_engine/miq_ae_service_spec.rb @@ -116,6 +116,8 @@ module MiqAeServiceSpec Datacenter ManageIQ::Providers::BaseManager ManageIQ::Providers::PhysicalInfraManager + ManageIQ::Providers::Lenovo::PhysicalInfraManager + ManageIQ::Providers::Lenovo::Provider ManageIQ::Providers::Kubernetes::ContainerManager::Scanning::Job VmServer VmSynchronize diff --git a/spec/models/ext_management_system_spec.rb b/spec/models/ext_management_system_spec.rb index d3f47e44d5f..850695f9bec 100644 --- a/spec/models/ext_management_system_spec.rb +++ b/spec/models/ext_management_system_spec.rb @@ -37,7 +37,7 @@ "openstack" => "OpenStack", "openstack_infra" => "OpenStack Platform Director", "openstack_network" => "OpenStack Network", - "physical_infra_manager" => "PhysicalInfraManager", # TODO: (julian) remove once we have a physical_infra_manager implementation + "lenovo_physical_infra_manager" => "Lenovo Physical Infra Manager", "nuage_network" => "Nuage Network Manager", "rhevm" => "Red Hat Virtualization Manager", "scvmm" => "Microsoft System Center VMM", From f29e19366f5225fa4395988860a0e89ab155bb7c Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Wed, 2 Nov 2016 16:43:58 +0000 Subject: [PATCH 05/11] Added Lenovo Physical Infra string to permissions.tmple.yml --- config/permissions.tmpl.yml | 2 +- spec/models/ext_management_system_spec.rb | 54 +++++++++++------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/config/permissions.tmpl.yml b/config/permissions.tmpl.yml index eed5d619d37..a1e4b15fdd4 100644 --- a/config/permissions.tmpl.yml +++ b/config/permissions.tmpl.yml @@ -36,7 +36,7 @@ - ems-type:openstack_infra - ems-type:openstack_network - ems-type:physical_infra_manager -- ems-type:lenovo_ph_infra +- ems-type:lenovo_xclarity - ems-type:rhevm - ems-type:scvmm - ems-type:swift diff --git a/spec/models/ext_management_system_spec.rb b/spec/models/ext_management_system_spec.rb index 850695f9bec..99f3614ba25 100644 --- a/spec/models/ext_management_system_spec.rb +++ b/spec/models/ext_management_system_spec.rb @@ -18,34 +18,34 @@ let(:all_types_and_descriptions) do { - "ansible_tower_configuration" => "Ansible Tower Configuration", - "azure" => "Azure", - "azure_network" => "Azure Network", - "ec2" => "Amazon EC2", - "ec2_network" => "Amazon EC2 Network", - "ec2_ebs_storage" => "Amazon EBS", - "s3" => "Amazon S3", - "foreman_configuration" => "Foreman Configuration", - "foreman_provisioning" => "Foreman Provisioning", - "gce" => "Google Compute Engine", - "gce_network" => "Google Network", - "hawkular" => "Hawkular", - "hawkular_datawarehouse" => "Hawkular Datawarehouse", - "kubernetes" => "Kubernetes", - "openshift" => "OpenShift Origin", - "openshift_enterprise" => "OpenShift Container Platform", - "openstack" => "OpenStack", - "openstack_infra" => "OpenStack Platform Director", - "openstack_network" => "OpenStack Network", + "ansible_tower_configuration" => "Ansible Tower Configuration", + "azure" => "Azure", + "azure_network" => "Azure Network", + "ec2" => "Amazon EC2", + "ec2_network" => "Amazon EC2 Network", + "ec2_ebs_storage" => "Amazon EBS", + "s3" => "Amazon S3", + "foreman_configuration" => "Foreman Configuration", + "foreman_provisioning" => "Foreman Provisioning", + "gce" => "Google Compute Engine", + "gce_network" => "Google Network", + "hawkular" => "Hawkular", + "hawkular_datawarehouse" => "Hawkular Datawarehouse", + "kubernetes" => "Kubernetes", + "openshift" => "OpenShift Origin", + "openshift_enterprise" => "OpenShift Container Platform", + "openstack" => "OpenStack", + "openstack_infra" => "OpenStack Platform Director", + "openstack_network" => "OpenStack Network", "lenovo_physical_infra_manager" => "Lenovo Physical Infra Manager", - "nuage_network" => "Nuage Network Manager", - "rhevm" => "Red Hat Virtualization Manager", - "scvmm" => "Microsoft System Center VMM", - "vmwarews" => "VMware vCenter", - "vmware_cloud" => "VMware vCloud", - "vmware_cloud_network" => "VMware Cloud Network", - "cinder" => "Cinder ", - "swift" => "Swift ", + "nuage_network" => "Nuage Network Manager", + "rhevm" => "Red Hat Virtualization Manager", + "scvmm" => "Microsoft System Center VMM", + "vmwarews" => "VMware vCenter", + "vmware_cloud" => "VMware vCloud", + "vmware_cloud_network" => "VMware Cloud Network", + "cinder" => "Cinder ", + "swift" => "Swift ", } end From 74449e2dd1017c2e250812c90addb92c5fa421b2 Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Thu, 26 Jan 2017 01:29:09 +0000 Subject: [PATCH 06/11] Fixing specs --- spec/models/ext_management_system_spec.rb | 56 +++++++++++------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/spec/models/ext_management_system_spec.rb b/spec/models/ext_management_system_spec.rb index 99f3614ba25..85ec1dc4d53 100644 --- a/spec/models/ext_management_system_spec.rb +++ b/spec/models/ext_management_system_spec.rb @@ -18,34 +18,34 @@ let(:all_types_and_descriptions) do { - "ansible_tower_configuration" => "Ansible Tower Configuration", - "azure" => "Azure", - "azure_network" => "Azure Network", - "ec2" => "Amazon EC2", - "ec2_network" => "Amazon EC2 Network", - "ec2_ebs_storage" => "Amazon EBS", - "s3" => "Amazon S3", - "foreman_configuration" => "Foreman Configuration", - "foreman_provisioning" => "Foreman Provisioning", - "gce" => "Google Compute Engine", - "gce_network" => "Google Network", - "hawkular" => "Hawkular", - "hawkular_datawarehouse" => "Hawkular Datawarehouse", - "kubernetes" => "Kubernetes", - "openshift" => "OpenShift Origin", - "openshift_enterprise" => "OpenShift Container Platform", - "openstack" => "OpenStack", - "openstack_infra" => "OpenStack Platform Director", - "openstack_network" => "OpenStack Network", - "lenovo_physical_infra_manager" => "Lenovo Physical Infra Manager", - "nuage_network" => "Nuage Network Manager", - "rhevm" => "Red Hat Virtualization Manager", - "scvmm" => "Microsoft System Center VMM", - "vmwarews" => "VMware vCenter", - "vmware_cloud" => "VMware vCloud", - "vmware_cloud_network" => "VMware Cloud Network", - "cinder" => "Cinder ", - "swift" => "Swift ", + "ansible_tower_configuration" => "Ansible Tower Configuration", + "azure" => "Azure", + "azure_network" => "Azure Network", + "ec2" => "Amazon EC2", + "ec2_network" => "Amazon EC2 Network", + "ec2_ebs_storage" => "Amazon EBS", + "s3" => "Amazon S3", + "foreman_configuration" => "Foreman Configuration", + "foreman_provisioning" => "Foreman Provisioning", + "gce" => "Google Compute Engine", + "gce_network" => "Google Network", + "hawkular" => "Hawkular", + "hawkular_datawarehouse" => "Hawkular Datawarehouse", + "kubernetes" => "Kubernetes", + "openshift" => "OpenShift Origin", + "openshift_enterprise" => "OpenShift Container Platform", + "openstack" => "OpenStack", + "openstack_infra" => "OpenStack Platform Director", + "openstack_network" => "OpenStack Network", + "lenovo_ph_infra" => "Lenovo XClarity", + "nuage_network" => "Nuage Network Manager", + "rhevm" => "Red Hat Virtualization Manager", + "scvmm" => "Microsoft System Center VMM", + "vmwarews" => "VMware vCenter", + "vmware_cloud" => "VMware vCloud", + "vmware_cloud_network" => "VMware Cloud Network", + "cinder" => "Cinder ", + "swift" => "Swift ", } end From f5f6a2e31cad4d7ec236d0e7c2e7104e7c26012a Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Thu, 26 Jan 2017 03:03:32 +0000 Subject: [PATCH 07/11] Added Lenvo Physical Infra to list of EMS permissions --- config/permissions.tmpl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/permissions.tmpl.yml b/config/permissions.tmpl.yml index a1e4b15fdd4..eed5d619d37 100644 --- a/config/permissions.tmpl.yml +++ b/config/permissions.tmpl.yml @@ -36,7 +36,7 @@ - ems-type:openstack_infra - ems-type:openstack_network - ems-type:physical_infra_manager -- ems-type:lenovo_xclarity +- ems-type:lenovo_ph_infra - ems-type:rhevm - ems-type:scvmm - ems-type:swift From 1252096e75013841c2002af7054beea86964a310 Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Fri, 27 Jan 2017 14:46:19 +0000 Subject: [PATCH 08/11] Removed physical infra line as no longer needed. File is alphabetical, so moved Lenvo to the L section. --- config/permissions.tmpl.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/permissions.tmpl.yml b/config/permissions.tmpl.yml index eed5d619d37..9ac5a712bb9 100644 --- a/config/permissions.tmpl.yml +++ b/config/permissions.tmpl.yml @@ -29,14 +29,13 @@ - ems-type:hawkular - ems-type:hawkular_datawarehouse - ems-type:kubernetes +- ems-type:lenovo_ph_infra - ems-type:nuage_network - ems-type:openshift - ems-type:openshift_enterprise - ems-type:openstack - ems-type:openstack_infra - ems-type:openstack_network -- ems-type:physical_infra_manager -- ems-type:lenovo_ph_infra - ems-type:rhevm - ems-type:scvmm - ems-type:swift From e3ccdbc7a3a174807173c995b4d3ec66ab825a66 Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Fri, 10 Feb 2017 13:59:53 +0000 Subject: [PATCH 09/11] Intial addition of PhysicalInfra to Automation --- .../service_models/miq_ae_service_ems_physical_infra.rb | 4 ++++ ...iq_ae_service_manageiq-providers-physical_infra_manager.rb | 4 ++++ spec/lib/miq_automation_engine/miq_ae_service_spec.rb | 3 --- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 lib/miq_automation_engine/service_models/miq_ae_service_ems_physical_infra.rb create mode 100644 lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-physical_infra_manager.rb diff --git a/lib/miq_automation_engine/service_models/miq_ae_service_ems_physical_infra.rb b/lib/miq_automation_engine/service_models/miq_ae_service_ems_physical_infra.rb new file mode 100644 index 00000000000..b7fd3a78e8a --- /dev/null +++ b/lib/miq_automation_engine/service_models/miq_ae_service_ems_physical_infra.rb @@ -0,0 +1,4 @@ +module MiqAeMethodService + class MiqAeServiceEmsPhysicalInfra < MiqAeServiceExtManagementSystem + end +end diff --git a/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-physical_infra_manager.rb b/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-physical_infra_manager.rb new file mode 100644 index 00000000000..20d1d9d8cec --- /dev/null +++ b/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-physical_infra_manager.rb @@ -0,0 +1,4 @@ +module MiqAeMethodService + class MiqAeServiceManageIQ_Providers_PhysicalInfraManager < MiqAeServiceManageIQ_Providers_BaseManager + end +end diff --git a/spec/lib/miq_automation_engine/miq_ae_service_spec.rb b/spec/lib/miq_automation_engine/miq_ae_service_spec.rb index f2f8759cf43..faf7f7a13ef 100644 --- a/spec/lib/miq_automation_engine/miq_ae_service_spec.rb +++ b/spec/lib/miq_automation_engine/miq_ae_service_spec.rb @@ -115,9 +115,6 @@ module MiqAeServiceSpec Category Datacenter ManageIQ::Providers::BaseManager - ManageIQ::Providers::PhysicalInfraManager - ManageIQ::Providers::Lenovo::PhysicalInfraManager - ManageIQ::Providers::Lenovo::Provider ManageIQ::Providers::Kubernetes::ContainerManager::Scanning::Job VmServer VmSynchronize From 42d922965faf1b91dec389ae2d1ecca6ad35c637 Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Tue, 14 Feb 2017 01:11:27 +0000 Subject: [PATCH 10/11] Added missing alias for Physical Infra --- app/models/aliases/ems_physical_infra.rb | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/models/aliases/ems_physical_infra.rb diff --git a/app/models/aliases/ems_physical_infra.rb b/app/models/aliases/ems_physical_infra.rb new file mode 100644 index 00000000000..3f66c0403ff --- /dev/null +++ b/app/models/aliases/ems_physical_infra.rb @@ -0,0 +1 @@ +::EmsPhysicalInfra = ::ManageIQ::Providers::PhysicalInfraManager From cc0bc091fdc5f16b4f705b385514ec09148acbed Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Tue, 14 Feb 2017 01:17:28 +0000 Subject: [PATCH 11/11] Added missing Lenovo service models --- ...rvice_manageiq-providers-lenovo-physical_infra_manager.rb | 4 ++++ .../miq_ae_service_manageiq-providers-lenovo-provider.rb | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-lenovo-physical_infra_manager.rb create mode 100644 lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-lenovo-provider.rb diff --git a/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-lenovo-physical_infra_manager.rb b/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-lenovo-physical_infra_manager.rb new file mode 100644 index 00000000000..03d97bc8123 --- /dev/null +++ b/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-lenovo-physical_infra_manager.rb @@ -0,0 +1,4 @@ +module MiqAeMethodService + class MiqAeServiceManageIQ_Providers_Lenovo_PhysicalInfraManager < MiqAeServiceEmsPhysicalInfra + end +end diff --git a/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-lenovo-provider.rb b/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-lenovo-provider.rb new file mode 100644 index 00000000000..dd9a86c32d2 --- /dev/null +++ b/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-lenovo-provider.rb @@ -0,0 +1,5 @@ +module MiqAeMethodService + class MiqAeServiceManageIQ_Providers_Lenovo_Provider < MiqAeServiceProvider + expose :physical_infra_ems, :association => true + end +end