hammer_cli_foreman_puppet 0.0.3 → 0.0.6

data/test/functional/host/create_test.rb

@@ -25,7 +25,7 @@ module HammerCLIForemanPuppet
           p[:search] == 'name = "env1"'
         end.returns(index_response([{ 'id' => 1 }]))
         api_expects(:hosts, :create) do |p|
-          p['host']['environment_id'] == 1 &&
+          p['host']['puppet_attributes']['environment_id'] == 1 &&
             p['host']['name'] == 'hst1'
         end
         run_cmd(cmd + minimal_params_without_hostgroup + params)
@@ -59,7 +59,7 @@ module HammerCLIForemanPuppet
       it 'allows puppet class ids' do
         params = %w[--puppet-class-ids=1,2]
         api_expects(:hosts, :create) do |p|
-          p['host']['puppetclass_ids'] == %w[1 2] &&
+          p['host']['puppet_attributes']['puppetclass_ids'] == %w[1 2] &&
             p['host']['name'] == 'hst1'
         end
         run_cmd(cmd + minimal_params_without_hostgroup + params)
@@ -81,7 +81,7 @@ module HammerCLIForemanPuppet
           {'id' => 2, 'name' => 'pc2'}
         ]))
         api_expects(:hosts, :create) do |p|
-          p['host']['puppetclass_ids'] == [1,2] &&
+          p['host']['puppet_attributes']['puppetclass_ids'] == [1,2] &&
             p['host']['name'] == 'hst1'
         end
         run_cmd(cmd + minimal_params_without_hostgroup + params)
@@ -130,7 +130,7 @@ module HammerCLIForemanPuppet
 
         api_expects(:hosts, :create) do |p|
           p['host']['name'] == 'hst1' &&
-            p['host']['puppetclass_ids'] == ids
+            p['host']['puppet_attributes']['puppetclass_ids'] == ids
         end
         run_cmd(cmd + minimal_params_without_hostgroup + params)
       end
@@ -159,6 +159,37 @@ module HammerCLIForemanPuppet
         end
         run_cmd(cmd + minimal_params_without_hostgroup + params)
       end
+
+      it 'allows config group ids' do
+        params = %w[--config-group-ids=1,2]
+        api_expects(:hosts, :create) do |p|
+          p['host']['puppet_attributes']['config_group_ids'] == %w[1 2] &&
+            p['host']['name'] == 'hst1'
+        end
+        run_cmd(cmd + minimal_params_without_hostgroup + params)
+      end
+
+      it 'allows config group names' do
+        params = %w[--config-groups=cg1,cg2]
+        api_expects(:config_groups, :index) do |p|
+          p[:search] = 'name = "cg1" or name = "cg2"'
+        end.returns(index_response([
+          {'id' => 1, 'name' => 'cg1'},
+          {'id' => 2, 'name' => 'cg2'}
+        ]))
+        # FIXME: Called twice because of config_group_ids being mentioned twice in the docs
+        api_expects(:config_groups, :index) do |p|
+          p[:search] = 'name = "cg1" or name = "cg2"'
+        end.returns(index_response([
+          {'id' => 1, 'name' => 'cg1'},
+          {'id' => 2, 'name' => 'cg2'}
+        ]))
+        api_expects(:hosts, :create) do |p|
+          p['host']['puppet_attributes']['config_group_ids'] == [1, 2] &&
+            p['host']['name'] == 'hst1'
+        end
+        run_cmd(cmd + minimal_params_without_hostgroup + params)
+      end
     end
   end
 end

data/test/functional/host/update_test.rb

@@ -5,7 +5,7 @@ module HammerCLIForemanPuppet
     describe UpdateCommand do
       it 'allows environment id' do
         api_expects(:hosts, :update) do |p|
-          p['host']['environment_id'] == 1 &&
+          p['host']['puppet_attributes']['environment_id'] == 1 &&
             p['id'] == '1'
         end
         run_cmd(%w(host update --id 1 --puppet-environment-id 1))
