Skip to content

Commit

Permalink
Fixes #5768 Changed term system to content-host
Browse files Browse the repository at this point in the history
  • Loading branch information
cfouant committed May 22, 2014
1 parent 523f369 commit e946140
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions app/controllers/katello/api/v2/systems_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ def organization_id_keys
api :GET, "/organizations/:organization_id/systems", N_("List systems in an organization")
api :GET, "/environments/:environment_id/systems", N_("List systems in environment")
api :GET, "/host_collections/:host_collection_id/systems", N_("List systems in a host collection")
param :name, String, :desc => N_("Filter systems by name")
param :pool_id, String, :desc => N_("Filter systems by subscribed pool")
param :uuid, String, :desc => N_("Filter systems by uuid")
param :name, String, :desc => N_("Filter content host by name")
param :pool_id, String, :desc => N_("Filter content host by subscribed pool")
param :uuid, String, :desc => N_("Filter content host by uuid")
param :organization_id, :number, :desc => N_("Specify the organization"), :required => true
param :environment_id, String, :desc => N_("Filter by environment")
param :host_collection_id, String, :desc => N_("Filter by host collection")
Expand Down Expand Up @@ -88,7 +88,7 @@ def index
respond_for_index(:collection => item_search(System, params, options))
end

api :POST, "/systems", N_("Register a system")
api :POST, "/systems", N_("Register a content host")
api :POST, "/environments/:environment_id/systems", N_("Register a system in environment")
api :POST, "/host_collections/:host_collection_id/systems", N_("Register a system in environment")
param :name, String, :desc => N_("Name of the system"), :required => true, :action_aware => true
Expand All @@ -115,8 +115,8 @@ def create
respond_for_create
end

api :PUT, "/systems/:id", N_("Update system information")
param :id, String, :desc => N_("UUID of the system"), :required => true
api :PUT, "/systems/:id", N_("Update content host information")
param :id, String, :desc => N_("UUID of the Content Host"), :required => true
param :name, String, :desc => N_("Name of the system"), :required => true, :action_aware => true
param :description, String, :desc => N_("Description of the system")
param :location, String, :desc => N_("Physical location of the system")
Expand All @@ -138,7 +138,7 @@ def update
end

api :GET, "/systems/:id", N_("Show a system")
param :id, String, :desc => N_("UUID of the system"), :required => true
param :id, String, :desc => N_("UUID of the Content Host"), :required => true
def show
@host_collections = @system.host_collections
@custom_info = @system.custom_info
Expand All @@ -162,14 +162,14 @@ def available_host_collections
end

api :DELETE, "/systems/:id", N_("Unregister a system")
param :id, String, :desc => N_("UUID of the system"), :required => true
param :id, String, :desc => N_("UUID of the Content Host"), :required => true
def destroy
@system.destroy
respond :message => _("Deleted system '%s'") % params[:id], :status => 204
end

api :GET, "/systems/:id/packages", N_("List packages installed on the system")
param :id, String, :desc => N_("UUID of the system"), :required => true
param :id, String, :desc => N_("UUID of the Content Host"), :required => true
def package_profile
packages = @system.simple_packages.sort { |a, b| a.name.downcase <=> b.name.downcase }
response = {
Expand All @@ -181,14 +181,14 @@ def package_profile
end

api :PUT, "/systems/:id/refresh_subscriptions", N_("Trigger a refresh of subscriptions, auto-attaching if enabled")
param :id, String, :desc => N_("UUID of the system"), :required => true
param :id, String, :desc => N_("UUID of the Content Host"), :required => true
def refresh_subscriptions
@system.refresh_subscriptions
respond_for_show(:resource => @system)
end

api :GET, "/systems/:id/errata", N_("List errata available for the system")
param :id, String, :desc => N_("UUID of the system"), :required => true
param :id, String, :desc => N_("UUID of the Content Host"), :required => true
def errata
errata = @system.errata
response = {
Expand All @@ -201,7 +201,7 @@ def errata
end

api :GET, "/systems/:id/tasks", N_("List async tasks for the system")
param :id, String, :desc => N_("UUID of the system"), :required => true
param :id, String, :desc => N_("UUID of the Content Host"), :required => true
def tasks
@system.refresh_tasks

Expand Down Expand Up @@ -247,7 +247,7 @@ def report # rubocop:disable MethodLength
end

api :GET, "/systems/:id/pools", N_("List pools a system is subscribed to")
param :id, String, :desc => N_("UUID of the system"), :required => true
param :id, String, :desc => N_("UUID of the Content Host"), :required => true
param :match_system, [true, false], :desc => N_("Match pools to system")
param :match_installed, [true, false], :desc => N_("Match pools to installed")
param :no_overlap, [true, false], :desc => N_("allow overlap")
Expand All @@ -265,7 +265,7 @@ def pools
end

api :GET, "/systems/:id/releases", N_("Show releases available for the system")
param :id, String, :desc => N_("UUID of the system"), :required => true
param :id, String, :desc => N_("UUID of the Content Host"), :required => true
desc <<-DESC
A hint for choosing the right value for the releaseVer param
DESC
Expand Down

0 comments on commit e946140

Please sign in to comment.