hammer_cli_katello 0.11.5.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1b17e43ccbcfaf220d361b7e38f27e0f802c9c5
-  data.tar.gz: f40513f0493f3260beadcd2db8b0f1c1bd521c69
+  metadata.gz: d52505bd4dd9f8f24e11ed2d97b6209f59dcc640
+  data.tar.gz: 7fdacb6740cd55f57e50836cb11ab385e0db829b
 SHA512:
-  metadata.gz: 38e9c93e7f82ef4e940df154a236bf90f0941c00846763271bd01501c9c183e72097fd10403b5e29b77ae5e28b366bb849b2b4a60de04b8d47ddcc5376cbf871
-  data.tar.gz: d0b51c64c1e9457b9041c02670682c9ebad4c4dd013ac3f074d8033f4bc0913547163e4e81e02547a01475f04703de130f9371370711207336cac3b96842ec0c
+  metadata.gz: 9a90171a78059eeb5f24ed52d0fd6acd066550104f41b5d71e89f66a0558ce1d80c5917e2fdcb9acdf2b334d2d160f525447a8d2923fb266718d6ef8070c1ef9
+  data.tar.gz: 617c7b2d2333c6d48773674de56761bc242544efd8878d54454145c452fd134cb81d2d6ff5db2ca1e1b83ebf8aeb1079ac614db310d5bedb1b348fe1e18c7b27

data/lib/hammer_cli_katello.rb

@@ -121,6 +121,11 @@ module HammerCLIKatello
                                          'hammer_cli_katello/ostree_branch'
                                         )
 
+  HammerCLI::MainCommand.lazy_subcommand("file", _("Manipulate files"),
+                                         'HammerCLIKatello::FileCommand',
+                                         'hammer_cli_katello/file'
+                                        )
+
   # subcommands to hammer_cli_foreman commands
   require 'hammer_cli_katello/host'
   require 'hammer_cli_katello/hostgroup'

data/lib/hammer_cli_katello/content_view.rb

@@ -225,6 +225,18 @@ module HammerCLIKatello
       build_options
     end
 
+    class CVEnvParamsSource
+      def initialize(command)
+        @command = command
+      end
+
+      def get_options(_defined_options, result)
+        result['option_content_view_id'] = @command.option_id
+        result['option_lifecycle_environment_names'] = result['option_environment_names']
+        result
+      end
+    end
+
     class RemoveCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
       include OrganizationOptions
@@ -235,15 +247,17 @@ module HammerCLIKatello
       command_name "remove"
 
       option ["--content-view-version-ids"], "VERSION_IDS",
-             _("Comma separated list of version ids to remove")
+             _("Version ids to remove"),
+            :format => HammerCLI::Options::Normalizers::List.new
       option ["--environment-ids"], "ENVIRONMENT_IDS",
-             _("Comma separated list of environment ids to remove")
-
-      def all_options
-        opts = super
-        opts['option_content_view_id'] = option_id
-        opts['option_lifecycle_environment_names'] = opts['option_environment_names']
-        opts
+             _("Environment ids to remove"),
+            :format => HammerCLI::Options::Normalizers::List.new
+
+      def option_sources
+        sources = super
+        idx = sources.index { |s| s.class == HammerCLIForeman::OptionSources::IdParams }
+        sources.insert(idx, CVEnvParamsSource.new(self))
+        sources
       end
 
       def request_params

data/lib/hammer_cli_katello/file.rb

@@ -0,0 +1,72 @@
+module HammerCLIKatello
+  class FileCommand < HammerCLIKatello::Command
+    resource :file_units
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+        field :path, _("Path")
+      end
+
+      validate_options do
+        organization_options = [:option_organization_id, :option_organization_name,
+                                :option_organization_label]
+        product_options = [:option_product_id, :option_product_name]
+
+        if any(:option_product_name, :option_content_view_name).exist?
+          any(*organization_options).required
+        end
+
+        if option(:option_repository_name).exist?
+          any(*product_options).required
+        end
+      end
+
+      build_options do |o|
+        o.expand.including(:products, :organizations, :content_views)
+      end
+    end
+
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+        field :path, _("Path")
+        field :uuid, _("UUID")
+        field :checksum, _("Checksum")
+      end
+
+      validate_options do
+        organization_options = [:option_organization_id, :option_organization_name,
+                                :option_organization_label]
+        product_options = [:option_product_id, :option_product_name]
+        repository_options = [:option_repository_id, :option_repository_name]
+        content_view_version_options = [:option_content_view_version_id,
+                                        :option_content_view_version_version]
+
+        if option(:option_product_name).exist?
+          any(*organization_options).required
+        end
+
+        if option(:option_repository_name).exist?
+          any(*product_options).required
+        end
+
+        if option(:option_name).exist?
+          any(*(repository_options + content_view_version_options)).required
+        end
+      end
+
+      def all_options
+        super.merge(options)
+      end
+
+      build_options do |o|
+        o.expand.including(:products, :organizations, :content_views, :content_view_versions)
+      end
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/foreman_search_options_creators.rb