@@ -20,7 +20,7 @@ module HammerCLIForemanPuppet
           p[:search] = "name = \"env1\""
         end.returns(index_response([{'id' => 1}]))
         api_expects(:hosts, :update) do |p|
-          p['host']['environment_id'] == 1 &&
+          p['host']['puppet_attributes']['environment_id'] == 1 &&
             p['id'] == '1'
         end
         run_cmd(%w(host update --id 1 --puppet-environment env1))
@@ -47,7 +47,7 @@ module HammerCLIForemanPuppet
 
       it 'allows puppet class ids' do
         api_expects(:hosts, :update) do |p|
-          p['host']['puppetclass_ids'] == ['1','2'] &&
+          p['host']['puppet_attributes']['puppetclass_ids'] == ['1','2'] &&
             p['id'] == '1'
         end
         run_cmd(%w(host update --id 1 --puppet-class-ids 1,2))
@@ -68,7 +68,7 @@ module HammerCLIForemanPuppet
           {'id' => 2, 'name' => 'pc2'}
         ]))
         api_expects(:hosts, :update) do |p|
-          p['host']['puppetclass_ids'] == [1,2] &&
+          p['host']['puppet_attributes']['puppetclass_ids'] == [1,2] &&
             p['id'] == '1'
         end
         run_cmd(%w(host update --id 1 --puppet-classes pc1,pc2))
@@ -92,6 +92,35 @@ module HammerCLIForemanPuppet
         end
         run_cmd(%w(host update --id 1 --puppet-proxy sp1))
       end
+
+      it 'allows config group ids' do
+        api_expects(:hosts, :update) do |p|
+          p['host']['puppet_attributes']['config_group_ids'] == %w[1 2] &&
+            p['id'] == '1'
+        end
+        run_cmd(%w[host update --id 1 --config-group-ids=1,2])
+      end
+
+      it 'allows config group names' do
+        api_expects(:config_groups, :index) do |p|
+          p[:search] = 'name = "cg1" or name = "cg2"'
+        end.returns(index_response([
+          {'id' => 1, 'name' => 'cg1'},
+          {'id' => 2, 'name' => 'cg2'}
+        ]))
+        # FIXME: Called twice because of config_group_ids being mentioned twice in the docs
+        api_expects(:config_groups, :index) do |p|
+          p[:search] = 'name = "cg1" or name = "cg2"'
+        end.returns(index_response([
+          {'id' => 1, 'name' => 'cg1'},
+          {'id' => 2, 'name' => 'cg2'}
+        ]))
+        api_expects(:hosts, :update) do |p|
+          p['host']['puppet_attributes']['config_group_ids'] == [1, 2] &&
+            p['id'] == '1'
+        end
+        run_cmd(%w[host update --id 1 --config-groups=cg1,cg2])
+      end
     end
   end
 end

data/test/functional/hostgroup/create_test.rb

@@ -5,7 +5,7 @@ module HammerCLIForemanPuppet
     describe CreateCommand do
       it 'allows puppet environment id' do
         api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
+          p['hostgroup']['puppet_attributes']['environment_id'] == 1 &&
             p['hostgroup']['name'] == 'hg1'
         end
         run_cmd(%w[hostgroup create --name hg1 --puppet-environment-id 1])
@@ -20,7 +20,7 @@ module HammerCLIForemanPuppet
           p[:search] == 'name = "env1"'
         end.returns(index_response([{ 'id' => 1 }]))
         api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
+          p['hostgroup']['puppet_attributes']['environment_id'] == 1 &&
             p['hostgroup']['name'] == 'hg1'
         end
         run_cmd(%w[hostgroup create --name hg1 --puppet-environment env1])
@@ -49,7 +49,7 @@ module HammerCLIForemanPuppet
 
       it 'allows puppet class ids' do
         api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppetclass_ids'] == ['1','2'] &&
