From 13d9967f5f226fbb85476090cd29f64c2c809b03 Mon Sep 17 00:00:00 2001 From: Greg McCullough Date: Mon, 12 Jun 2017 09:47:16 -0400 Subject: [PATCH] Merge pull request #126 from fdupont-redhat/master Update method order_ansible_playbook.rb to match the move of create_service_provision_request (cherry picked from commit ea938de7fdb0aa09ecbf735356431ba491700e47) https://bugzilla.redhat.com/show_bug.cgi?id=1461144 --- .../System/Request.class/__methods__/order_ansible_playbook.rb | 2 +- .../Request.class/__methods__/order_ansible_playbook_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/automate/ManageIQ/System/Request.class/__methods__/order_ansible_playbook.rb b/content/automate/ManageIQ/System/Request.class/__methods__/order_ansible_playbook.rb index 9c44cecf9..790558922 100644 --- a/content/automate/ManageIQ/System/Request.class/__methods__/order_ansible_playbook.rb +++ b/content/automate/ManageIQ/System/Request.class/__methods__/order_ansible_playbook.rb @@ -16,7 +16,7 @@ def initialize(handle = $evm) end def main - request = @handle.create_service_provision_request( + request = @handle.execute('create_service_provision_request', service_template, extra_vars.merge(:credential => machine_credential, :hosts => hosts) ) diff --git a/spec/content/automate/ManageIQ/System/Request.class/__methods__/order_ansible_playbook_spec.rb b/spec/content/automate/ManageIQ/System/Request.class/__methods__/order_ansible_playbook_spec.rb index 2d9cfdbb4..0c805b1bf 100644 --- a/spec/content/automate/ManageIQ/System/Request.class/__methods__/order_ansible_playbook_spec.rb +++ b/spec/content/automate/ManageIQ/System/Request.class/__methods__/order_ansible_playbook_spec.rb @@ -35,7 +35,7 @@ allow(ae_service).to receive(:vmdb).with('ServiceTemplate').and_return(svc_vmdb_handle) allow(svc_vmdb_handle).to receive(:where).with(:name => svc_template.name).and_return([svc_service_template]) allow(svc_vm).to receive(:ipaddresses).and_return([ip1]) - expect(ae_service).to receive(:create_service_provision_request).with(svc_service_template, extra_vars).and_return(svc_miq_request) + expect(ae_service).to receive(:execute).with('create_service_provision_request', svc_service_template, extra_vars).and_return(svc_miq_request) described_class.new(ae_service).main end