@@ -1,71 +1,71 @@
 module HammerCLIKatello
   module ForemanSearchOptionsCreators
-    def create_environments_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:environments))
+    def create_environments_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:environments), mode)
     end
 
-    def create_organizations_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:organizations))
+    def create_organizations_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:organizations), mode)
     end
 
-    def create_smart_proxies_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:smart_proxies))
+    def create_smart_proxies_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:smart_proxies), mode)
     end
 
-    def create_capsules_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:smart_proxies))
+    def create_capsules_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:smart_proxies), mode)
     end
 
-    def create_hosts_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:hosts))
+    def create_hosts_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:hosts), mode)
     end
 
-    def create_architectures_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:architectures))
+    def create_architectures_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:architectures), mode)
     end
 
-    def create_operatingsystems_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:operatingsystems))
+    def create_operatingsystems_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:operatingsystems), mode)
     end
 
-    def create_domains_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:domains))
+    def create_domains_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:domains), mode)
     end
 
-    def create_locations_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:locations))
+    def create_locations_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:locations), mode)
     end
 
-    def create_media_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:media))
+    def create_media_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:media), mode)
     end
 
-    def create_hostgroups_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:hostgroups))
+    def create_hostgroups_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:hostgroups), mode)
     end
 
-    def create_ptables_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:ptables))
+    def create_ptables_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:ptables), mode)
     end
 
-    def create_puppet_ca_proxies_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:puppet_ca_proxies))
+    def create_puppet_ca_proxies_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:puppet_ca_proxies), mode)
     end
 
-    def create_puppet_proxies_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:puppet_proxies))
+    def create_puppet_proxies_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:puppet_proxies), mode)
     end
 
-    def create_puppetclasses_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:puppetclasses))
+    def create_puppetclasses_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:puppetclasses), mode)
     end
 
-    def create_subnets_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:subnets))
+    def create_subnets_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:subnets), mode)
     end
 
-    def create_realms_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:realms))
+    def create_realms_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:realms), mode)
     end
   end
 end

data/lib/hammer_cli_katello/host_collection.rb

@@ -9,6 +9,20 @@ module HammerCLIKatello
       end
     end
 
+    module HostCollectionUpdateHostsErrorHandler
+      def execute
+        response = send_request
+        if response['error'].any?
+          print_message(failure_message)
+          puts response['error'].join("\n")
+          HammerCLI::EX_CANTCREAT
+        else
+          print_data(response)
+          HammerCLI::EX_OK
+        end
+      end
+    end
+
     class ListCommand < HammerCLIKatello::ListCommand
       include LimitFieldDataExtension
       resource :host_collections, :index
@@ -129,6 +143,8 @@ module HammerCLIKatello
     end
 
     class AddHostCommand < HammerCLIKatello::SingleResourceCommand
+      include HostCollectionUpdateHostsErrorHandler
+
       command_name 'add-host'
       action :add_hosts
 
@@ -139,6 +155,8 @@ module HammerCLIKatello
     end
 
     class RemoveHostCommand < HammerCLIKatello::SingleResourceCommand
+      include HostCollectionUpdateHostsErrorHandler
+
       command_name 'remove-host'
       action :remove_hosts
 

data/lib/hammer_cli_katello/host_content_source_options.rb

@@ -0,0 +1,25 @@
+module HammerCLIKatello
+  module HostContentSourceOptions
+    def self.included(base)
+      base.option "--content-source", "CONTENT_SOURCE_NAME",
+             _("Content Source name "),
+             :attribute_name => :option_content_source
+    end
+
+    def request_params
+      super.tap do |mod|
+        resource_name = resource.singular_name
+        if option_content_source && !option_content_source_id
+          resource_hash = if resource_name == "hostgroup"
+                            mod[resource_name]
+                          else
+                            mod[resource_name]["content_facet_attributes"]
+                          end
+
+          proxy_options = { HammerCLI.option_accessor_name('name') => option_content_source}
+          resource_hash["content_source_id"] = resolver.smart_proxy_id(proxy_options)
+        end
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/host_extensions.rb

@@ -3,9 +3,23 @@ require 'hammer_cli_katello/host_errata'
 require 'hammer_cli_katello/host_subscription'
 require 'hammer_cli_katello/host_package'
 require 'hammer_cli_katello/host_package_group'
+require 'hammer_cli_katello/host_kickstart_repository_options'
+require 'hammer_cli_katello/host_content_source_options'
 
 module HammerCLIKatello
   module HostExtensions
+    ::HammerCLIForeman::Host::CreateCommand.instance_eval do
+      include HammerCLIKatello::ResolverCommons
+      include HammerCLIKatello::HostContentSourceOptions
+      include ::HammerCLIKatello::HostKickstartRepositoryOptions
+    end
+
+    ::HammerCLIForeman::Host::UpdateCommand.instance_eval do
+      include HammerCLIKatello::ResolverCommons
+      include HammerCLIKatello::HostContentSourceOptions
+      include ::HammerCLIKatello::HostKickstartRepositoryOptions
+    end
+
     ::HammerCLIForeman::Host::ListCommand.instance_eval do
       output do
         from :content_facet_attributes do
