Skip to content

Commit 22286e1

Browse files
committed
Fix CloudNetwork#delete_cloud_network argument error
The core `CloudNetwork#raw_delete_cloud_network` method takes an optional `options` hash as the first parameter.
1 parent a31f0c8 commit 22286e1

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

app/models/manageiq/providers/openstack/network_manager/cloud_network.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ def self.raw_create_cloud_network(ext_management_system, options)
485485
raise MiqException::MiqNetworkCreateError, parsed_error, e.backtrace
486486
end
487487

488-
def raw_delete_cloud_network
488+
def raw_delete_cloud_network(_options = {})
489489
with_notification(:cloud_network_delete,
490490
:options => {
491491
:subject => self,

spec/models/manageiq/providers/openstack/network_manager/cloud_network_spec.rb

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,30 @@
4545
end
4646

4747
context "#update_cloud_network" do
48+
it "updates the cloud network" do
49+
options = {"name" => "new-name"}
50+
51+
expect(service).to receive(:update_network).with(cloud_network.ems_ref, options)
52+
cloud_network.update_cloud_network(options)
53+
end
54+
4855
it 'catches errors from provider' do
4956
expect(service).to receive(:update_network).and_raise(bad_request)
50-
expect { cloud_network.raw_update_cloud_network({}) }.to raise_error(MiqException::MiqNetworkUpdateError)
57+
expect { cloud_network.update_cloud_network({}) }.to raise_error(MiqException::MiqNetworkUpdateError)
5158
end
5259
end
5360

5461
context "#delete_cloud_network" do
62+
before { NotificationType.seed }
63+
64+
it "deletes the cloud network" do
65+
expect(service).to receive(:delete_network).with(cloud_network.ems_ref)
66+
cloud_network.delete_cloud_network({})
67+
end
68+
5569
it 'catches errors from provider' do
5670
expect(service).to receive(:delete_network).and_raise(bad_request)
57-
expect { cloud_network.raw_delete_cloud_network }.to raise_error(MiqException::MiqNetworkDeleteError)
71+
expect { cloud_network.delete_cloud_network({}) }.to raise_error(MiqException::MiqNetworkDeleteError)
5872
end
5973
end
6074
end

0 commit comments

Comments
 (0)