hammer_cli_foreman 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c9636fa0ca48a82b536662e35f1cd988ee25db9
-  data.tar.gz: 04975e3d8bf5e7926dfe2b32fc7fa60b990d49a1
+  metadata.gz: 6869422b1ec6f701b4d917d51c2d9b18ba4dbe79
+  data.tar.gz: e4e09d4f92211912959c4482287da4acf15c9ca7
 SHA512:
-  metadata.gz: 953e5470e53f5b93517549dd5033f5d5133993a2e6f4b7869442ca61c0be678b9f8681549ff7d4961f87ccb35d958a43e28529b33fd5f794288ce066213f788a
-  data.tar.gz: 423b4e98464a0c927d1438ba4004b77a194c64d46008b0f5f530db42f24a13c8a31aad7860daf5892ce73cc539512e6ac8348df96b70c7aa509e0e437fe1397f
+  metadata.gz: 7a1c3314b27b98c9482bafcac98ce204364b327ac4e59c98b864960ef2ab8e475a2ef5efa017daa069a0096a6237c9b9eedb4b87f3230041d3102532f2ac15fc
+  data.tar.gz: 086d0a383b27585c61f6b1ae9930bb4471a289ebc454f05a3cb0f0c2bd7779db2be0f88d90ffe4dba30c779acc9f8379ed940e5da40079c1e30b1ae743a7bf09

data/lib/hammer_cli_foreman/commands.rb

@@ -30,16 +30,6 @@ module HammerCLIForeman
 
   class WriteCommand < HammerCLI::Apipie::WriteCommand
 
-    def success_message_params(response)
-      if response
-        if response.is_a?(Hash) and !response.empty?
-          response[response.keys[0]]
-        else
-          response
-        end
-      end
-    end
-
     def send_request
       HammerCLIForeman.record_to_common_format(resource.call(action, request_params)[0])
     end
@@ -50,6 +40,8 @@ module HammerCLIForeman
 
     action :index
 
+    DEFAULT_PER_PAGE = 20
+
     def adapter
       :table
     end
@@ -69,6 +61,43 @@ module HammerCLIForeman
       super(name) || "list"
     end
 
+    def execute
+      if respond_to?(:page) && respond_to?(:per_page)
+        self.page ||= 1
+        self.per_page ||= HammerCLI::Settings.get(:ui, :per_page) || DEFAULT_PER_PAGE
+        browse_collection
+      else
+        retrieve_and_print
+      end
+
+      return HammerCLI::EX_OK
+    end
+
+    protected
+
+    def browse_collection
+      list_next = true
+
+      while list_next do
+        d = retrieve_and_print
+
+        if (d.size >= self.per_page.to_i) && interactive?
+          answer = ask("List next page? (Y/n): ").downcase
+          list_next = (answer == 'y' || answer == '')
+          self.page += 1
+        else
+          list_next = false
+        end
+      end
+    end
+
+    def retrieve_and_print
+      d = retrieve_data
+      logger.watch "Retrieved data: ", d
+      print_data d
+      d
+    end
+
   end
 
 

data/lib/hammer_cli_foreman/host.rb

@@ -15,6 +15,8 @@ module HammerCLIForeman
             :puppet_proxy_id, :operatingsystem_id,
             # - temporarily disabled params until we add support for boolean options to apipie -
             :build, :managed, :enabled, :start,
+            # - temporarily disabled params until they are fixed in API
+            :puppet_class_ids, #3884
             # - temporarily disabled params that will be removed from the api ------------------
             :provision_method, :capabilities, :flavour_ref, :image_ref, :start,
             :network, :cpus, :memory, :provider, :type, :tenant_id, :image_id,
@@ -29,6 +31,8 @@ module HammerCLIForeman
       base.option "--partition-table-id", "PARTITION_TABLE_ID", " "
       base.option "--compute-resource-id", "COMPUTE_RESOURCE", " "
       base.option "--partition-table-id", "PARTITION_TABLE", " "
+      base.option "--puppetclass-ids", "PUPPETCLASS_IDS", " ",
+        :format => HammerCLI::Options::Normalizers::List.new
 
       base.option "--build", "BUILD", " ", :default => 'true',
         :format => HammerCLI::Options::Normalizers::Bool.new
@@ -55,6 +59,8 @@ module HammerCLIForeman
       params['host']['managed'] = managed
       params['host']['enabled'] = enabled
 
