hammer_cli_foreman 2.5.1 → 3.0.0

data/lib/hammer_cli_foreman/references.rb

@@ -112,14 +112,6 @@ module HammerCLIForeman
       end
     end
 
-    def self.environments(dsl)
-      dsl.build do
-        collection :environments, _("Environments"), :numbered => false do
-          custom_field Fields::Reference
-        end
-      end
-    end
-
     def self.hostgroups(dsl)
       dsl.build do
         collection :hostgroups, _("Hostgroups"), :numbered => false do
@@ -153,14 +145,6 @@ module HammerCLIForeman
       end
     end
 
-    def self.puppetclasses(dsl)
-      dsl.build do
-        collection :puppetclasses, _("Puppetclasses"), :numbered => false do
-          custom_field Fields::Reference
-        end
-      end
-    end
-
     def self.operating_systems(dsl)
       dsl.build do
         collection :operatingsystems, _("Operating systems"), :numbered => false do

data/lib/hammer_cli_foreman/settings.rb

@@ -20,7 +20,7 @@ module HammerCLIForeman
         data
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
@@ -29,7 +29,7 @@ module HammerCLIForeman
       success_message _("Setting [%{name}] updated to [%{value}].")
       failure_message _("Could not update the setting")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -42,7 +42,7 @@ module HammerCLIForeman
         field :value, _("Value")
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 

data/lib/hammer_cli_foreman/smart_proxy.rb

@@ -60,58 +60,6 @@ module HammerCLIForeman
       build_options
     end
 
-
-    class ImportPuppetClassesCommand < HammerCLIForeman::Command
-      action :import_puppetclasses
-
-      command_name    "import-classes"
-
-      option "--dryrun", :flag, _("Do not run the import")
-
-      output do
-        field :message, _("Result"), Fields::LongText
-        collection :results, _("Changed environments"), :hide_blank => true do
-          field :name, nil
-          collection :new_puppetclasses, _("New classes"), :hide_blank => true, :numbered => false do
-            field nil, nil
-          end
-          collection :updated_puppetclasses, _("Updated classes"), :hide_blank => true, :numbered => false do
-            field nil, nil
-          end
-          collection :obsolete_puppetclasses, _("Removed classes"), :hide_blank => true, :numbered => false do
-            field nil, nil
-          end
-          collection :ignored_puppetclasses, _("Ignored classes"), :hide_blank => true, :numbered => false do
-            field nil, nil
-          end
-        end
-      end
-
-      build_options do |o|
-        o.without(:smart_proxy_id, :dryrun)
-        o.expand.except(:smart_proxies)
-      end
-
-      def request_params
-        opts = super
-        opts['dryrun'] = option_dryrun? || false
-        opts
-      end
-
-      def transform_format(data)
-        # Overriding the default behavior that tries to remove nesting
-        # when there's only {"message": "..."}
-        data
-      end
-
-      def print_data(record)
-        print_record(output_definition, record)
-      end
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
-    end
-
-
     class RefreshFeaturesCommand < HammerCLIForeman::Command
 
       action :refresh

data/lib/hammer_cli_foreman/usergroup.rb

@@ -13,7 +13,7 @@ module HammerCLIForeman
         field :admin, _("Admin"), Fields::Boolean
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -25,28 +25,28 @@ module HammerCLIForeman
         HammerCLIForeman::References.timestamps(self)
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
       success_message _("User group [%<name>s] created.")
       failure_message _("Could not create the user group")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       success_message _("User group [%<name>s] updated.")
       failure_message _("Could not update the user group")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message _("User group [%<name>s] deleted.")
       failure_message _("Could not delete the user group")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     HammerCLIForeman::AssociatingCommands::Role.extend_command(self)

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new "2.5.1"
+    @version ||= Gem::Version.new "3.0.0"
   end
 end

data/lib/minitest/coverage_reporter.rb

@@ -3,7 +3,7 @@ require "json"
 module Minitest
   class CoverageRunner
 
