hammer_cli_foreman 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42450c6d2fad76c1f31ea6a860406c4a6511ccd8
-  data.tar.gz: d6b26b6896df8cd1db9b2f4e8d3f5a037d145167
+  metadata.gz: 1c9636fa0ca48a82b536662e35f1cd988ee25db9
+  data.tar.gz: 04975e3d8bf5e7926dfe2b32fc7fa60b990d49a1
 SHA512:
-  metadata.gz: fa6ed7e0730233e68b0ee1c4894905a34b6352a9225f73536830ab993dfc9606454339e70173cbb20f122c0b258e2dde6b0e39a173df7f5b92e1c1435433378c
-  data.tar.gz: 34c6dc5106bf9d507927600b20c778e6272cf4a24d15eda085b25ac5aedfd6eb0b0d7891aaf5fea92fd482525a2da145e5c9c690417be3797c96111db85a8211
+  metadata.gz: 953e5470e53f5b93517549dd5033f5d5133993a2e6f4b7869442ca61c0be678b9f8681549ff7d4961f87ccb35d958a43e28529b33fd5f794288ce066213f788a
+  data.tar.gz: 423b4e98464a0c927d1438ba4004b77a194c64d46008b0f5f530db42f24a13c8a31aad7860daf5892ce73cc539512e6ac8348df96b70c7aa509e0e437fe1397f

data/lib/hammer_cli_foreman/architecture.rb

@@ -12,10 +12,8 @@ module HammerCLIForeman
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        from "architecture" do
-          field :id, "Id"
-          field :name, "Name"
-        end
+        field :id, "Id"
+        field :name, "Name"
       end
 
       apipie_options
@@ -25,11 +23,9 @@ module HammerCLIForeman
     class InfoCommand < HammerCLIForeman::InfoCommand
 
       output ListCommand.output_definition do
-        from "architecture" do
-          field :operatingsystem_ids, "OS ids", Fields::List
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+        field :operatingsystem_ids, "OS ids", Fields::List
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
       end
 
     end

data/lib/hammer_cli_foreman/commands.rb

@@ -2,6 +2,32 @@ require 'hammer_cli'
 
 module HammerCLIForeman
 
+  def self.collection_to_common_format(data)
+    if data.class <= Hash && data.has_key?('total') && data.has_key?('results')
+      col = HammerCLI::Output::RecordCollection.new(data['results'],
+        :total => data['total'],
+        :subtotal => data['subtotal'],
+        :page => data['page'],
+        :per_page => data['per_page'],
+        :search => data['search'],
+        :sort_by => data['sort']['by'],
+        :sort_order => data['sort']['order'])
+    elsif data.class <= Hash
+      col = HammerCLI::Output::RecordCollection.new(data)
+    elsif data.class <= Array
+      # remove object types. From [ { 'type' => { 'attr' => val } }, ... ]
+      # produce [ { 'attr' => 'val' }, ... ]
+      col = HammerCLI::Output::RecordCollection.new(data.map { |r| r.keys.length == 1 ? r[r.keys[0]] : r })
+    else
+      raise RuntimeError.new("Received data of unknown format")
+    end
+    col
+  end
+
+  def self.record_to_common_format(data)
+      data.class <= Hash && data.keys.length == 1 ? data[data.keys[0]] : data
+  end
+
   class WriteCommand < HammerCLI::Apipie::WriteCommand
 
     def success_message_params(response)
@@ -14,6 +40,10 @@ module HammerCLIForeman
       end
     end
 
+    def send_request
+      HammerCLIForeman.record_to_common_format(resource.call(action, request_params)[0])
+    end
+
   end
 
   class ListCommand < HammerCLI::Apipie::ReadCommand
@@ -24,6 +54,17 @@ module HammerCLIForeman
       :table
     end
 
+    def retrieve_data
+      data = super
+      set = HammerCLIForeman.collection_to_common_format(data)
+      set.map! { |r| extend_data(r) }
+      set
+    end
+
+    def extend_data(record)
+      record
+    end
+
     def self.command_name(name=nil)
       super(name) || "list"
     end
@@ -49,6 +90,20 @@ module HammerCLIForeman
       super({:without => declared_identifiers.keys}.merge(options))
     end
 
+    def retrieve_data
+      data = super
+      record = HammerCLIForeman.record_to_common_format(data)
+      extend_data(record)
+    end
+
+    def extend_data(record)
+      record
+    end
+
+    def print_data(record)
+      print_record(output_definition, record)
+    end
+
   end
 
 

data/lib/hammer_cli_foreman/common_parameter.rb

@@ -10,10 +10,8 @@ module HammerCLIForeman
       resource ForemanApi::Resources::CommonParameter, "index"
 
       output do
-        from "common_parameter" do
-          field :name, "Name"
-          field :value, "Value"
-        end
+        field :name, "Name"
+        field :value, "Value"
       end
 
       apipie_options

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -11,11 +11,9 @@ module HammerCLIForeman
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        from "compute_resource" do
-          field :id, "Id"
-          field :name, "Name"
-          field :provider, "Provider"
-        end
+        field :id, "Id"
+        field :name, "Name"
+        field :provider, "Provider"
       end
 
       apipie_options