+          p['hostgroup']['puppet_attributes']['puppetclass_ids'] == ['1','2'] &&
             p['hostgroup']['name'] == 'hg1'
         end
         run_cmd(%w(hostgroup create --name hg1 --puppet-class-ids 1,2))
@@ -70,7 +70,7 @@ module HammerCLIForemanPuppet
           {'id' => 2, 'name' => 'pc2'}
         ]))
         api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppetclass_ids'] == [1,2] &&
+          p['hostgroup']['puppet_attributes']['puppetclass_ids'] == [1,2] &&
             p['hostgroup']['name'] == 'hg1'
         end
         run_cmd(%w(hostgroup create --name hg1 --puppet-classes pc1,pc2))
@@ -118,7 +118,7 @@ module HammerCLIForemanPuppet
 
         api_expects(:hostgroups, :create) do |p|
           p['hostgroup']['name'] == 'hg1' &&
-            p['hostgroup']['puppetclass_ids'] == ids
+            p['hostgroup']['puppet_attributes']['puppetclass_ids'] == ids
         end
 
         run_cmd(%w[hostgroup create --name hg1 --puppet-classes] << names.join(',').tr('"', ''))
@@ -144,6 +144,35 @@ module HammerCLIForemanPuppet
         end
         run_cmd(%w(hostgroup create --name hg1 --puppet-proxy sp1))
       end
+
+      it 'allows config group ids' do
+        api_expects(:hostgroups, :create) do |p|
+          p['hostgroup']['puppet_attributes']['config_group_ids'] == %w[1 2] &&
+            p['hostgroup']['name'] == 'hg1'
+        end
+        run_cmd(%w[hostgroup create --name hg1 --config-group-ids 1,2])
+      end
+
+      it 'allows config group names' do
+        api_expects(:config_groups, :index) do |p|
+          p[:search] = 'name = "cg1" or name = "cg2"'
+        end.returns(index_response([
+          {'id' => 1, 'name' => 'cg1'},
+          {'id' => 2, 'name' => 'cg2'}
+        ]))
+        # FIXME: Called twice because of config_group_ids being mentioned twice in the docs
+        api_expects(:config_groups, :index) do |p|
+          p[:search] = 'name = "cg1" or name = "cg2"'
+        end.returns(index_response([
+          {'id' => 1, 'name' => 'cg1'},
+          {'id' => 2, 'name' => 'cg2'}
+        ]))
+        api_expects(:hostgroups, :create) do |p|
+          p['hostgroup']['puppet_attributes']['config_group_ids'] == [1, 2] &&
+            p['hostgroup']['name'] == 'hg1'
+        end
+        run_cmd(%w[hostgroup create --name hg1 --config-groups cg1,cg2])
+      end
     end
   end
 end

data/test/functional/hostgroup/update_test.rb

@@ -5,7 +5,7 @@ module HammerCLIForemanPuppet
     describe UpdateCommand do
       it 'allows environment id' do
         api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
+          p['hostgroup']['puppet_attributes']['environment_id'] == 1 &&
             p['id'] == '1'
         end
         run_cmd(%w(hostgroup update --id 1 --puppet-environment-id 1))
@@ -20,7 +20,7 @@ module HammerCLIForemanPuppet
           p[:search] = "name = \"env1\""
         end.returns(index_response([{'id' => 1}]))
         api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
+          p['hostgroup']['puppet_attributes']['environment_id'] == 1 &&
             p['id'] == '1'
         end
         run_cmd(%w(hostgroup update --id 1 --puppet-environment env1))
@@ -47,7 +47,7 @@ module HammerCLIForemanPuppet
 
       it 'allows puppet class ids' do
         api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['puppetclass_ids'] == ['1','2'] &&
+          p['hostgroup']['puppet_attributes']['puppetclass_ids'] == ['1','2'] &&
             p['id'] == '1'
         end
         run_cmd(%w(hostgroup update --id 1 --puppet-class-ids 1,2))
