hammer_cli_foreman 0.16.0 → 0.17.0

data/test/unit/domain_test.rb

@@ -102,6 +102,8 @@ describe HammerCLIForeman::Domain do
     context "parameters" do
       it_should_accept "name, value and domain name", ["--name=name", "--value=val", "--domain=name"]
       it_should_accept "name, value and domain id", ["--name=name", "--value=val", "--domain-id=1"]
+      it_should_accept "name, value, parameter type and domain name",
+                       ["--name=name", "--value=val", "--parameter-type=integer", "--domain=name"]
       # it_should_fail_with "name missing", ["--value=val", "--domain=name"]
       # it_should_fail_with "value missing", ["--name=name", "--domain=name"]
       # it_should_fail_with "domain name or id missing", ["--name=name", "--value=val"]

data/test/unit/host_test.rb

@@ -318,6 +318,7 @@ describe HammerCLIForeman::Host do
     context "parameters" do
       it_should_accept "name, value and host name", ["--name=name", "--value=val", "--host=name"]
       it_should_accept "name, value and host id", ["--name=name", "--value=val", "--host-id=1"]
+      it_should_accept "name, value, type and host id", ["--name=name", "--parameter-type=integer", "--value=1", "--host-id=1"]
       it_should_fail_with "name missing", ["--value=val", "--host=name"]
       it_should_fail_with "value missing", ["--name=name", "--host=name"]
       # it_should_fail_with "host name or id missing", ["--name=name", "--value=val"]

data/test/unit/hostgroup_test.rb

