Merge pull request ManageIQ#11846 from juliancheal/added_lenovo_provider

Added manageiq-providers-lenovo to Gemfile
mskantar · Feb 14, 2017 · c7040a3 · c7040a3
2 parents 7506b85 + cc0bc09
commit c7040a3
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 3 deletions.
diff --git 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"

diff --git a/config/permissions.tmpl.yml b/config/permissions.tmpl.yml
@@ -31,13 +31,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:rhevm
 - ems-type:scvmm
 - ems-type:swift

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
@@ -0,0 +1,4 @@
+module MiqAeMethodService
+  class MiqAeServiceEmsPhysicalInfra < MiqAeServiceExtManagementSystem
+  end
+end
diff --git a/..._engine/service_models/miq_ae_service_manageiq-providers-lenovo-physical_infra_manager.rb b/..._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/...miq_automation_engine/service_models/miq_ae_service_manageiq-providers-lenovo-provider.rb b/...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
diff --git a/...omation_engine/service_models/miq_ae_service_manageiq-providers-physical_infra_manager.rb b/...omation_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
@@ -115,7 +115,6 @@ module MiqAeServiceSpec
           Category
           Datacenter
           ManageIQ::Providers::BaseManager
-          ManageIQ::Providers::PhysicalInfraManager
           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
@@ -38,7 +38,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_ph_infra"             => "Lenovo XClarity",
       "nuage_network"               => "Nuage Network Manager",
       "rhevm"                       => "Red Hat Virtualization Manager",
       "scvmm"                       => "Microsoft System Center VMM",