Merge pull request #6311 from bbuckingham/issue-16484

fixes #16484 - hostgroup - fix create params
Katello · Sep 14, 2016 · a2ed5e0 · a2ed5e0
2 parents 7aa6f73 + 5608b83
commit a2ed5e0
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/app/controllers/katello/concerns/api/v2/hostgroups_controller_extensions.rb b/app/controllers/katello/concerns/api/v2/hostgroups_controller_extensions.rb
@@ -6,29 +6,32 @@ module Api::V2::HostgroupsControllerExtensions
       included do
         def_param_group :hostgroup do
           param :hostgroup, Hash, :required => true, :action_aware => true do
-            param :name, String, :required => true
-            param :parent_id, :number
-            param :environment_id, :number
-            param :operatingsystem_id, :number
-            param :architecture_id, :number
-            param :medium_id, :number
-            param :ptable_id, :number
-            param :puppet_ca_proxy_id, :number
-            param :subnet_id, :number
-            param :domain_id, :number
-            param :realm_id, :number
-            param :puppet_proxy_id, :number
-            param :content_source_id, :number
-            param :content_view_id, :number
-            param :lifecycle_environment_id, :number
+            param :name, String, :required => true, :desc => N_('Name of the host group')
+            param :parent_id, :number, :desc => N_('Parent ID of the host group')
+            param :environment_id, :number, :desc => N_('Environment ID')
+            param :compute_profile_id, :number, :desc => N_('Compute profile ID')
+            param :operatingsystem_id, :number, :desc => N_('Operating system ID')
+            param :architecture_id, :number, :desc => N_('Architecture ID')
+            param :pxe_loader, Operatingsystem.all_loaders, :desc => N_("DHCP filename option (Grub2/PXELinux by default)")
+            param :medium_id, :number, :desc => N_('Media ID')
+            param :ptable_id, :number, :desc => N_('Partition table ID')
+            param :puppet_ca_proxy_id, :number, :desc => N_('Puppet CA proxy ID')
+            param :subnet_id, :number, :desc => N_('Subnet ID')
+            param :domain_id, :number, :desc => N_('Domain ID')
+            param :realm_id, :number, :desc => N_('Realm ID')
+            param :puppet_proxy_id, :number, :desc => N_('Puppet proxy ID')
+            param :root_pass, String, :desc => N_('Root password on provisioned hosts')
+            param :content_source_id, :number, :desc => N_('Content source ID')
+            param :content_view_id, :number, :desc => N_('Content view ID')
+            param :lifecycle_environment_id, :number, :desc => N_('Lifecycle environment ID')
             param_group :taxonomies, ::Api::V2::BaseController
           end
         end
 
         api :POST, "/hostgroups/", N_("Create a host group")
         param_group :hostgroup, :as => :create
         def create
-          @hostgroup = Hostgroup.new(params[:hostgroup])
+          @hostgroup = Hostgroup.new(hostgroup_params)
           process_response @hostgroup.save
         end