@@ -101,7 +101,7 @@ describe HammerCLIForeman::Hostgroup do
     let(:cmd) { HammerCLIForeman::Hostgroup::SetParameterCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, value and hostgroup id", ["--name=name", "--value=val", "--hostgroup-id=1"]
+      it_should_accept "name, value, parameter-type and hostgroup id", ["--name=name", "--parameter-type=string", "--value=val", "--hostgroup-id=1"]
       it_should_fail_with "name missing", ["--value=val", "--hostgroup-id=1"]
       it_should_fail_with "value missing", ["--name=name", "--hostgroup-id=1"]
       # it_should_fail_with "hostgroup id missing", ["--name=name", "--value=val"] # TODO: temporarily disabled, parameters are checked in the id resolver
@@ -156,4 +156,17 @@ describe HammerCLIForeman::Hostgroup do
 
   end
 
+  context "RebuildConfigCommand" do
+
+    let(:cmd) { HammerCLIForeman::Hostgroup::RebuildConfigCommand.new("", ctx) }
+
+    context "parameters" do
+      it_should_accept "name", ["--name=host"]
+      it_should_accept "id", ["--id=1"]
+      # it_should_fail_with "no arguments"
+      # TODO: temporarily disabled, parameters are checked in the id resolver
+
+    end
+  end
+
 end

data/test/unit/operating_system_test.rb

@@ -125,6 +125,7 @@ describe HammerCLIForeman::OperatingSystem do
     context "parameters" do
       it_should_accept "name, value and os id", ["--name=domain", "--value=val", "--operatingsystem-id=1"]
       it_should_accept "name, value and os title", ["--name=domain", "--value=val", "--operatingsystem=Rhel 6.5"]
+      it_should_accept "name, value, type and os id", ["--name=domain", "--value=val", "--parameter-type=string", "--operatingsystem-id=1"]
       # it_should_fail_with "name missing", ["--value=val", "--operatingsystem-id=id"]
       # it_should_fail_with "value missing", ["--name=name", "--operatingsystem-id=id"]
       # it_should_fail_with "os id missing", ["--name=name", "--value=val"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: apipie-bindings
   requirement: !ruby/object:Gem::Requirement
@@ -102,22 +102,19 @@ files:
 - lib/hammer_cli_foreman/combination.rb
 - lib/hammer_cli_foreman/commands.rb
 - lib/hammer_cli_foreman/common_parameter.rb
+- lib/hammer_cli_foreman/compute_attribute.rb
+- lib/hammer_cli_foreman/compute_profile.rb
 - lib/hammer_cli_foreman/compute_resource.rb
-- lib/hammer_cli_foreman/compute_resources/all.rb
-- lib/hammer_cli_foreman/compute_resources/ec2.rb
-- lib/hammer_cli_foreman/compute_resources/ec2/host_help_extenstion.rb
-- lib/hammer_cli_foreman/compute_resources/gce.rb
-- lib/hammer_cli_foreman/compute_resources/gce/host_help_extenstion.rb
-- lib/hammer_cli_foreman/compute_resources/libvirt.rb
-- lib/hammer_cli_foreman/compute_resources/libvirt/host_help_extenstion.rb
-- lib/hammer_cli_foreman/compute_resources/openstack.rb
-- lib/hammer_cli_foreman/compute_resources/openstack/host_help_extenstion.rb
-- lib/hammer_cli_foreman/compute_resources/ovirt.rb
-- lib/hammer_cli_foreman/compute_resources/ovirt/host_help_extenstion.rb
-- lib/hammer_cli_foreman/compute_resources/rackspace.rb
-- lib/hammer_cli_foreman/compute_resources/rackspace/host_help_extenstion.rb
-- lib/hammer_cli_foreman/compute_resources/vmware.rb
-- lib/hammer_cli_foreman/compute_resources/vmware/host_help_extenstion.rb
+- lib/hammer_cli_foreman/compute_resource/base.rb
+- lib/hammer_cli_foreman/compute_resource/ec2.rb
+- lib/hammer_cli_foreman/compute_resource/gce.rb
+- lib/hammer_cli_foreman/compute_resource/help_utils.rb
+- lib/hammer_cli_foreman/compute_resource/libvirt.rb
+- lib/hammer_cli_foreman/compute_resource/openstack.rb
+- lib/hammer_cli_foreman/compute_resource/ovirt.rb
+- lib/hammer_cli_foreman/compute_resource/rackspace.rb
+- lib/hammer_cli_foreman/compute_resource/register_compute_resources.rb
+- lib/hammer_cli_foreman/compute_resource/vmware.rb
 - lib/hammer_cli_foreman/config_group.rb
 - lib/hammer_cli_foreman/config_report.rb
 - lib/hammer_cli_foreman/defaults.rb
@@ -195,10 +192,14 @@ files:
 - test/data/1.17/foreman_api.json
 - test/data/1.18/foreman_api.json
 - test/data/1.20/foreman_api.json
+- test/data/1.21/foreman_api.json
+- test/data/1.22/foreman_api.json
 - test/data/README.md
 - test/functional/audit_test.rb
 - test/functional/auth_source_test.rb
 - test/functional/commands/list_test.rb
+- test/functional/compute_attribute_test.rb
+- test/functional/compute_profile_test.rb
 - test/functional/compute_resource_test.rb
 - test/functional/filter_test.rb
 - test/functional/host_test.rb
@@ -535,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Foreman commands for Hammer
@@ -840,6 +841,8 @@ test_files:
 - test/functional/settings_test.rb
 - test/functional/smart_variable_test.rb
 - test/functional/smart_class_parameter_test.rb
+- test/functional/compute_profile_test.rb
+- test/functional/compute_attribute_test.rb
 - test/functional/commands/list_test.rb
 - test/functional/role_test.rb
 - test/functional/compute_resource_test.rb
@@ -860,10 +863,12 @@ test_files:
 - test/functional/test_helper.rb
 - test/data/1.16/foreman_api.json
 - test/data/1.11/foreman_api.json
+- test/data/1.22/foreman_api.json
 - test/data/1.20/foreman_api.json
 - test/data/1.14/_foreman_api.json
 - test/data/1.14/foreman_api.json
 - test/data/1.18/foreman_api.json
+- test/data/1.21/foreman_api.json
 - test/data/1.15/foreman_api.json
 - test/data/1.10/foreman_api.json
 - test/data/README.md

data/lib/hammer_cli_foreman/compute_resources/all.rb

@@ -1,7 +0,0 @@
-require 'hammer_cli_foreman/compute_resources/ec2'
-require 'hammer_cli_foreman/compute_resources/gce'
-require 'hammer_cli_foreman/compute_resources/libvirt'
-require 'hammer_cli_foreman/compute_resources/openstack'
-require 'hammer_cli_foreman/compute_resources/ovirt'
-require 'hammer_cli_foreman/compute_resources/rackspace'
-require 'hammer_cli_foreman/compute_resources/vmware'

data/lib/hammer_cli_foreman/compute_resources/ec2.rb

@@ -1,9 +0,0 @@
-require 'hammer_cli_foreman/compute_resources/ec2/host_help_extenstion'
-
-module HammerCLIForeman
-  module ComputeResources
-    module EC2
-      HammerCLIForeman::Host.extend_cr_help(HostHelpExtenstion.new)
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/ec2/host_help_extenstion.rb

@@ -1,23 +0,0 @@
-module HammerCLIForeman
-  module ComputeResources
-    module EC2
-      class HostHelpExtenstion
-        def name
-          _('EC2')
-        end
-
-        def host_create_help(h)
-          h.section '--compute-attributes' do |h|
-            h.list([
-              'flavor_id',
-              'image_id',
-              'availability_zone',
-              'security_group_ids',
-              'managed_ip',
-            ])
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/gce.rb

@@ -1,9 +0,0 @@
-require 'hammer_cli_foreman/compute_resources/gce/host_help_extenstion'
-
-module HammerCLIForeman
-  module ComputeResources
-    module GCE
-      HammerCLIForeman::Host.extend_cr_help(HostHelpExtenstion.new)
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/gce/host_help_extenstion.rb

@@ -1,22 +0,0 @@
-module HammerCLIForeman
-  module ComputeResources
-    module GCE
-      class HostHelpExtenstion
-        def name
-          _('GCE')
-        end
-
-        def host_create_help(h)
-          h.section '--compute-attributes' do |h|
-            h.list([
-              'machine_type',
-              'image_id',
-              'network',
-              'external_ip'
-            ])
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/libvirt.rb

@@ -1,9 +0,0 @@
-require 'hammer_cli_foreman/compute_resources/libvirt/host_help_extenstion'
-
-module HammerCLIForeman
-  module ComputeResources
-    module Libvirt
-      HammerCLIForeman::Host.extend_cr_help(HostHelpExtenstion.new)
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/libvirt/host_help_extenstion.rb

@@ -1,35 +0,0 @@
-module HammerCLIForeman
-  module ComputeResources
-    module Libvirt
-      class HostHelpExtenstion
-        def name
-          _('Libvirt')
-        end
-
-        def host_create_help(h)
-          h.section '--compute-attributes' do |h|
-            h.list([
-              ['cpus',   _('Number of CPUs')],
-              ['memory', _('String, amount of memory, value in bytes')],
-              ['start',  _('Boolean (expressed as 0 or 1), whether to start the machine or not')]
-            ])
-          end
-          h.section '--interface' do |h|
-            h.list([
-              ['compute_type',                     _('Possible values: %s') % 'bridge, network'],
-              ['compute_network / compute_bridge', _('Name of interface according to type')],
-              ['compute_model',                    _('Possible values: %s') % 'virtio, rtl8139, ne2k_pci, pcnet, e1000']
-            ])
-          end
-          h.section '--volume' do |h|
-            h.list([
-              ['pool_name',   _('One of available storage pools')],
-              ['capacity',    _('String value, eg. 10G')],
-              ['format_type', _('Possible values: %s') % 'raw, qcow2']
-            ])
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/openstack.rb

@@ -1,9 +0,0 @@
-require 'hammer_cli_foreman/compute_resources/openstack/host_help_extenstion'
-
-module HammerCLIForeman
-  module ComputeResources
-    module OpenStack
-      HammerCLIForeman::Host.extend_cr_help(HostHelpExtenstion.new)
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/openstack/host_help_extenstion.rb

@@ -1,23 +0,0 @@
-module HammerCLIForeman
-  module ComputeResources
-    module OpenStack
-      class HostHelpExtenstion
-        def name
-          _('OpenStack')
-        end
-
-        def host_create_help(h)
-          h.section '--compute-attributes' do |h|
-            h.list([
-              'flavor_ref',
-              'image_ref',
-              'tenant_id',
-              'security_groups',
-              'network'
-            ])
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/ovirt.rb

@@ -1,9 +0,0 @@
-require 'hammer_cli_foreman/compute_resources/ovirt/host_help_extenstion'
-
-module HammerCLIForeman
-  module ComputeResources
-    module Ovirt
-      HammerCLIForeman::Host.extend_cr_help(HostHelpExtenstion.new)
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/ovirt/host_help_extenstion.rb

@@ -1,36 +0,0 @@
-module HammerCLIForeman
-  module ComputeResources
-    module Ovirt
-      class HostHelpExtenstion
-        def name
-          _('oVirt')
-        end
-
-        def host_create_help(h)
-          h.section '--compute-attributes' do |h|
-            h.list([
-              ['cluster'],
-              ['template', _('Hardware profile to use')],
-              ['cores',    _('Integer value, number of cores')],
-              ['memory',   _('Amount of memory, integer value in bytes')],
-              ['start',    _('Boolean (expressed as 0 or 1), whether to start the machine or not')]
-            ])
-          end
-          h.section '--interface' do |h|
-            h.list([
-              ['compute_name',    _('Eg. eth0')],
-              ['compute_network', _('Select one of available networks for a cluster')]
-            ])
-          end
-          h.section '--volume' do |h|
-            h.list([
-              ['size_gb',        _('Volume size in GB, integer value')],
-              ['storage_domain', _('Select one of available storage domains')],
-              ['bootable',       _('Boolean, only one volume can be bootable')]
-            ])
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/rackspace.rb

@@ -1,9 +0,0 @@
-require 'hammer_cli_foreman/compute_resources/rackspace/host_help_extenstion'
-
-module HammerCLIForeman
-  module ComputeResources
-    module Rackspace
-      HammerCLIForeman::Host.extend_cr_help(HostHelpExtenstion.new)
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/rackspace/host_help_extenstion.rb

@@ -1,20 +0,0 @@
-module HammerCLIForeman
-  module ComputeResources
-    module Rackspace
-      class HostHelpExtenstion
-        def name
-          _('Rackspace')
-        end
-
-        def host_create_help(h)
-          h.section '--compute-attributes' do |h|
-            h.list([
-              'flavor_id',
-              'image_id'
-            ])
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/vmware.rb

@@ -1,9 +0,0 @@
-require 'hammer_cli_foreman/compute_resources/vmware/host_help_extenstion'
-
-module HammerCLIForeman
-  module ComputeResources
-    module VMware
-      HammerCLIForeman::Host.extend_cr_help(HostHelpExtenstion.new)
-    end
-  end
-end

data/lib/hammer_cli_foreman/compute_resources/vmware/host_help_extenstion.rb

@@ -1,66 +0,0 @@
-module HammerCLIForeman
-  module ComputeResources
-    module VMware
-      class HostHelpExtenstion
-        INTERFACE_TYPES = %w(
-          VirtualVmxnet3,
-          VirtualE1000
-        )
-
-        def name
-          _('VMware')
-        end
-
-        def host_create_help(h)
-          h.section '--compute-attributes' do |h|
-            h.list([
-              ['cpus',                 _('CPU count')],
-              ['corespersocket',       _('Number of cores per socket (applicable to hardware versions < 10 only)')],
-              ['memory_mb',            _('Integer number, amount of memory in MB')],
-              ['firmware',             'automatic/bios/efi'],
-              ['cluster',              _('Cluster ID from VMware')],
-              ['resource_pool',        _('Resource Pool ID from VMware')],
-              ['path',                 _('Path to folder')],
-              ['guest_id',             _('Guest OS ID form VMware')],
-              ['scsi_controller_type', _('ID of the controller from VMware')],
-              ['hardware_version',     _('Hardware version ID from VMware')],
-              ['add_cdrom',            _('Must be a 1 or 0, Add a CD-ROM drive to the virtual machine')],
-              ['cpuHotAddEnabled',     _('Must be a 1 or 0, lets you add memory resources while the machine is on')],
-              ['memoryHotAddEnabled',  _('Must be a 1 or 0, lets you add CPU resources while the machine is on')],
-              ['start',                _("Must be a 1 or 0, whether to start the machine or not")],
-              ['annotation',           _("Annotation Notes")]
-            ])
-          end
-          h.section '--interface' do |h|
-            h.list([
-              ['compute_type', interface_type_description(h)],
-              ['compute_network', _('Network ID from VMware')]
-            ])
-          end
-          h.section '--volume' do |h|
-            h.list([
-              ['name'],
-              ['storage_pod', _('Storage Pod ID from VMware')],
-              ['datastore',   _('Datastore ID from VMware')],
-              ['size_gb',     _('Integer number, volume size in GB')],
-              ['thin',        'true/false'],
-              ['eager_zero',  'true/false'],
-              ['mode',        'persistent/independent_persistent/independent_nonpersistent']
-            ])
-          end
-        end
-
-        private
-
-        def interface_type_description(h)
-          [
-            _('Type of the network adapter, for example one of:'),
-            h.indent(INTERFACE_TYPES),
-            _("See documentation center for your version of vSphere to find more details about available adapter types:"),
-            h.indent('https://www.vmware.com/support/pubs/')
-          ].join("\n")
-        end
-      end
-    end
-  end
-end