-    RESOURCE_BLACK_LIST = ['tasks','home','config_groups','statistics','table_preferences','autosign','puppet_hosts']
+    RESOURCE_BLACK_LIST = ['tasks','home','statistics','table_preferences','autosign']
     attr_reader :raw_data, :api_endpoints, :covered_resources, :uncovered_resources, :partially_covered_resources
     def initialize(file_path)
       @raw_data = JSON.load(File.open(file_path))

data/test/functional/architecture_test.rb

@@ -7,9 +7,9 @@ describe 'architecture' do
     before do
       @cmd = %w[architecture list]
       @architectures = [{
-                      id: 1,
-                      name: 'i386',
-                    }]
+        id: 1,
+        name: 'i386'
+      }]
     end
 
     it 'should return a list of architectures' do
@@ -26,7 +26,7 @@ describe 'architecture' do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -39,6 +39,8 @@ describe 'architecture' do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
       api_expects(:architectures, :index, 'List architectures').returns(@architectures)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })

data/test/functional/bookmark_test.rb

@@ -29,7 +29,7 @@ describe 'bookmark' do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -42,6 +42,8 @@ describe 'bookmark' do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
       api_expects(:bookmarks, :index, 'List bookmarks').returns(@bookmarks)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })

data/test/functional/compute_profile_test.rb

@@ -132,7 +132,7 @@ describe "parameters" do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -145,6 +145,8 @@ describe "parameters" do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
       api_expects(:compute_profiles, :index, 'List compute profiles').returns(@compute_profiles)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })

data/test/functional/host_test.rb

@@ -356,7 +356,6 @@ describe 'host update' do
       'organization_id' => '5',
       'location_id' => '5',
       'compute_attributes' => {},
-      'puppetclass_ids' => [],
       'owner_id' => '1',
       'owner_name' => 'adminGroup',
       'owner_type' => 'Usergroup'

data/test/functional/hostgroup/create_test.rb

@@ -68,25 +68,6 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup create --name hg1 --domain d1))
       end
 
-      it 'allows environment id' do
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --environment-id 1))
-      end
-
-      it 'allows environment name' do
-        api_expects(:environments, :index) do |p|
-          p[:search] = "name = \"env1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --environment env1))
-      end
-
       it 'allows location ids' do
         api_expects(:hostgroups, :create) do |p|
           p['hostgroup']['location_ids'] == ['1','4'] &&
@@ -203,104 +184,6 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup create --name hg1 --partition-table pt1))
       end
 
-      it 'allows puppet ca proxy id' do
-        api_expects(:hostgroups, :create).with_params({
-          :hostgroup => {
-            :name => 'hg1',
-            :puppet_ca_proxy_id => 1
-          }
-        })
-        run_cmd(%w(hostgroup create --name hg1 --puppet-ca-proxy-id 1))
-      end
-
-      it 'allows puppet ca proxy name' do
-        api_expects(:smart_proxies, :index) do |p|
-          p[:search] = "name = \"sp1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppet_ca_proxy_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-ca-proxy sp1))
-      end
-
-      it 'allows puppet class ids' do
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppetclass_ids'] == ['1','2'] &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-class-ids 1,2))
-      end
-
-      it 'allows puppet class names' do
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] = "name = \"pc1\" or name = \"pc2\""
-        end.returns(index_response('puppetclasses' => [
-          {'id' => 1, 'name' => 'pc1'},
-          {'id' => 2, 'name' => 'pc2'}
-        ]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppetclass_ids'] == [1,2] &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-classes pc1,pc2))
-      end
-
-      it 'allows puppet class names that exceeds entries_per_page' do
-        search_objects = []
-        response_objects = []
-        ids = []
-        names = []
-        1100.times.with_object('pc').each do |id, name|
-          next_name = "\"#{name}#{id}\""
-          search_objects << "name = #{next_name}"
-          response_objects << { 'id' => id, 'name' => next_name }
-          ids << id
-          names << next_name
-        end
-
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] == search_objects.join(' or ') &&
-            p[:page].to_i == 1 &&
-            p[:per_page].to_i == HammerCLIForeman::IdResolver::ALL_PER_PAGE
-        end.returns(
-          index_response('puppetclasses' => response_objects[0...1000]))
-
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] == search_objects.join(' or ') &&
-            p[:page].to_i == 2 &&
-            p[:per_page].to_i == HammerCLIForeman::IdResolver::ALL_PER_PAGE
-        end.returns(index_response('puppetclasses' => response_objects[1000...1100]))
-
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['name'] == 'hg1' &&
-            p['hostgroup']['puppetclass_ids'] == ids
-        end
-
-        run_cmd(%w[hostgroup create --name hg1 --puppet-classes] << names.join(',').tr('"', ''))
-      end
-
-      it 'allows puppet proxy id' do
-        api_expects(:hostgroups, :create).with_params({
-          :hostgroup => {
-            :name => 'hg1',
-            :puppet_proxy_id => 1
-          }
-        })
-        run_cmd(%w(hostgroup create --name hg1 --puppet-proxy-id 1))
-      end
-
-      it 'allows puppet proxy name' do
-        api_expects(:smart_proxies, :index) do |p|
-          p[:search] = "name = \"sp1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppet_proxy_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-proxy sp1))
-      end
-
       it 'allows realm id' do
         api_expects(:hostgroups, :create) do |p|
           p['hostgroup']['realm_id'] == 1 &&