@@ -68,7 +68,7 @@ module HammerCLIForemanPuppet
           {'id' => 2, 'name' => 'pc2'}
         ]))
         api_expects(:hostgroups, :update) do |p|
-          p['hostgroup']['puppetclass_ids'] == [1,2] &&
+          p['hostgroup']['puppet_attributes']['puppetclass_ids'] == [1,2] &&
             p['id'] == '1'
         end
         run_cmd(%w(hostgroup update --id 1 --puppet-classes pc1,pc2))
@@ -92,6 +92,35 @@ module HammerCLIForemanPuppet
         end
         run_cmd(%w(hostgroup update --id 1 --puppet-proxy sp1))
       end
+
+      it 'allows config group ids' do
+        api_expects(:hostgroups, :update) do |p|
+          p['hostgroup']['puppet_attributes']['config_group_ids'] == %w[1 2] &&
+            p['id'] == '1'
+        end
+        run_cmd(%w[hostgroup update --id 1 --config-group-ids 1,2])
+      end
+
+      it 'allows config group names' do
+        api_expects(:config_groups, :index) do |p|
+          p[:search] = 'name = "cg1" or name = "cg2"'
+        end.returns(index_response([
+          {'id' => 1, 'name' => 'cg1'},
+          {'id' => 2, 'name' => 'cg2'}
+        ]))
+        # FIXME: Called twice because of config_group_ids being mentioned twice in the docs
+        api_expects(:config_groups, :index) do |p|
+          p[:search] = 'name = "cg1" or name = "cg2"'
+        end.returns(index_response([
+          {'id' => 1, 'name' => 'cg1'},
+          {'id' => 2, 'name' => 'cg2'}
+        ]))
+        api_expects(:hostgroups, :update) do |p|
+          p['hostgroup']['puppet_attributes']['config_group_ids'] == [1, 2] &&
+            p['id'] == '1'
+        end
+        run_cmd(%w[hostgroup update --id 1 --config-groups cg1,cg2])
+      end
     end
   end
 end

data/test/functional/template_test.rb

@@ -10,10 +10,10 @@ describe 'template' do
       params = ['create', '--provisioning-template-id=10', '--hostgroup-id=1', '--puppet-environment-id=1']
       expected_result = success_result("Template combination created.\n")
       api_expects(:template_combinations, :create, 'Create template combination') do |p|
-        p['provisioning_template_id'] == 10 &&
-          p['hostgroup_id'] == 1 &&
+        p['provisioning_template_id'] == '10' &&
+          p['hostgroup_id'] == '1' &&
           p['environment_id'] == 1 &&
-          p['template_combination'] == { 'environment_id' => 1, 'hostgroup_id' => 1 }
+          p['template_combination'] == { 'environment_id' => 1, 'hostgroup_id' => '1' }
       end
 
       result = run_cmd(@cmd + params)
@@ -25,10 +25,10 @@ describe 'template' do
       expected_result = success_result("Template combination updated.\n")
       api_expects(:template_combinations, :update, 'Update template combination') do |p|
         p['id'] == '3' &&
-          p['provisioning_template_id'] == 10 &&
-          p['hostgroup_id'] == 1 &&
+          p['provisioning_template_id'] == '10' &&
+          p['hostgroup_id'] == '1' &&
           p['environment_id'] == 1 &&
-          p['template_combination'] == { 'environment_id' => 1, 'hostgroup_id' => 1 }
+          p['template_combination'] == { 'environment_id' => 1, 'hostgroup_id' => '1' }
       end
 
       result = run_cmd(@cmd + params)

data/test/test_helper.rb

@@ -17,7 +17,7 @@ require "mocha/minitest"
 require 'hammer_cli'
 require 'hammer_cli/testing/command_assertions'
 require 'hammer_cli_foreman/testing/api_expectations'
