-
Notifications
You must be signed in to change notification settings - Fork 897
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adds host to physical server relationship #14026
Merged
Merged
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
79fb962
Adds host to physical server relationship
18dd7d6
Adjusts foreign key relationship between phys and host
05adb35
Removes show method from hosts controller
1b116a6
Addresses rubocop warnings from PR
7da578f
Remove referenced to undefined :enabled attribute
f0207c2
Modifies the REST response change host to host_id
838c057
Reverses the relationship of physical servers to hosts
842fc85
Refactor statement which show relationship in API
walteraa 3c72c7e
Removes custom show method from physical_servers_controller
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
module Api | ||
class PhysicalServersController < BaseController | ||
def show | ||
if params[:c_id] | ||
physical_server = PhysicalServer.find(params[:c_id]) | ||
response_payload = physical_server.as_json | ||
response_payload['host_id'] = case physical_server.host | ||
when nil then nil | ||
else physical_server.host.id | ||
end | ||
|
||
render :json=> response_payload | ||
else | ||
super | ||
end | ||
end | ||
|
||
def server_ident(server) | ||
"Server instance: #{server.id} name:'#{server.name}'" | ||
end | ||
end | ||
end |
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, @chessbyte had a comment a while ago about this
case
statement.The case statement could be: