Skip to content

Commit 5ced471

Browse files
committed
Merge pull request #9353 from elsamaryv/ivt-server-err-fix-2848
Fixes 500 error occurred during refreshing of a provider instance
2 parents 75d5211 + 30086a6 commit 5ced471

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

app/controllers/application_controller/explorer.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ def x_button
8484

8585
# Process model actions that are currently implemented
8686
if X_BUTTON_ALLOWED_ACTIONS[action] == :s1
87+
# resetting action that was stored during other operations
88+
@sb[:action] = nil if @sb
8789
send(method)
8890
elsif X_BUTTON_ALLOWED_ACTIONS[action] == :s2
8991
# don't need to set params[:id] and do find_checked_items for methods

spec/controllers/vm_cloud_controller_spec.rb

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@
110110
expect(response).to render_template(:partial => 'vm_common/_resize')
111111
end
112112

113+
it 'can open instance refresh tab' do
114+
post :explorer
115+
expect(response.status).to eq(200)
116+
allow(controller).to receive(:x_node).and_return("v-#{vm_openstack.id}")
117+
118+
post :x_button, :params => {:pressed => 'instance_refresh', :id => vm_openstack.id}
119+
expect(response.status).to eq(200)
120+
end
121+
122+
it 'can do instance refresh after its reconfigure' do
123+
post :explorer
124+
expect(response.status).to eq(200)
125+
allow(controller).to receive(:x_node).and_return("v-#{vm_openstack.id}")
126+
127+
post :x_button, :params => {:pressed => 'instance_resize', :id => vm_openstack.id}
128+
expect(response.status).to eq(200)
129+
130+
post :x_button, :params => {:pressed => 'instance_refresh', :id => vm_openstack.id}
131+
expect(response.status).to eq(200)
132+
end
133+
113134
it 'can open instance live migrate tab' do
114135
post :explorer
115136
expect(response.status).to eq(200)

0 commit comments

Comments
 (0)