@@ -19,9 +33,26 @@ module HammerCLIKatello
       output do
         label _('Content Information') do
           from :content_facet_attributes do
-            field :content_view_name, _('Content View')
-            field :lifecycle_environment_name, _('Lifecycle Environment')
-            field :content_source_name, _('Content Source')
+            label _("Content View") do
+              field :content_view_id, _("ID")
+              field :content_view_name, _("Name")
+            end
+
+            label _("Lifecycle Environment") do
+              field :lifecycle_environment_id, _("ID")
+              field :lifecycle_environment_name, _("Name")
+            end
+
+            label _("Content Source") do
+              field :content_source_id, _("ID")
+              field :content_source_name, _("Name")
+            end
+
+            label _("Kickstart Repository") do
+              field :kickstart_repository_id, _("ID")
+              field :kickstart_repository_name, _("Name")
+            end
+
             field :applicable_package_count, _('Applicable Packages')
             field :upgradable_package_count, _('Upgradable Packages')
 

data/lib/hammer_cli_katello/host_kickstart_repository_options.rb

@@ -0,0 +1,49 @@
+module HammerCLIKatello
+  module HostKickstartRepositoryOptions
+    def self.included(base)
+      base.option "--kickstart-repository", "REPOSITORY_NAME",
+             _("Kickstart repository name "),
+             :attribute_name => :option_kickstart_repository
+    end
+
+    def request_params
+      super.tap do |mod|
+        resource_name = resource.singular_name
+        if option_kickstart_repository && !option_kickstart_repository_id
+          resource_hash = if resource_name == "hostgroup"
+                            mod[resource_name]
+                          else
+                            mod[resource_name]["content_facet_attributes"]
+                          end
+
+          resource_hash ||= {}
+
+          env_id = resource_hash["lifecycle_environment_id"]
+          cv_id = resource_hash["content_view_id"]
+
+          raise _("Please provide --lifecycle-environment-id") unless env_id
+
+          raise _("Please provide --content-view-id") unless cv_id
+
+          resource_hash["kickstart_repository_id"] = fetch_repo_id(cv_id, env_id,
+                                                                   option_kickstart_repository)
+        end
+      end
+    end
+
+    def fetch_repo_id(cv_id, env_id, repo_name)
+      repo_resource = HammerCLIForeman.foreman_resource(:repositories)
+      index_options = {
+        "content_view_id" => cv_id,
+        "environment_id" => env_id,
+        "name" => repo_name
+      }
+      repos = repo_resource.call(:index, index_options)["results"]
+      if repos.empty?
+        raise _("No such repository with name %{name}, in lifecycle environment"\
+                  " %{environment_id} and content view %{content_view_id}" % index_options)
+      end
+      repos.first["id"]
+    end
+  end
+end

data/lib/hammer_cli_katello/hostgroup_extensions.rb

@@ -1,4 +1,6 @@
 require 'hammer_cli_foreman/hostgroup'
+require 'hammer_cli_katello/host_kickstart_repository_options'
+require 'hammer_cli_katello/host_content_source_options'
 
 module HammerCLIKatello
   module PuppetEnvironmentNameResolvable
@@ -39,6 +41,8 @@ module HammerCLIKatello
       include HammerCLIKatello::PuppetEnvironmentNameResolvable
       include HammerCLIKatello::ContentViewNameResolvable
       include HammerCLIKatello::QueryOrganizationOptions
+      include HammerCLIKatello::HostContentSourceOptions
+      include HammerCLIKatello::HostKickstartRepositoryOptions
     end
 
     ::HammerCLIForeman::Hostgroup::UpdateCommand.instance_eval do
@@ -46,13 +50,31 @@ module HammerCLIKatello
       include HammerCLIKatello::PuppetEnvironmentNameResolvable
       include HammerCLIKatello::ContentViewNameResolvable
       include HammerCLIKatello::QueryOrganizationOptions
+      include HammerCLIKatello::HostContentSourceOptions
+      include HammerCLIKatello::HostKickstartRepositoryOptions
     end
 
     ::HammerCLIForeman::Hostgroup::InfoCommand.instance_eval do
       output do
-        field :content_view_name, _('Content View')
-        field :lifecycle_environment_name, _('Lifecycle Environment')
-        field :content_source_name, _('Content Source')
+        label _("Content View") do
+          field :content_view_id, _("ID")
+          field :content_view_name, _("Name")
+        end
+
+        label _("Lifecycle Environment") do
+          field :lifecycle_environment_id, _("ID")
+          field :lifecycle_environment_name, _("Name")
+        end
+
+        label _("Content Source") do
+          field :content_source_id, _("ID")
+          field :content_source_name, _("Name")
+        end
+
+        label _("Kickstart Repository") do
+          field :kickstart_repository_id, _("ID")
+          field :kickstart_repository_name, _("Name")
+        end
       end
     end
   end