Advertisement
Guest User

Untitled

a guest
Sep 21st, 2017
85
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.82 KB | None | 0 0
  1. diff --git a/app/models/manageiq/providers/openstack/cloud_manager/template.rb b/app/models/manageiq/providers/openstack/cloud_manager/template.rb
  2. index 0a73a8f..f203c50 100644
  3. --- a/app/models/manageiq/providers/openstack/cloud_manager/template.rb
  4. +++ b/app/models/manageiq/providers/openstack/cloud_manager/template.rb
  5. @@ -75,7 +75,7 @@ class ManageIQ::Providers::Openstack::CloudManager::Template < ManageIQ::Provide
  6.  
  7. def self.raw_create_image(ext_management_system, create_options)
  8. ext_management_system.with_provider_connection(:service => 'Compute') do |service|
  9. - service.images.create(create_options)
  10. + service.create_image(create_options)
  11. end
  12. rescue => err
  13. _log.error("image=[#{name}], error=[#{err}]")
  14. diff --git a/spec/models/manageiq/providers/openstack/cloud_manager/template_spec.rb b/spec/models/manageiq/providers/openstack/cloud_manager/template_spec.rb
  15. index 8aba7a4..29a4ee2 100644
  16. --- a/spec/models/manageiq/providers/openstack/cloud_manager/template_spec.rb
  17. +++ b/spec/models/manageiq/providers/openstack/cloud_manager/template_spec.rb
  18. @@ -6,21 +6,21 @@ describe ManageIQ::Providers::Openstack::CloudManager::Template do
  19.  
  20. context 'when create_image' do
  21. before do
  22. - allow(ExtManagementSystem).to receive(:find).with(ems.id).and_return(ems)
  23. +# allow(ExtManagementSystem).to receive(:find).with(ems.id).and_return(ems)
  24. allow(ems).to receive(:with_provider_connection).with(:service => 'Compute').and_yield(service)
  25. - allow(service).to receive(:images).and_return(images)
  26. +# allow(service).to receive(:images)
  27. end
  28.  
  29. - let(:images) { double }
  30. +# let(:images) { double }
  31.  
  32. context 'with correct data' do
  33. it 'should create image' do
  34. - expect(images).to receive(:create).with(image_attributes).and_return(template_openstack).once
  35. + expect(service).to receive(:create_image).with(image_attributes).once
  36. subject.class.create_image(ems, image_attributes)
  37. end
  38.  
  39. it 'should not raise error' do
  40. - allow(images).to receive(:create).with(image_attributes).and_return(template_openstack).once
  41. + allow(service).to receive(:create_image).with(image_attributes).once
  42. expect do
  43. subject.class.create_image(ems, image_attributes)
  44. end.not_to raise_error
  45. @@ -30,7 +30,7 @@ describe ManageIQ::Providers::Openstack::CloudManager::Template do
  46. context 'with incorrect data' do
  47. [Excon::Error::BadRequest, ArgumentError].map do |error|
  48. it "should raise error when #{error}" do
  49. - allow(images).to receive(:create).with(image_attributes).and_raise(error)
  50. + allow(service).to receive(:create_image).with(image_attributes).and_raise(error)
  51. expect do
  52. subject.class.create_image(ems, image_attributes)
  53. end.to raise_error(MiqException::MiqOpenstackApiRequestError)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement