hammer_cli_foreman 0.0.11 → 0.0.12

data/lib/hammer_cli_foreman/hostgroup.rb

@@ -11,17 +11,15 @@ module HammerCLIForeman
       resource ForemanApi::Resources::Hostgroup, "index"
 
       output do
-        from "hostgroup" do
-          field :id, "Id"
-          field :name, "Name"
-          field :label, "Label"
-          field :operatingsystem_id, "Operating System Id"
-          field :subnet_id, "Subnet Id"
-          field :domain_id, "Domain Id"
-          field :environment_id, "Environment Id"
-          field :puppetclass_ids, "Puppetclass Ids", Fields::List
-          field :ancestry, "Ancestry"
-        end
+        field :id, "Id"
+        field :name, "Name"
+        field :label, "Label"
+        field :operatingsystem_id, "Operating System Id"
+        field :subnet_id, "Subnet Id"
+        field :domain_id, "Domain Id"
+        field :environment_id, "Environment Id"
+        field :puppetclass_ids, "Puppetclass Ids", Fields::List
+        field :ancestry, "Ancestry"
       end
 
       apipie_options
@@ -35,13 +33,12 @@ module HammerCLIForeman
 
       output ListCommand.output_definition do
         collection :parameters, "Parameters" do
-          field :parameter, nil, Fields::KeyValue
+          field nil, nil, Fields::KeyValue
         end
       end
 
-      def retrieve_data
-        hostgroup = super
-        hostgroup["parameters"] = HammerCLIForeman::Parameter.get_parameters resource_config, hostgroup
+      def extend_data(hostgroup)
+        hostgroup["parameters"] = HammerCLIForeman::Parameter.get_parameters(resource_config, :hostgroup, hostgroup)
         hostgroup
       end
 
@@ -107,6 +104,8 @@ module HammerCLIForeman
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
 
+      resource ForemanApi::Resources::Parameter
+
       desc "Create or update parameter for a hostgroup."
 
       option "--hostgroup-id", "HOSTGROUP_ID", "id of the hostgroup the parameter is being set for", :required => true
@@ -125,6 +124,8 @@ module HammerCLIForeman
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
 
+      resource ForemanApi::Resources::Parameter
+
       desc "Delete parameter for a hostgroup."
 
       option "--hostgroup-id", "HOSTGROUP_ID", "id of the hostgroup the parameter is being deleted for", :required => true
@@ -142,7 +143,7 @@ module HammerCLIForeman
     class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
 
       apipie_options :without => [:host_id, :hostgroup_id, :puppetclass_id, :environment_id]
-      option ['--id', '--name'], 'HOSTGROUP_ID', 'hostgroup id/name', 
+      option ['--id', '--name'], 'HOSTGROUP_ID', 'hostgroup id/name',
             :attribute_name => :hostgroup_id, :required => true
     end
 

data/lib/hammer_cli_foreman/image.rb

@@ -32,13 +32,11 @@ module HammerCLIForeman
       include HammerCLIForeman::Image::ComputeResourceOptions
 
       output do
-        from "image" do
-          field :id, "Id"
-          field :name, "Name"
-          field :operatingsystem_id, "Operating System Id", Fields::Id
-          field :username, "Username"
-          field :uuid, "UUID"
-        end
+        field :id, "Id"
+        field :name, "Name"
+        field :operatingsystem_id, "Operating System Id", Fields::Id
+        field :username, "Username"
+        field :uuid, "UUID"
       end
 
       def request_params
@@ -57,12 +55,10 @@ module HammerCLIForeman
       identifiers :id
 
       output ListCommand.output_definition do
-        from "image" do
-          field :architecture_id, "Architecture Id", Fields::Id
-          field :iam_role, "IAM role"
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+        field :architecture_id, "Architecture Id", Fields::Id
+        field :iam_role, "IAM role"
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
       end
 
       def request_params
@@ -83,10 +79,8 @@ module HammerCLIForeman
       include HammerCLIForeman::Image::ComputeResourceOptions
 
       output do
-        from "image" do
-          field :name, "Name"
-          field :uuid, "UUID"
-        end
+        field :name, "Name"
+        field :uuid, "UUID"
       end
 
       def request_params

data/lib/hammer_cli_foreman/location.rb

@@ -14,10 +14,8 @@ module HammerCLIForeman
       include HammerCLIForeman::ResourceSupportedTest
 
       output do
-        from "location" do
-          field :id, "Id"
-          field :name, "Name"
-        end
+        field :id, "Id"
+        field :name, "Name"
       end
 
       apipie_options
@@ -28,10 +26,8 @@ module HammerCLIForeman
       include HammerCLIForeman::ResourceSupportedTest
 
       output ListCommand.output_definition do
-        from "location" do
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
       end
 
     end

data/lib/hammer_cli_foreman/media.rb

@@ -11,11 +11,9 @@ module HammerCLIForeman
 
     class ListCommand < HammerCLIForeman::ListCommand
       output do
