hammer_cli_foreman 2.3.2 → 3.0.0

data/test/unit/config_report_test.rb

@@ -25,6 +25,7 @@ describe HammerCLIForeman::ConfigReport do
       it_should_print_n_records
       it_should_print_column "Id"
       it_should_print_column "Host"
+      it_should_print_column "Origin"
       it_should_print_column "Last report"
       it_should_print_column "Applied"
       it_should_print_column "Restarted"

data/test/unit/helpers/command.rb

@@ -17,14 +17,6 @@ class IdResolverTestProxy
     @original_resolver.searchables(resource)
   end
 
-  def puppet_environment_id(options)
-    environment_id(options)
-  end
-
-  def puppet_environment_ids(options)
-    environment_ids(options)
-  end
-
   protected
 
   def define_id_finders

data/test/unit/host_test.rb

@@ -45,8 +45,7 @@ describe HammerCLIForeman::Host do
       with_params ["--id=1"] do
         it_should_print_n_records 1
         it_should_print_columns ["Id", "Name", "Organization", "Location"]
-        it_should_print_columns ["Host Group", "Compute Resource", "Compute Profile", "Puppet Environment"]
-        it_should_print_columns ["Puppet CA Proxy", "Puppet Master Proxy", "Cert name"]
+        it_should_print_columns ["Host Group", "Compute Resource", "Compute Profile"]
         it_should_print_columns ["Managed", "Status", "Installed at", "Last report"]
         it_should_print_columns ["Network", "Network interfaces", "Operating system", "Parameters", "All parameters", "Additional info"]
       end
@@ -106,32 +105,6 @@ describe HammerCLIForeman::Host do
     end
   end
 
-
-  context "PuppetClassesCommand" do
-    before do
-      ResourceMocks.mock_action_call(:puppetclasses, :index, {})
-    end
-
-    let(:cmd) { HammerCLIForeman::Host::PuppetClassesCommand.new("", ctx) }
-
-    context "parameters" do
-      it_should_accept "host", ["--host=name=my5name.mydomain.net"]
-      it_should_accept "host-id", ["--host-id=1"]
-      # it_should_fail_with "host or host-id missing", []
-      # TODO: temporarily disabled, parameters are checked in the id resolver
-    end
-
-    context "output" do
-
-      with_params ["--host=my5name.mydomain.net"] do
-        it_should_print_column "Id"
-        it_should_print_column "Name"
-      end
-    end
-
-  end
-
-
   context "ConfigReportsCommand" do
     before do
       ResourceMocks.mock_action_call(:config_reports, :index, [])
@@ -186,29 +159,25 @@ describe HammerCLIForeman::Host do
 
     context "parameters" do
       taxonomies = ["--organization-id=1", "--location-id=1"]
-      it_should_accept "name, environment_id, architecture_id, domain_id, puppet_proxy_id, operatingsystem_id and more",
-          ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1",
+      it_should_accept "name, architecture_id, domain_id, operatingsystem_id and more",
+          ["--name=host", "--architecture-id=1", "--domain-id=1", "--operatingsystem-id=1",
             "--ip=1.2.3.4", "--mac=11:22:33:44:55:66", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1",
-            "--model-id=1", "--hostgroup-id=1", "--owner-id=1", '--puppet-ca-proxy-id=1', '--puppet-class-ids',
+            "--model-id=1", "--hostgroup-id=1", "--owner-id=1",
             "--root-password=pwd", "--ask-root-password=true", "--provision-method=build", "--interface=primary=true,provision=true"] + taxonomies
       it_should_fail_with "name or id missing",
