Fixes #20881 - Clean legacy api from discovery #374
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Issues: #20881 |
lzap
requested changes
Sep 15, 2017
| @@ -180,7 +180,7 @@ def test_reboot_success_legacy | |||
| host = discover_host_from_facts(facts) | |||
| Host::Discovered::any_instance.stubs(:proxied?).returns(false) | |||
| Host::Discovered::any_instance.stubs(:proxy_url).returns("http://1.2.3.4:8443") | |||
| ::ForemanDiscovery::NodeAPI::PowerLegacyDirectService.any_instance.expects(:reboot).returns(true) | |||
| ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(true) | |||
| ActiveSupport::Deprecation.silence do | |||
| post "reboot", { :id => host.id }, set_session_user | |||
| end | |||
There was a problem hiding this comment.
There is also test_reboot_success_legacy test, can you remove that? It is useless I think. Other that that we can merge!
rabajaj0509
force-pushed
the
20881-clean/legacy_api
branch
from
3ec3b83
to
a720a87
Compare
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
lzap
reviewed
Sep 15, 2017
| def legacy_direct_service(data) | ||
| ForemanDiscovery::NodeAPI::PowerLegacyDirectService.new(data) | ||
| end | ||
|
|
||
| def legacy_proxied_service(data) | ||
| ForemanDiscovery::NodeAPI::PowerLegacyProxiedService.new(data) | ||
| end |
There was a problem hiding this comment.
The legacy_proxied_service can go away too, it should be unused.
lzap
reviewed
Sep 15, 2017
| ::ProxyAPI::BMC.new(:url => url).power :action => "cycle" | ||
| end | ||
| end | ||
| end |
There was a problem hiding this comment.
Also remove the legacy_proxied.service.rb file please.
There was a problem hiding this comment.
@lzap good catch, thanks :)
rabajaj0509
force-pushed
the
20881-clean/legacy_api
branch
from
a720a87
to
e89c844
Compare
|
Ok we are good to go once it is all green. |
|
I retriggered failed develop: http://ci.theforeman.org/job/test_plugin_foreman_discovery_develop/324/ |
|
Foreman core fixed so [test] |
|
We can hopefully [test] now. |
rabajaj0509
force-pushed
the
20881-clean/legacy_api
branch
from
e89c844
to
c5357c8
Compare
|
One failure in core is unrelated. Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.