Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Adds host to physical server relationship #14026

Merged
merged 9 commits into from
Mar 24, 2017
Merged

Adds host to physical server relationship #14026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
79fb962
Adds host to physical server relationship
Feb 22, 2017
18dd7d6
Adjusts foreign key relationship between phys and host
Mar 4, 2017
05adb35
Removes show method from hosts controller
Mar 17, 2017
1b116a6
Addresses rubocop warnings from PR
Mar 18, 2017
7da578f
Remove referenced to undefined :enabled attribute
Mar 21, 2017
f0207c2
Modifies the REST response change host to host_id
Mar 21, 2017
838c057
Reverses the relationship of physical servers to hosts
Mar 23, 2017
842fc85
Refactor statement which show relationship in API
walteraa Mar 23, 2017
3c72c7e
Removes custom show method from physical_servers_controller
Mar 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/controllers/api/physical_servers_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module Api
class PhysicalServersController < BaseController
end
end
3 changes: 3 additions & 0 deletions app/models/host.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ class Host < ApplicationRecord
has_many :host_aggregate_hosts, :dependent => :destroy
has_many :host_aggregates, :through => :host_aggregate_hosts

# Physical server reference
belongs_to :physical_server, :inverse_of => :host

serialize :settings, Hash

deprecate_attribute :address, :hostname
Expand Down
2 changes: 2 additions & 0 deletions app/models/physical_server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ class PhysicalServer < ApplicationRecord

belongs_to :ext_management_system, :foreign_key => :ems_id, :class_name => "ManageIQ::Providers::PhysicalInfraManager"

has_one :host, inverse_of => :physical_server

def name_with_details
details % {
:name => name,
Expand Down