-FOREMAN_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '3.0')
+FOREMAN_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '3.3')
 
 include HammerCLI::Testing::CommandAssertions
 include HammerCLIForeman::Testing::APIExpectations

data/test/unit/config_group_test.rb

@@ -16,8 +16,6 @@ describe HammerCLIForemanPuppet::ConfigGroup do
     context "parameters" do
       it_should_accept "no arguments"
       it_should_accept_search_params
-      it_should_accept 'organization', ['--organization-id=1']
-      it_should_accept 'location', ['--location-id=1']
     end
 
     context "output" do
@@ -33,8 +31,6 @@ describe HammerCLIForemanPuppet::ConfigGroup do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=group_x"]
-      it_should_accept 'organization', %w[--id=1 --organization-id=1]
-      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
 
     context "output" do
@@ -51,8 +47,8 @@ describe HammerCLIForemanPuppet::ConfigGroup do
     let(:cmd) { HammerCLIForemanPuppet::ConfigGroup::CreateCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept 'name, puppetclass ids, location, organization',
-                       %w[--name=first_group --puppet-class-ids=1,2 --location-id=1 --organization-id=1]
+      it_should_accept 'name, puppetclass ids',
+                       %w[--name=first_group --puppet-class-ids=1,2]
     end
   end
 
@@ -62,8 +58,6 @@ describe HammerCLIForemanPuppet::ConfigGroup do
     context "parameters" do
       it_should_accept "name", ["--name=group_x"]
       it_should_accept "id", ["--id=1"]
-      it_should_accept 'organization', %w[--id=1 --organization-id=1]
-      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
   end
 
@@ -74,8 +68,6 @@ describe HammerCLIForemanPuppet::ConfigGroup do
     context "parameters" do
       it_should_accept "name", ["--name=group_x"]
       it_should_accept "id", ["--id=1"]
-      it_should_accept 'organization', %w[--id=1 --organization-id=1]
-      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - Amir Fefer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -30,7 +30,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
-description:
+description: 
 email:
 - amirfefer@gmail.com
 executables: []
@@ -42,10 +42,10 @@ files:
 - config/foreman_puppet.yml
 - lib/hammer_cli_foreman_puppet.rb
 - lib/hammer_cli_foreman_puppet/associating_commands.rb
-- lib/hammer_cli_foreman_puppet/associating_commands/associating_commands.rb
 - lib/hammer_cli_foreman_puppet/class.rb
 - lib/hammer_cli_foreman_puppet/combination.rb
 - lib/hammer_cli_foreman_puppet/command_extensions.rb
+- lib/hammer_cli_foreman_puppet/command_extensions/combination.rb
 - lib/hammer_cli_foreman_puppet/command_extensions/environment.rb
 - lib/hammer_cli_foreman_puppet/command_extensions/environments.rb
 - lib/hammer_cli_foreman_puppet/command_extensions/host.rb
@@ -65,12 +65,12 @@ files:
 - lib/hammer_cli_foreman_puppet/option_sources/puppet_environment_params.rb
 - lib/hammer_cli_foreman_puppet/organization.rb
 - lib/hammer_cli_foreman_puppet/puppet_references.rb
-- lib/hammer_cli_foreman_puppet/references.rb
 - lib/hammer_cli_foreman_puppet/smart_class_parameter.rb
 - lib/hammer_cli_foreman_puppet/smart_proxy.rb
 - lib/hammer_cli_foreman_puppet/version.rb
 - test/data/2.1/foreman_api.json
 - test/data/3.0/foreman_api.json
+- test/data/3.3/foreman_api.json
 - test/data/README.md
 - test/functional/config_group_test.rb
 - test/functional/host/create_test.rb
@@ -96,7 +96,7 @@ homepage: https://github.com/theforeman/hammer-cli-foreman-puppet
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -111,32 +111,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Foreman Puppet plugin for Hammer CLI
 test_files:
-- test/functional/test_helper.rb
-- test/functional/smart_class_parameter_test.rb
-- test/functional/config_group_test.rb
-- test/functional/proxy_test.rb
-- test/functional/template_test.rb
-- test/functional/host/create_test.rb
-- test/functional/host/update_test.rb
-- test/functional/hostgroup/create_test.rb
-- test/functional/hostgroup/update_test.rb
-- test/test_helper.rb
-- test/unit/puppet_environment_test.rb
-- test/unit/test_helper.rb
-- test/unit/smart_class_parameter_test.rb
 - test/unit/config_group_test.rb
-- test/unit/test_output_adapter.rb
+- test/unit/smart_class_parameter_test.rb
 - test/unit/helpers/resource_disabled.rb
 - test/unit/helpers/command.rb
 - test/unit/helpers/fake_searchables.rb
-- test/unit/puppet_class_test.rb
+- test/unit/test_helper.rb
+- test/unit/test_output_adapter.rb
 - test/unit/apipie_resource_mock.rb
-- test/data/README.md
+- test/unit/puppet_environment_test.rb
+- test/unit/puppet_class_test.rb
+- test/functional/config_group_test.rb
+- test/functional/smart_class_parameter_test.rb
+- test/functional/test_helper.rb
+- test/functional/template_test.rb
+- test/functional/hostgroup/create_test.rb
+- test/functional/hostgroup/update_test.rb
+- test/functional/host/create_test.rb
+- test/functional/host/update_test.rb
+- test/functional/proxy_test.rb
+- test/test_helper.rb
 - test/data/2.1/foreman_api.json
 - test/data/3.0/foreman_api.json
+- test/data/3.3/foreman_api.json
+- test/data/README.md

data/lib/hammer_cli_foreman_puppet/associating_commands/associating_commands.rb

@@ -1,40 +0,0 @@
-module HammerCLIForemanPuppet
-  module AssociatingCommands
-    module ExtendCommands
-      def create_subcommand(name = :PuppetEnvironment)
-        commands = constants.select { |c| c.to_s.include? name.to_s }.map { |p| const_get(p)}
-        commands.each do |command|
-          subcommand(command.command_name, command.desc, command, warning: command.warning)
-        end
-      end
-    end
-
-    module PuppetEnvironment
-      extend HammerCLIForeman::AssociatingCommands::CommandExtension
-
-      class AddPuppetEnvironmentCommand < HammerCLIForemanPuppet::AddAssociatedCommand
-        include EnvironmentNameMapping
-        associated_resource :environments
-        desc _('Associate a Puppet environment')
-        command_name "add-environment"
-
-        success_message _("The environment has been associated.")
-        failure_message _("Could not associate the environment")
-
-        extend_with(HammerCLIForemanPuppet::CommandExtensions::PuppetEnvironment.new)
-      end
-
-      class RemovePuppetEnvironmentCommand < HammerCLIForemanPuppet::RemoveAssociatedCommand
-        include EnvironmentNameMapping
-        associated_resource :environments
-        desc _('Disassociate a Puppet environment')
-        command_name "remove-environment"
-
-        success_message _("The environment has been disassociated.")
-        failure_message _("Could not disassociate the environment")
-
-        extend_with(HammerCLIForemanPuppet::CommandExtensions::PuppetEnvironment.new)
-      end
-    end
-  end
-end

data/lib/hammer_cli_foreman_puppet/references.rb

@@ -1,22 +0,0 @@
-module HammerCLIForemanPuppet
-
-  module References
-
-    def self.environments(dsl)
-      dsl.build do
-        collection :environments, _("Environments"), :numbered => false do
-          custom_field Fields::Reference
-        end
-      end
-    end
-
-    def self.puppetclasses(dsl)
-      dsl.build do
-        collection :puppetclasses, _("Puppetclasses"), :numbered => false do
-          custom_field Fields::Reference
-        end
-      end
-    end
-
-  end
-end