-        from "medium" do
-          field :id, "Id"
-          field :name, "Name"
-          field :path, "Path"
-        end
+        field :id, "Id"
+        field :name, "Name"
+        field :path, "Path"
       end
 
       apipie_options
@@ -24,12 +22,10 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       output ListCommand.output_definition do
-        from "medium" do
-          field :os_family, "OS Family"
-          field :operatingsystem_ids, "OS IDs", Fields::List
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+        field :os_family, "OS Family"
+        field :operatingsystem_ids, "OS IDs", Fields::List
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
       end
 
     end
@@ -42,15 +38,6 @@ module HammerCLIForeman
 
       apipie_options
 
-      #FIXME: remove OS ids option and custom request_params once it's added to foreman's apipie docs
-      option "--operatingsystem-ids", "OSIDS", "os ids",
-        :format => HammerCLI::Options::Normalizers::List.new
-
-      def request_params
-        params = super
-        params['medium']['operatingsystem_ids'] = operatingsystem_ids
-        params
-      end
     end
 
 
@@ -61,15 +48,6 @@ module HammerCLIForeman
 
       apipie_options
 
-      #FIXME: remove OS ids option and custom request_params once it's added to foreman's apipie docs
-      option "--operatingsystem-ids", "OSIDS", "os ids",
-        :format => HammerCLI::Options::Normalizers::List.new
-
-      def request_params
-        params = super
-        params['medium']['operatingsystem_ids'] = operatingsystem_ids
-        params
-      end
     end
 
 

data/lib/hammer_cli_foreman/model.rb

@@ -11,12 +11,10 @@ module HammerCLIForeman
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        from "model" do
-          field :id, "Id"
-          field :name, "Name"
-          field :vendor_class, "Vendor class"
-          field :hardware_model, "HW model"
-        end
+        field :id, "Id"
+        field :name, "Name"
+        field :vendor_class, "Vendor class"
+        field :hardware_model, "HW model"
       end
 
       apipie_options
@@ -26,11 +24,9 @@ module HammerCLIForeman
     class InfoCommand < HammerCLIForeman::InfoCommand
 
       output ListCommand.output_definition do
-        from "model" do
-          field :info, "Info"
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+        field :info, "Info"
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
       end
 
     end

data/lib/hammer_cli_foreman/operating_system.rb

@@ -12,14 +12,15 @@ module HammerCLIForeman
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        from "operatingsystem" do
-          field :id, "Id"
-        end
-        field :operatingsystem, "Name", Fields::OSName
-        from "operatingsystem" do
-          field :release_name, "Release name"
-          field :family, "Family"
-        end
+        field :id, "Id"
+        field :_os_name, "Name", Fields::OSName
+        field :release_name, "Release name"
+        field :family, "Family"
+      end
+
+      def extend_data(os)
+        os["_os_name"] = os.select { |k, v| ["name", "major", "minor"].include? k }
+        os
       end
 
       apipie_options
@@ -31,25 +32,23 @@ module HammerCLIForeman
       identifiers :id, :label
 
       output ListCommand.output_definition do
-        from "operatingsystem" do
-          field :media_names, "Installation media", Fields::List
-          field :architecture_names, "Architectures", Fields::List
-          field :ptable_names, "Partition tables", Fields::List
-          field :config_template_names, "Config templates", Fields::List
-        end
+        field :media_names, "Installation media", Fields::List
+        field :architecture_names, "Architectures", Fields::List
+        field :ptable_names, "Partition tables", Fields::List
+        field :config_template_names, "Config templates", Fields::List
         collection :parameters, "Parameters" do
-          field :parameter, nil, Fields::KeyValue
+          field nil, nil, Fields::KeyValue
         end
       end
 
       #FIXME: remove custom retrieve_data after the api has support for listing names
-      def retrieve_data
-        os = super
-        os["operatingsystem"]["media_names"] = os["operatingsystem"]["media"].collect{|m| m["medium"]["name"] } rescue []
-        os["operatingsystem"]["architecture_names"] = os["operatingsystem"]["architectures"].collect{|m| m["architecture"]["name"] } rescue []
-        os["operatingsystem"]["ptable_names"] = os["operatingsystem"]["ptables"].collect{|m| m["ptable"]["name"] } rescue []
-        os["operatingsystem"]["config_template_names"] = os["operatingsystem"]["config_templates"].collect{|m| m["config_template"]["name"] } rescue []
-        os["parameters"] = HammerCLIForeman::Parameter.get_parameters resource_config, os
+      def extend_data(os)
+        os["_os_name"] = os.select { |k, v| ["name", "major", "minor"].include? k }
+        os["media_names"] = os["media"].collect{|m| m["medium"]["name"] } rescue []
+        os["architecture_names"] = os["architectures"].collect{|m| m["architecture"]["name"] } rescue []
+        os["ptable_names"] = os["ptables"].collect{|m| m["ptable"]["name"] } rescue []
+        os["config_template_names"] = os["config_templates"].collect{|m| m["config_template"]["name"] } rescue []
+        os["parameters"] = HammerCLIForeman::Parameter.get_parameters(resource_config, :operatingsystem, os)
         os
       end
 
