Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove references to host provisioning #188

Merged
merged 1 commit into from
Jul 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ class MiqAeBuiltinMethod
orchestration_stack
miq_request
miq_provision
miq_host_provision
vm_migrate_task
vm_retire_task
service_retire_task
Expand Down Expand Up @@ -68,7 +67,6 @@ def self.miq_parse_automation_request(obj, _inputs)
when 'vm_retire' then %w(VM Lifecycle Retirement)
when 'vm_migrate' then %w(VM Lifecycle Migrate)
when 'service_retire' then %w(Service Lifecycle Retirement)
when 'host_provision' then %w(Host Lifecycle Provisioning)
when 'configured_system_provision'
obj.workspace.root['ae_provider_category'] = 'infrastructure'
%w(Configured_System Lifecycle Provisioning)
Expand Down Expand Up @@ -181,8 +179,6 @@ def self.detect_category(obj_name, prov_obj)
case obj_name
when "orchestration_stack"
CLOUD
when "miq_host_provision"
INFRASTRUCTURE
when "miq_request", "miq_provision", "vm_migrate_task", "vm_retire_task"
vm_detect_category(prov_obj.source) if prov_obj
when "service_retire_task"
Expand Down Expand Up @@ -221,8 +217,6 @@ def self.detect_vendor(src_obj, attr)
case attr
when "orchestration_stack"
src_obj.ext_management_system.try(:provider_name)
when "miq_host_provision"
"vmware"
when "miq_request", "miq_provision", "vm_migrate_task"
src_obj.source.try(:provider_name)
when "vm"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ class MiqAeObject
# Default conversion for Service Models
SM_LOOKUP = Hash.new { |_, k| k.classify }.merge(
'ems' => 'ExtManagementSystem',
'host_provision' => 'MiqHostProvision',
'host_provision_request' => 'MiqHostProvisionRequest',
'policy' => 'MiqPolicy',
'provision' => 'MiqProvision',
'provision_request' => 'MiqProvisionRequest',
Expand Down

This file was deleted.

This file was deleted.

10 changes: 5 additions & 5 deletions spec/miq_ae_engine_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,9 @@ def call_automate(obj_type, obj_id)
expect(MiqAeEngine.create_automation_attribute_key(host)).to eq("Host::host")
end

it "with a MiqRequest" do
host = FactoryGirl.create(:miq_host_provision_request)
expect(MiqAeEngine.create_automation_attribute_key(host)).to eq("MiqHostProvisionRequest::miq_host_provision_request")
it "with a MiqRequest" do
prov_request = FactoryGirl.create(:miq_provision_request)
expect(MiqAeEngine.create_automation_attribute_key(prov_request)).to eq("MiqProvisionRequest::miq_provision_request")
end

it "with an EmsCluster" do
Expand Down Expand Up @@ -345,8 +345,8 @@ def call_automate(obj_type, obj_id)
end

it "with an MiqRequest" do
host = FactoryGirl.create(:miq_host_provision_request)
expect(MiqAeEngine.create_automation_attribute_class_name(host)).to eq("MiqHostProvisionRequest")
host = FactoryGirl.create(:miq_provision_request)
expect(MiqAeEngine.create_automation_attribute_class_name(host)).to eq("MiqProvisionRequest")
end
end

Expand Down

This file was deleted.

67 changes: 0 additions & 67 deletions spec/service_models/miq_ae_service_miq_host_provision_spec.rb

This file was deleted.