@@ -46,19 +44,17 @@ module HammerCLIForeman
       }
 
       output ListCommand.output_definition do
-        from "compute_resource" do
-          field :url, "Url"
-          field :description, "Description"
-          field :user, "User"
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+        field :url, "Url"
+        field :description, "Description"
+        field :user, "User"
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
       end
 
       def print_data(data)
-        provider = data["compute_resource"]["provider"].downcase
+        provider = data["provider"].downcase
         output_definition.fields.concat PROVIDER_SPECIFIC_FIELDS[provider]
-        print_records(output_definition, data)
+        print_collection(output_definition, data)
       end
 
     end

data/lib/hammer_cli_foreman/domain.rb

@@ -10,10 +10,8 @@ module HammerCLIForeman
       resource ForemanApi::Resources::Domain, "index"
 
       output do
-        from "domain" do
-          field :id, "Id"
-          field :name, "Name"
-        end
+        field :id, "Id"
+        field :name, "Name"
       end
 
       apipie_options
@@ -24,24 +22,21 @@ module HammerCLIForeman
 
       resource ForemanApi::Resources::Domain, "show"
 
-      def retrieve_data
-        domain = super
-        domain["parameters"] = HammerCLIForeman::Parameter.get_parameters resource_config, domain
-        domain
-      end
-
       output ListCommand.output_definition do
-        from "domain" do
-          field :fullname, "Description"
-          field :dns_id, "DNS Id"
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+        field :fullname, "Description"
+        field :dns_id, "DNS Id"
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
         collection :parameters, "Parameters" do
-          field :parameter, nil, Fields::KeyValue
+          field nil, nil, Fields::KeyValue
         end
       end
 
+      def extend_data(record)
+        record["parameters"] = HammerCLIForeman::Parameter.get_parameters(resource_config, :domain, record)
+        record
+      end
+
     end
 
 
@@ -79,6 +74,8 @@ module HammerCLIForeman
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
 
+      resource ForemanApi::Resources::Parameter
+
       desc "Create or update parameter for a domain."
 
       option "--domain-name", "DOMAIN_NAME", "name of the domain the parameter is being set for"
@@ -103,6 +100,8 @@ module HammerCLIForeman
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
 
+      resource ForemanApi::Resources::Parameter
+
       desc "Delete parameter for a domain."
 
       option "--domain-name", "DOMAIN_NAME", "name of the domain the parameter is being deleted for"

data/lib/hammer_cli_foreman/environment.rb

@@ -11,10 +11,8 @@ module HammerCLIForeman
       resource ForemanApi::Resources::Environment, "index"
 
       output do
-        from "environment" do
-          field :id, "Id"
-          field :name, "Name"
-        end
+        field :id, "Id"
+        field :name, "Name"
       end
 
       apipie_options
@@ -25,10 +23,8 @@ module HammerCLIForeman
       resource ForemanApi::Resources::Environment, "show"
 
       output ListCommand.output_definition do
-        from "environment" 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
@@ -66,8 +62,8 @@ module HammerCLIForeman
     class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
 
       apipie_options :without => [:host_id, :hostgroup_id, :puppetclass_id, :environment_id]
-      option ['--id', '--name'], 'ENVIRONMENT_ID', 'environment id/name', 
-            :required => true, :attribute_name => :environment_id 
+      option ['--id', '--name'], 'ENVIRONMENT_ID', 'environment id/name',
+            :required => true, :attribute_name => :environment_id
     end
 
 

data/lib/hammer_cli_foreman/fact.rb

@@ -13,11 +13,9 @@ module HammerCLIForeman
       apipie_options
 
       output do
-        from "fact" do
-          field :host, "Host"
-          field :fact, "Fact"
-          field :value, "Value"
-        end
+        field :host, "Host"
+        field :fact, "Fact"
+        field :value, "Value"
       end
 
       def retrieve_data
@@ -25,13 +23,13 @@ module HammerCLIForeman
       end
 
       def self.unhash_facts(facts_hash)
-        facts_hash.inject([]) do |list, (host, facts)|
+        facts = facts_hash.first.inject([]) do |list, (host, facts)|
           list + facts.collect do |(fact, value)|
-            { :fact => { :host => host, :fact => fact, :value => value } }
+            { :host => host, :fact => fact, :value => value }
           end
         end
+        HammerCLI::Output::RecordCollection.new(facts, :meta => facts_hash.meta)
       end
-
     end
 
     autoload_subcommands

data/lib/hammer_cli_foreman/host.rb

@@ -99,14 +99,12 @@ module HammerCLIForeman
     class ListCommand < HammerCLIForeman::ListCommand
       # FIXME: list compute resource (model)
       output do
-        from "host" do
-          field :id, "Id"
-          field :name, "Name"
-          field :operatingsystem_id, "Operating System Id"
-          field :hostgroup_id, "Host Group Id"
-          field :ip, "IP"
-          field :mac, "MAC"
-        end
+        field :id, "Id"
+        field :name, "Name"
+        field :operatingsystem_id, "Operating System Id"
+        field :hostgroup_id, "Host Group Id"
+        field :ip, "IP"
+        field :mac, "MAC"
       end
 
       apipie_options