data/test/functional/hostgroup/update_test.rb

@@ -68,25 +68,6 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup update --id 1 --domain d1))
       end
 
-      it 'allows environment id' do
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --environment-id 1))
-      end
-
-      it 'allows environment name' do
-        api_expects(:environments, :index) do |p|
-          p[:search] = "name = \"env1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --environment env1))
-      end
-
       it 'allows location ids' do
         api_expects(:hostgroups, :update) do |p|
           p['hostgroup']['location_ids'] == ['1','4'] &&
@@ -201,66 +182,6 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup update --id 1 --partition-table pt1))
       end
 
-      it 'allows puppet ca proxy id' do
-        api_expects(:hostgroups, :update).with_params({
-          :id => '1',
-          :hostgroup => { :puppet_ca_proxy_id => 1 }
-        })
-        run_cmd(%w(hostgroup update --id 1 --puppet-ca-proxy-id 1))
-      end
-
-      it 'allows puppet ca proxy name' do
-        api_expects(:smart_proxies, :index) do |p|
-          p[:search] = "name = \"sp1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['puppet_ca_proxy_id'] == 1 &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --puppet-ca-proxy sp1))
-      end
-
-      it 'allows puppet class ids' do
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['puppetclass_ids'] == ['1','2'] &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --puppet-class-ids 1,2))
-      end
-
-      it 'allows puppet class names' do
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] = "name = \"pc1\" or name = \"pc2\""
-        end.returns(index_response('puppetclasses' => [
-          {'id' => 1, 'name' => 'pc1'},
-          {'id' => 2, 'name' => 'pc2'}
-        ]))
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['puppetclass_ids'] == [1,2] &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --puppet-classes pc1,pc2))
-      end
-
-      it 'allows puppet proxy id' do
-        api_expects(:hostgroups, :update).with_params({
-          :id => '1',
-          :hostgroup => { :puppet_proxy_id => 1 }
-        })
-        run_cmd(%w(hostgroup update --id 1 --puppet-proxy-id 1))
-      end
-
-      it 'allows puppet proxy name' do
-        api_expects(:smart_proxies, :index) do |p|
-          p[:search] = "name = \"sp1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['puppet_proxy_id'] == 1 &&
-            p['id'] == '1'
-        end
-        run_cmd(%w(hostgroup update --id 1 --puppet-proxy sp1))
-      end
-
       it 'allows realm id' do
         api_expects(:hostgroups, :update) do |p|
           p['hostgroup']['realm_id'] == 1 &&