-          ["--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
-      it_should_fail_with "environment_id missing",
-          ["--name=host", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
+          ["--architecture-id=1", "--domain-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
       it_should_fail_with "architecture_id missing",
-          ["--name=host", "--environment-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
+          ["--name=host", "--domain-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
       it_should_fail_with "domain_id missing",
-          ["--name=host", "--environment-id=1", "--architecture-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
-      it_should_fail_with "puppet_proxy_id missing",
-          ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
+          ["--name=host", "--architecture-id=1", "--operatingsystem-id=1", "--interface=primary=true,provision=true"]
       it_should_fail_with "operatingsystem_id missing",
-          ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--interface=primary=true,provision=true"]
+          ["--name=host", "--architecture-id=1", "--domain-id=1", "--interface=primary=true,provision=true"]
       it_should_accept "only hostgroup name", ["--hostgroup=example", "--name=host", "--interface=primary=true,provision=true"] + taxonomies
       it_should_accept "only hostgroup ID", ["--hostgroup-id=1", "--name=host", "--interface=primary=true,provision=true"] + taxonomies
 
-      with_params ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1",
+      with_params ["--name=host", "--architecture-id=1", "--domain-id=1", "--operatingsystem-id=1",
             "--ip=1.2.3.4", "--mac=11:22:33:44:55:66", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1",
-            "--model-id=1", "--hostgroup-id=1", "--owner-id=1", '--puppet-ca-proxy-id=1', '--puppet-class-ids',
+            "--model-id=1", "--hostgroup-id=1", "--owner-id=1",
             "--root-password=pwd", "--ask-root-password=true", "--provision-method=build", "--interface=primary=true,provision=true"] do
         it_should_call_action_and_test_params(:create) { |par| par["host"]["managed"] == true }
         it_should_call_action_and_test_params(:create) { |par| par["host"]["build"] == true }
@@ -240,16 +209,16 @@ describe HammerCLIForeman::Host do
 
     context "parameters" do
       it_should_accept "name", ["--name=host", "--new-name=host2"]
-      it_should_accept "id and more", ["--id=1", "--new-name=host2", "--environment-id=1", "--architecture-id=1",
-            "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1",
+      it_should_accept "id and more", ["--id=1", "--new-name=host2", "--architecture-id=1",
+            "--domain-id=1", "--operatingsystem-id=1",
             "--ip=1.2.3.4", "--mac=11:22:33:44:55:66", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1",
-            "--model-id=1", "--hostgroup-id=1", "--owner-id=1", '--puppet-ca-proxy-id=1',
+            "--model-id=1", "--hostgroup-id=1", "--owner-id=1",
             "--root-password=pwd", "--ask-root-password=true", "--provision-method=build"]
       # it_should_fail_with "no params", []
       # it_should_fail_with "name or id missing", ["--new-name=host2"]
       # TODO: temporarily disabled, parameters are checked in the id resolver
 
-      with_params ["--id=1", "--puppet-proxy-id=1"] do
+      with_params ["--id=1"] do
         it_should_call_action_and_test_params(:update) { |par| par["host"].key?("managed") != true }
         it_should_call_action_and_test_params(:update) { |par| par["host"].key?("build") != true }
         it_should_call_action_and_test_params(:update) { |par| par["host"].key?("enabled") != true }
@@ -350,22 +319,6 @@ describe HammerCLIForeman::Host do
     end
   end
 
-  context "SCParamsCommand" do
-
-    before :each do
-      ResourceMocks.smart_class_parameters_index
-    end
-
-    let(:cmd) { HammerCLIForeman::Host::SCParamsCommand.new("", ctx) }
-
-    context "parameters" do
-      it_should_accept "host", ["--host=host"]
-      it_should_accept "host-id", ["--host-id=1"]
-      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
-    end
-
-  end
-
   context "RebuildConfigCommand" do
 
     let(:cmd) { HammerCLIForeman::Host::RebuildConfigCommand.new("", ctx) }

data/test/unit/hostgroup_test.rb

@@ -24,7 +24,7 @@ describe HammerCLIForeman::Hostgroup do
 
       it_should_print_n_records
       it_should_print_columns ["Id", "Name", "Title", "Operating System"]
-      it_should_print_columns ["Puppet Environment", "Model"]
+      it_should_print_columns ["Model"]
     end
 
   end
@@ -42,8 +42,6 @@ describe HammerCLIForeman::Hostgroup do
       with_params ["--id=1"] do
         it_should_print_n_records 1
         it_should_print_columns ["Id", "Name", "Title"]
-        it_should_print_columns ["Puppet Environment", "Puppetclasses", "Parent"]
-        it_should_print_columns ["Puppet CA Proxy", "Puppet Master Proxy"]
         it_should_print_columns ["Parameters", "Description"]
         it_should_print_columns ["Network", "Operating system"]
       end
@@ -67,9 +65,9 @@ describe HammerCLIForeman::Hostgroup do
     let(:cmd) { HammerCLIForeman::Hostgroup::CreateCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, parent_id, environment_id, architecture_id, domain_id, puppet_proxy_id, operatingsystem_id and more",
-          ["--name=hostgroup", "--parent-id=1", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1",
-            "--operatingsystem-id=1", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1", '--puppet-ca-proxy-id=1', '--puppet-class-ids=1,2', '--root-pass=foreman']
+      it_should_accept "name, parent_id, architecture_id, domain_id, operatingsystem_id and more",
+          ["--name=hostgroup", "--parent-id=1", "--architecture-id=1", "--domain-id=1",
+            "--operatingsystem-id=1", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1", '--root-password=foreman']
       # it_should_fail_with "name or id missing",
       #    ["--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1"]
       # TODO: temporarily disabled, parameters are checked in the api
@@ -81,9 +79,9 @@ describe HammerCLIForeman::Hostgroup do
     let(:cmd) { HammerCLIForeman::Hostgroup::UpdateCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, parent_id, environment_id, architecture_id, domain_id, puppet_proxy_id, operatingsystem_id and more",
-          ["--id=1 --name=hostgroup2 --title=default/hostgroup2", "--parent-id=1", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1",
-            "--operatingsystem-id=1", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1", '--puppet-ca-proxy-id=1', '--puppet-class-ids=1,2', '--root-pass=foreman']
+      it_should_accept "name, parent_id, architecture_id, domain_id, operatingsystem_id and more",
+          ["--id=1 --name=hostgroup2 --title=default/hostgroup2", "--parent-id=1", "--architecture-id=1", "--domain-id=1",
+            "--operatingsystem-id=1", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1", '--root-password=foreman']
       # it_should_fail_with "no params", []
       # it_should_fail_with "id missing", ["--name=host2"]
       # TODO: temporarily disabled, parameters are checked in the id resolver
@@ -123,23 +121,6 @@ describe HammerCLIForeman::Hostgroup do
 
   end
 
-
-  context "SCParamsCommand" do
-
-    before :each do
-      ResourceMocks.smart_class_parameters_index
-    end
-
-    let(:cmd) { HammerCLIForeman::Hostgroup::SCParamsCommand.new("", ctx) }
-
-    context "parameters" do
-      it_should_accept "hostgroup", ["--hostgroup=hostgroup"]
-      it_should_accept "hostgroup-id", ["--hostgroup-id=1"]
-      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
-    end
-
-  end
-
   context "RebuildConfigCommand" do
 
     let(:cmd) { HammerCLIForeman::Hostgroup::RebuildConfigCommand.new("", ctx) }

data/test/unit/id_resolver_test.rb

@@ -213,34 +213,6 @@ describe HammerCLIForeman::IdResolver do
       end
     end
 
-    describe 'searching for puppetclasses' do
-      before do
-        ResourceMocks.mock_action_call(:puppetclasses, :index, {
-          'apache' => [
-            { 'id' => 70, 'name' => 'apache::dev', 'created_at' => '2015-01-27T07:24:57.134Z', 'updated_at' => '2015-03-05T17:27:54.282Z' },
-            { 'id' => 27, 'name' => 'apache::mod::authnz_ldap', 'created_at' => '2015-01-27T07:24:56.378Z','updated_at' => '2015-01-27T07:24:56.378Z' }
-          ],
-          'git' => [
-            { 'id' => 85, 'name' => 'git::params', 'created_at' => '2015-01-27T07:24:57.306Z', 'updated_at' => '2015-01-27T07:24:57.306Z' }
-          ]
-        })
-      end
-
-      it "returns ids from options" do
-        result = resolver.user_ids({"option_ids" => [4, 5], "option_names" => ['apache::dev']})
-        assert_equal [4, 5], result
-      end
-
-      it "returns ids of the classes" do
-        class_names = ['apache::mod::authnz_ldap', 'git::params', 'apache::dev']
-        assert_equal [70, 27, 85], resolver.puppetclass_ids('option_names' => class_names)
-      end
-
-      it 'returns empty array for empty class array' do
-        assert_equal [], resolver.puppetclass_ids('option_names' => [])
-      end
-    end
-
     describe "searching for multiple resources" do
       it "returns ids from options" do
         result = resolver.user_ids({"option_ids" => [4, 5], "option_names" => ["some", "names"]})

data/test/unit/mail_notification_test.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
+
+require 'hammer_cli_foreman/mail_notification'
+
+describe HammerCLIForeman::MailNotification do
+  include CommandTestHelper
+
+  context 'ListCommand' do
+    before :each do
+      ResourceMocks.mail_notifications
+    end
+
+    let(:cmd) { HammerCLIForeman::MailNotification::ListCommand.new('', ctx) }
+
+    context 'parameters' do
+      it_should_accept 'no arguments'
+      it_should_accept 'organization', ['--organization-id=1']
+      it_should_accept 'location', ['--location-id=1']
+    end
+
+    context 'output' do
+      let(:expected_record_count) { count_records(cmd.resource.call(:index)) }
+
+      it_should_print_n_records
+      it_should_print_column 'Id'
+      it_should_print_column 'Name'
+    end
+  end
+
+  context 'InfoCommand' do
+    let(:cmd) { HammerCLIForeman::MailNotification::InfoCommand.new('', ctx) }
+
+    context 'parameters' do
+      it_should_accept 'id', ['--id=1']
+      it_should_accept 'name', ['--name=test']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
+    end
+
+    context 'output' do
+      with_params ['--id=1'] do
+        it_should_print_n_records 1
+        it_should_print_column 'Id'
+        it_should_print_column 'Name'
+        it_should_print_column 'Description'
+        it_should_print_column 'Subscription type'
+      end
+    end
+  end
+end

data/test/unit/model_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.join(File.dirname(__FILE__), 'test_helper')
 require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
@@ -7,62 +8,67 @@ describe HammerCLIForeman::Model do
 
   include CommandTestHelper
 
-  context "ListCommand" do
+  context 'ListCommand' do
     before do
       ResourceMocks.mock_action_call(:models, :index, [])
     end
 
-    let(:cmd) { HammerCLIForeman::Model::ListCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Model::ListCommand.new('', ctx) }
 
-    context "parameters" do
-      it_should_accept "no arguments"
+    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
+    context 'output' do
       let(:expected_record_count) { count_records(cmd.resource.call(:index)) }
 
       it_should_print_n_records
-      it_should_print_column "Name"
-      it_should_print_column "Id"
-      it_should_print_column "Vendor class"
-      it_should_print_column "HW model"
+      it_should_print_column 'Name'
+      it_should_print_column 'Id'
+      it_should_print_column 'Vendor class'
+      it_should_print_column 'HW model'
     end
   end
 
 
-  context "InfoCommand" do
+  context 'InfoCommand' do
 
-    let(:cmd) { HammerCLIForeman::Model::InfoCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Model::InfoCommand.new('', ctx) }
 
-    context "parameters" do
-      it_should_accept "id", ["--id=1"]
-      it_should_accept "name", ["--name=model"]
+    context 'parameters' do
+      it_should_accept 'id', ['--id=1']
+      it_should_accept 'name', ['--name=model']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
       # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
-    context "output" do
-      with_params ["--id=1"] do
+    context 'output' do
+      with_params ['--id=1'] do
         it_should_print_n_records 1
-        it_should_print_column "Name"
-        it_should_print_column "Id"
-        it_should_print_column "Vendor class"
-        it_should_print_column "HW model"
-        it_should_print_column "Info"
-        it_should_print_column "Created at"
-        it_should_print_column "Updated at"
+        it_should_print_column 'Name'
+        it_should_print_column 'Id'
+        it_should_print_column 'Vendor class'
+        it_should_print_column 'HW model'
+        it_should_print_column 'Info'
+        it_should_print_column 'Created at'
+        it_should_print_column 'Updated at'
       end
     end
 
   end
 
 
-  context "CreateCommand" do
+  context 'CreateCommand' do
 
-    let(:cmd) { HammerCLIForeman::Model::CreateCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Model::CreateCommand.new('', ctx) }
 
-    context "parameters" do
-      it_should_accept "name", ["--name=model", "--info=description", "--vendor-class=class", "--hardware-model=model"]
+    context 'parameters' do
+      it_should_accept 'name, info, vendor-class, hardware-model, organization, location',
+                       %w[--name=model --info=description --vendor-class=class --hardware-model=model --organization-id=1 --location-id=1]
       # it_should_fail_with "name missing", ["--info=description", "--vendor-class=class", "--hardware-model=model"]
       # TODO: temporarily disabled, parameters are checked in the api
     end
@@ -70,26 +76,30 @@ describe HammerCLIForeman::Model do
   end
 
 
-  context "DeleteCommand" do
+  context 'DeleteCommand' do
 
-    let(:cmd) { HammerCLIForeman::Model::DeleteCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Model::DeleteCommand.new('', ctx) }
 
-    context "parameters" do
-      it_should_accept "name", ["--name=model"]
-      it_should_accept "id", ["--id=1"]
+    context 'parameters' do
+      it_should_accept 'name', ['--name=model']
+      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]
       # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
 
 
-  context "UpdateCommand" do
+  context 'UpdateCommand' do
 
-    let(:cmd) { HammerCLIForeman::Model::UpdateCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Model::UpdateCommand.new('', ctx) }
 
-    context "parameters" do
-      it_should_accept "name", ["--name=model", "--new-name=model2", "--info=description", "--vendor-class=class", "--hardware-model=model"]
-      it_should_accept "id", ["--id=1", "--new-name=model2", "--info=description", "--vendor-class=class", "--hardware-model=model"]
+    context 'parameters' do
+      it_should_accept 'name', ['--name=model', '--new-name=model2', '--info=description', '--vendor-class=class', '--hardware-model=model']
+      it_should_accept 'id', ['--id=1', '--new-name=model2', '--info=description', '--vendor-class=class', '--hardware-model=model']
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
       # it_should_fail_with "no params", []
       # it_should_fail_with "name or id missing", ["--new-name=model2", "--info=description", "--vendor-class=class", "--hardware-model=model"]
       # TODO: temporarily disabled, parameters are checked in the id resolver

data/test/unit/operating_system_test.rb

@@ -18,6 +18,8 @@ describe HammerCLIForeman::OperatingSystem 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
@@ -40,6 +42,8 @@ describe HammerCLIForeman::OperatingSystem do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "title", ["--title=Rhel 6.5"]
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
       # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
@@ -69,7 +73,8 @@ describe HammerCLIForeman::OperatingSystem do
     let(:cmd) { HammerCLIForeman::OperatingSystem::CreateCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, major, minor, family, release name", ["--name=media", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
+      it_should_accept "name, major, minor, family, release name, organization, location",
+                       ["--name=media", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome", "--organization-id=1", "--location-id=1"]
       # it_should_fail_with "name missing", ["--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
       # TODO: temporarily disabled, parameters are checked in the api
     end
@@ -87,6 +92,8 @@ describe HammerCLIForeman::OperatingSystem do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "title", ["--title=Rhel 6.5"]
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
       # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
       # TODO: temporarily disabled, parameters are checked in the id resolver
     end
@@ -101,7 +108,8 @@ describe HammerCLIForeman::OperatingSystem do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "title", ["--title=Rhel 6.5"]
-      it_should_accept "name, major, minor, family, release name", ["--id=83", "--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
+      it_should_accept "name, major, minor, family, release name, organization, location",
+                       ["--id=83", "--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome", "--organization-id=1", "--location-id=1"]
       # it_should_fail_with "no params", []
       # it_should_fail_with "label or id missing", ["--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
       # TODO: temporarily disabled, parameters are checked in the id resolver
@@ -148,5 +156,4 @@ describe HammerCLIForeman::OperatingSystem do
     end
 
   end
-
 end