@@ -115,57 +113,55 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
-      def retrieve_data
-        host = super
-        host["host"]["environment_name"] = host["host"]["environment"]["environment"]["name"] rescue nil
-        host["parameters"] = HammerCLIForeman::Parameter.get_parameters(resource_config, host)
+      def extend_data(host)
+        host["environment_name"] = host["environment"]["environment"]["name"] rescue nil
+        host["parameters"] = HammerCLIForeman::Parameter.get_parameters(resource_config, :host, host)
         host
       end
 
       output ListCommand.output_definition do
-        from "host" do
-          field :uuid, "UUID"
-          field :certname, "Cert name"
-
-          field :environment_name, "Environment"
-          field :environment_id, "Environment Id"
-
-          field :managed, "Managed"
-          field :enabled, "Enabled"
-          field :build, "Build"
-
-          field :use_image, "Use image"
-          field :disk, "Disk"
-          field :image_file, "Image file"
-
-          field :sp_name, "SP Name"
-          field :sp_ip, "SP IP"
-          field :sp_mac, "SP MAC"
-          field :sp_subnet, "SP Subnet"
-          field :sp_subnet_id, "SP Subnet Id"
-
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-          field :installed_at, "Installed at", Fields::Date
-          field :last_report, "Last report", Fields::Date
-
-          field :puppet_ca_proxy_id, "Puppet CA Proxy Id"
-          field :medium_id, "Medium Id"
-          field :model_id, "Model Id"
-          field :owner_id, "Owner Id"
-          field :subnet_id, "Subnet Id"
-          field :domain_id, "Domain Id"
-          field :puppet_proxy_id, "Puppet Proxy Id"
-          field :owner_type, "Owner Type"
-          field :ptable_id, "Partition Table Id"
-          field :architecture_id, "Architecture Id"
-          field :image_id, "Image Id"
-          field :compute_resource_id, "Compute Resource Id"
-
-          field :comment, "Comment"
-        end
+        field :uuid, "UUID"
+        field :certname, "Cert name"
+
+        field :environment_name, "Environment"
+        field :environment_id, "Environment Id"
+
+        field :managed, "Managed"
+        field :enabled, "Enabled"
+        field :build, "Build"
+
+        field :use_image, "Use image"
+        field :disk, "Disk"
+        field :image_file, "Image file"
+
+        field :sp_name, "SP Name"
+        field :sp_ip, "SP IP"
+        field :sp_mac, "SP MAC"
+        field :sp_subnet, "SP Subnet"
+        field :sp_subnet_id, "SP Subnet Id"
+
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
+        field :installed_at, "Installed at", Fields::Date
+        field :last_report, "Last report", Fields::Date
+
+        field :puppet_ca_proxy_id, "Puppet CA Proxy Id"
+        field :medium_id, "Medium Id"
+        field :model_id, "Model Id"
+        field :owner_id, "Owner Id"
+        field :subnet_id, "Subnet Id"
+        field :domain_id, "Domain Id"
+        field :puppet_proxy_id, "Puppet Proxy Id"
+        field :owner_type, "Owner Type"
+        field :ptable_id, "Partition Table Id"
+        field :architecture_id, "Architecture Id"
+        field :image_id, "Image Id"
+        field :compute_resource_id, "Compute Resource Id"
+
+        field :comment, "Comment"
+
         collection :parameters, "Parameters" do
-          field :parameter, nil, Fields::KeyValue
+          field nil, nil, Fields::KeyValue
         end
       end
     end
@@ -228,10 +224,8 @@ module HammerCLIForeman
       apipie_options :without => declared_identifiers.keys
 
       output do
-        from "fact" do
-          field :fact, "Fact"
-          field :value, "Value"
-        end
+        field :fact, "Fact"
+        field :value, "Value"
       end
 
       def request_params
@@ -241,7 +235,8 @@ module HammerCLIForeman
       end
 
       def retrieve_data
-        HammerCLIForeman::Fact::ListCommand.unhash_facts(super)
+        data = super
+        HammerCLIForeman::Fact::ListCommand.unhash_facts(data)
       end
 
     end
@@ -324,6 +319,8 @@ module HammerCLIForeman
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
 
+      resource ForemanApi::Resources::Parameter
+
       desc "Create or update parameter for a host."
 
       option "--host-name", "HOST_NAME", "name of the host the parameter is being set for"
@@ -348,6 +345,8 @@ module HammerCLIForeman
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
 
+      resource ForemanApi::Resources::Parameter
+
       desc "Delete parameter for a host."
 
       option "--host-name", "HOST_NAME", "name of the host the parameter is being deleted for"
@@ -427,7 +426,7 @@ module HammerCLIForeman
     class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
 
       apipie_options :without => [:host_id, :hostgroup_id, :puppetclass_id, :environment_id]
-      option ['--id', '--name'], 'HOST_ID', 'host id/name', 
+      option ['--id', '--name'], 'HOST_ID', 'host id/name',
               :attribute_name => :host_id, :required => true
     end