@@ -126,6 +125,8 @@ module HammerCLIForeman
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
 
+      resource ForemanApi::Resources::Parameter
+
       desc "Create or update parameter for an operating system."
 
       #FIXME: add option --os-label when api supports it
@@ -150,6 +151,8 @@ module HammerCLIForeman
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
 
+      resource ForemanApi::Resources::Parameter
+
       desc "Delete parameter for an operating system."
 
       #FIXME: add option --os-label when api supports it

data/lib/hammer_cli_foreman/organization.rb

@@ -14,10 +14,8 @@ module HammerCLIForeman
       include HammerCLIForeman::ResourceSupportedTest
 
       output do
-        from "organization" do
-          field :id, "Id"
-          field :name, "Name"
-        end
+        field :id, "Id"
+        field :name, "Name"
       end
 
       apipie_options
@@ -28,10 +26,8 @@ module HammerCLIForeman
       include HammerCLIForeman::ResourceSupportedTest
 
       output ListCommand.output_definition do
-        from "organization" do
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
       end
 
     end

data/lib/hammer_cli_foreman/output/formatters.rb

@@ -8,6 +8,7 @@ module HammerCLIForeman::Output
       end
 
       def format(os)
+        return nil if os.nil?
         name = "%s %s" % [os[:name], os[:major]]
         name += ".%s" % os[:minor] unless (!os.has_key?(:minor) || os[:minor].empty?)
         name
@@ -15,13 +16,13 @@ module HammerCLIForeman::Output
     end
 
     class ServerFormatter < HammerCLI::Output::Formatters::FieldFormatter
-      
+
       def tags
         [:flat]
       end
 
       def format(server)
-        "%s (%s)" % [server[:name], server[:url]]
+        "%s (%s)" % [server[:name], server[:url]] unless server.nil?
       end
     end
 

data/lib/hammer_cli_foreman/parameter.rb

@@ -6,14 +6,13 @@ module HammerCLIForeman
 
   module Parameter
 
-    def self.get_parameters(resource_config, resource)
-      resource_type = resource.keys.first
-      resource = resource[resource_type]
+    def self.get_parameters(resource_config, resource_type, resource)
       params = {
         resource_type.to_s+"_id" => resource["id"] || resource["name"]
       }
 
-      ForemanApi::Resources::Parameter.new(resource_config).index(params)[0]
+      params = ForemanApi::Resources::Parameter.new(resource_config).index(params)[0]
+      HammerCLIForeman.collection_to_common_format(params)
     end
 
     class SetCommand < HammerCLI::Apipie::Command
@@ -47,8 +46,8 @@ module HammerCLIForeman
       end
 
       def parameter_exist?
-        params = resource.call(:index, base_action_params)[0]
-        params.find { |p| p["parameter"]["name"] == name }
+        params = HammerCLIForeman.collection_to_common_format(resource.call(:index, base_action_params)[0])
+        params.find { |p| p["name"] == name }
       end
 
       def update_parameter
@@ -59,7 +58,7 @@ module HammerCLIForeman
           }
         }.merge base_action_params
 
-        resource.call(:update, params)
+        HammerCLIForeman.record_to_common_format(resource.call(:update, params))
       end
 
       def create_parameter
@@ -70,7 +69,7 @@ module HammerCLIForeman
           }
         }.merge base_action_params
 
-        resource.call(:create, params)
+        HammerCLIForeman.record_to_common_format(resource.call(:create, params))
       end
 
     end
@@ -95,7 +94,7 @@ module HammerCLIForeman
           "id" => name
         }.merge base_action_params
 
-        resource.call(:destroy, params)
+        HammerCLIForeman.record_to_common_format(resource.call(:destroy, params))
         print_message success_message if success_message
         HammerCLI::EX_OK
       end

data/lib/hammer_cli_foreman/partition_table.rb

@@ -12,11 +12,9 @@ module HammerCLIForeman
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        from "ptable" do
-          field :id, "Id"
-          field :name, "Name"
-          field :os_family, "OS Family"
-        end
+        field :id, "Id"
+        field :name, "Name"
+        field :os_family, "OS Family"
       end
 
       apipie_options
@@ -26,10 +24,8 @@ module HammerCLIForeman
     class InfoCommand < HammerCLIForeman::InfoCommand
 
       output ListCommand.output_definition do
-        from "ptable" do
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
       end
 
     end
@@ -42,7 +38,7 @@ module HammerCLIForeman
 
 
       def print_data(partition_table)
-        puts partition_table["ptable"]["layout"]
+        puts partition_table["layout"]
       end
 
     end