+      params['host']['puppetclass_ids'] = puppetclass_ids
+
       params['host']['ptable_id'] = partition_table_id
       params['host']['compute_resource_id'] = compute_resource_id
       params['host']['host_parameters_attributes'] = parameter_attributes

data/lib/hammer_cli_foreman/operating_system.rb

@@ -19,7 +19,7 @@ module HammerCLIForeman
       end
 
       def extend_data(os)
-        os["_os_name"] = os.select { |k, v| ["name", "major", "minor"].include? k }
+        os["_os_name"] = Hash[os.select { |k, v| ["name", "major", "minor"].include? k }]
         os
       end
 
@@ -43,7 +43,7 @@ module HammerCLIForeman
 
       #FIXME: remove custom retrieve_data after the api has support for listing names
       def extend_data(os)
-        os["_os_name"] = os.select { |k, v| ["name", "major", "minor"].include? k }
+        os["_os_name"] = Hash[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 []

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new '0.0.12'
+    @version ||= Gem::Version.new '0.0.13'
   end
 end

data/test/reports/TEST-HammerCLIForeman-Architecture-CreateCommand-parameters.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::CreateCommand::parameters" tests="2" time="0.010592708" failures="0" errors="0" skipped="0" assertions="2">
+  <testcase name="test_0002_should fail with name missing" time="0.008160524" assertions="1">
+  </testcase>
+  <testcase name="test_0001_should accept name" time="0.002136914" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-CreateCommand.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::CreateCommand" tests="0" time="0.000420125" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-DeleteCommand-parameters.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::DeleteCommand::parameters" tests="3" time="0.005292196" failures="0" errors="0" skipped="0" assertions="3">
+  <testcase name="test_0003_should fail with name or id missing" time="0.00155957" assertions="1">
+  </testcase>
+  <testcase name="test_0002_should accept id" time="0.001930339" assertions="1">
+  </testcase>
+  <testcase name="test_0001_should accept name" time="0.001509438" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-DeleteCommand.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::DeleteCommand" tests="0" time="0.000534332" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-InfoCommand-output.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::InfoCommand::output" tests="3" time="0.008668972" failures="0" errors="0" skipped="0" assertions="5">
+  <testcase name="test_0001_should print 1 records" time="0.003258728" assertions="1">
+  </testcase>
+  <testcase name="test_0002_should print column Name" time="0.002410385" assertions="2">
+  </testcase>
+  <testcase name="test_0003_should print column Id" time="0.002710322" assertions="2">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-InfoCommand-parameters.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::InfoCommand::parameters" tests="3" time="0.005899642" failures="0" errors="0" skipped="0" assertions="3">
+  <testcase name="test_0001_should accept id" time="0.002035397" assertions="1">
+  </testcase>
+  <testcase name="test_0002_should accept name" time="0.001923494" assertions="1">
+  </testcase>
+  <testcase name="test_0003_should fail with no arguments" time="0.001474022" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-InfoCommand.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::InfoCommand" tests="0" time="0.000301654" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-ListCommand-output.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::ListCommand::output" tests="3" time="0.009809186" failures="0" errors="0" skipped="0" assertions="5">
+  <testcase name="test_0003_should print column Id" time="0.003824971" assertions="2">
+  </testcase>
+  <testcase name="test_0002_should print column Name" time="0.002789089" assertions="2">
+  </testcase>
+  <testcase name="test_0001_should print  records" time="0.00277098" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-ListCommand-parameters.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::ListCommand::parameters" tests="5" time="0.013451271" failures="0" errors="0" skipped="0" assertions="5">
+  <testcase name="test_0001_should accept no arguments" time="0.002846459" assertions="1">
+  </testcase>
+  <testcase name="test_0004_should accept page" time="0.002429319" assertions="1">
+  </testcase>
+  <testcase name="test_0003_should accept per page" time="0.002520928" assertions="1">
+  </testcase>
+  <testcase name="test_0002_should accept search" time="0.002605764" assertions="1">
+  </testcase>
+  <testcase name="test_0005_should accept order" time="0.00246664" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-ListCommand.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::ListCommand" tests="0" time="0.000373601" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-UpdateCommand-parameters.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::UpdateCommand::parameters" tests="4" time="0.007570583" failures="0" errors="0" skipped="0" assertions="4">
+  <testcase name="test_0003_should fail with no params" time="0.001654156" assertions="1">
+  </testcase>
+  <testcase name="test_0002_should accept id" time="0.002233739" assertions="1">
+  </testcase>
+  <testcase name="test_0001_should accept name" time="0.001735617" assertions="1">
+  </testcase>
+  <testcase name="test_0004_should fail with name or id missing" time="0.001618339" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture-UpdateCommand.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture::UpdateCommand" tests="0" time="0.000454173" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-Architecture.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::Architecture" tests="0" time="0.000393444" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-CommonParameter-DeleteCommand-parameters.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::CommonParameter::DeleteCommand::parameters" tests="2" time="0.003582477" failures="0" errors="0" skipped="0" assertions="2">
+  <testcase name="test_0001_should accept name" time="0.001973243" assertions="1">
+  </testcase>
+  <testcase name="test_0002_should fail with name missing" time="0.001325387" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-CommonParameter-DeleteCommand.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::CommonParameter::DeleteCommand" tests="0" time="0.000239179" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-CommonParameter-ListCommand-output.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::CommonParameter::ListCommand::output" tests="3" time="0.035125659" failures="0" errors="0" skipped="0" assertions="5">
+  <testcase name="test_0001_should print  records" time="0.026932104" assertions="1">
+  </testcase>
+  <testcase name="test_0002_should print column Name" time="0.003951707" assertions="2">
+  </testcase>
+  <testcase name="test_0003_should print column Value" time="0.003914838" assertions="2">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-CommonParameter-ListCommand-parameters.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::CommonParameter::ListCommand::parameters" tests="5" time="0.010110542" failures="0" errors="0" skipped="0" assertions="5">
+  <testcase name="test_0004_should accept page" time="0.00225483" assertions="1">
+  </testcase>
+  <testcase name="test_0002_should accept search" time="0.00210999" assertions="1">
+  </testcase>
+  <testcase name="test_0005_should accept order" time="0.001839416" assertions="1">
+  </testcase>
+  <testcase name="test_0003_should accept per page" time="0.001739675" assertions="1">
+  </testcase>
+  <testcase name="test_0001_should accept no arguments" time="0.001569955" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-CommonParameter-ListCommand.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::CommonParameter::ListCommand" tests="0" time="0.000346917" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-CommonParameter-SetCommand-parameters.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::CommonParameter::SetCommand::parameters" tests="3" time="0.035448264" failures="0" errors="0" skipped="0" assertions="3">
+  <testcase name="test_0003_should fail with value missing" time="0.031641909" assertions="1">
+  </testcase>
+  <testcase name="test_0002_should fail with name missing" time="0.001375859" assertions="1">
+  </testcase>
+  <testcase name="test_0001_should accept name and value" time="0.002120003" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-CommonParameter-SetCommand.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::CommonParameter::SetCommand" tests="0" time="0.000415733" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-CommonParameter.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::CommonParameter" tests="0" time="0.000435621" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-ComputeResource-CreateCommand-parameters.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::ComputeResource::CreateCommand::parameters" tests="4" time="0.0077544" failures="0" errors="0" skipped="0" assertions="4">
+  <testcase name="test_0001_should accept name, url, provider" time="0.002608991" assertions="1">
+  </testcase>
+  <testcase name="test_0003_should fail with url missing" time="0.001595807" assertions="1">
+  </testcase>
+  <testcase name="test_0002_should fail with name missing" time="0.001607271" assertions="1">
+  </testcase>
+  <testcase name="test_0004_should fail with provider missing" time="0.001621839" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-ComputeResource-CreateCommand.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::ComputeResource::CreateCommand" tests="0" time="0.000234745" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-ComputeResource-DeleteCommand-parameters.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::ComputeResource::DeleteCommand::parameters" tests="3" time="0.00547788" failures="0" errors="0" skipped="0" assertions="3">
+  <testcase name="test_0002_should accept id" time="0.002210935" assertions="1">
+  </testcase>
+  <testcase name="test_0001_should accept name" time="0.001517369" assertions="1">
+  </testcase>
+  <testcase name="test_0003_should fail with name or id missing" time="0.001427866" assertions="1">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/test/reports/TEST-HammerCLIForeman-ComputeResource-DeleteCommand.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="HammerCLIForeman::ComputeResource::DeleteCommand" tests="0" time="0.00042338" failures="0" errors="0" skipped="0" assertions="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>