hammer_cli_katello 0.0.26 → 0.1.0

data/lib/hammer_cli_katello/product.rb

@@ -1,5 +1,4 @@
 module HammerCLIKatello
-
   class Product < HammerCLIKatello::Command
     resource :products
 
@@ -14,11 +13,7 @@ module HammerCLIKatello
         end
 
         field :repository_count, _("Repositories")
-
-        from :sync_status do
-          field :state, _("Sync State")
-        end
-
+        field :sync_state, _("Sync State")
       end
 
       build_options
@@ -32,7 +27,6 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
-
       output do
         field :id, _("ID")
         field :name, _("Name")

data/lib/hammer_cli_katello/puppet_module.rb

@@ -1,5 +1,4 @@
 module HammerCLIKatello
-
   class PuppetModule < HammerCLIKatello::Command
     resource :puppet_modules
 

data/lib/hammer_cli_katello/repository.rb

@@ -1,5 +1,4 @@
 module HammerCLIKatello
-
   class Repository < HammerCLIKatello::Command
     resource :repositories
 
@@ -99,9 +98,9 @@ module HammerCLIKatello
         content_counts = data["content_counts"]
         case data["content_type"]
         when "yum"
-          data["package_total"]  =  content_counts["rpm"]
-          data["package_group_total"]  =  content_counts["package_group"]
-          data["errata_total"]  =  content_counts["erratum"]
+          data["package_total"] = content_counts["rpm"]
+          data["package_group_total"] = content_counts["package_group"]
+          data["errata_total"] = content_counts["erratum"]
         when "docker"
           data["docker_manifest_total"] = content_counts["docker_manifest"]
           data["docker_tag_total"] = content_counts["docker_tag"]
@@ -112,7 +111,6 @@ module HammerCLIKatello
         end
       end
 
-      # rubocop:disable MethodLength
       def get_sync_status(state)
         sync_states = {
           "failed" => _("Failed"),
@@ -236,21 +234,20 @@ module HammerCLIKatello
         repo_id = get_identifier
         filename = File.basename(file.path)
 
-        offset = 0
-        while (content = file.read(CONTENT_CHUNK_SIZE))
-          params = {
-            :offset => offset,
-            :id => upload_id,
-            :content => content,
-            :repository_id => repo_id,
-            :multipart => true
-          }
+        update_content_upload(upload_id, repo_id, file)
 
-          content_upload_resource.call(:update, params, request_headers)
-          offset += CONTENT_CHUNK_SIZE
-        end
+        file.rewind
+        content = file.read
+
+        import_uploads([
+          {
+            id: upload_id,
+            name: filename,
+            size: file.size,
+            checksum: Digest::SHA256.hexdigest(content)
+          }
+        ])
 
-        import_upload_ids([upload_id])
         print_message _("Successfully uploaded file '%s'.") % filename
       rescue
         @failure = true
@@ -266,36 +263,40 @@ module HammerCLIKatello
         response["upload_id"]
       end
 
-      def import_upload_ids(ids)
+      def update_content_upload(upload_id, repo_id, file)
+        offset = 0
+
+        while (content = file.read(CONTENT_CHUNK_SIZE))
+          params = {
+            :offset => offset,
+            :id => upload_id,
+            :content => content,
+            :repository_id => repo_id,
+            :multipart => true
+          }
+
+          content_upload_resource.call(:update, params, request_headers)
+          offset += CONTENT_CHUNK_SIZE
+        end
+      end
+
+      def import_uploads(uploads)
         params = {:id => get_identifier,
-                  :upload_ids => ids
+                  :uploads => uploads
         }
         resource.call(:import_uploads, params)
       end
     end
 
     class RemoveContentCommand < HammerCLIKatello::SingleResourceCommand
-      include RepositoryScopedToProduct
-
       resource :repositories, :remove_content
       command_name "remove-content"
-
-      option ["--content-ids"], "CONTENT_IDS",
-        _("package IDs, puppet module IDs, and/or docker manifest IDs"),
-        :format => HammerCLI::Options::Normalizers::List.new, :required => true
-
-      def request_params
-        super.tap do |params|
-          params[:ids] = option_content_ids
-          params[:uuids] = option_content_ids
-        end
-      end
+      desc _("Remove content from a repository")
 
       success_message _("Repository content removed")
       failure_message _("Could not remove content")
 
-      # ``uuids`` is deprecated
-      build_options :without => %w(uuids ids)
+      build_options
     end
 
     class ExportCommand < HammerCLIKatello::SingleResourceCommand

data/lib/hammer_cli_katello/repository_scoped_to_product.rb

@@ -1,13 +1,9 @@
 module HammerCLIKatello
-
   module RepositoryScopedToProduct
-
     def self.included(base)
       base.validate_options do
         any(:option_product_name, :option_product_id).required if option(:option_name).exist?
       end
     end
-
   end
-
 end

data/lib/hammer_cli_katello/repository_set.rb

@@ -1,7 +1,5 @@
 module HammerCLIKatello
-
   class RepositorySetCommand < HammerCLI::AbstractCommand
-
     class ListCommand < HammerCLIKatello::ListCommand
       resource :repository_sets, :index
 
@@ -83,5 +81,4 @@ module HammerCLIKatello
 
     autoload_subcommands
   end
-
 end

data/lib/hammer_cli_katello/search_options_creators.rb

@@ -1,21 +1,50 @@
+require 'hammer_cli_katello/foreman_search_options_creators'
+
 module HammerCLIKatello
   module SearchOptionsCreators
+    include HammerCLIKatello::ForemanSearchOptionsCreators
+
+    def create_repository_search_options(options)
+      name = options[HammerCLI.option_accessor_name("name")]
+      organization_id = options[HammerCLI.option_accessor_name("organization_id")]
+
+      search_options = {}
+      search_options['name'] = name if name
+      search_options['organization_id'] = organization_id if organization_id
+      search_options
+    end
 
     def create_repositories_search_options(options)
       name = options[HammerCLI.option_accessor_name("name")]
       names = options[HammerCLI.option_accessor_name("names")]
       product_id = options[HammerCLI.option_accessor_name("product_id")]
+      organization_id = options[HammerCLI.option_accessor_name("organization_id")]
 
       search_options = {}
       search_options['name'] = name if name
       search_options['names'] = names if names
       search_options['product_id'] = product_id if product_id
+      search_options['organization_id'] = organization_id if organization_id
+      search_options
+    end
+
+    def create_content_views_search_options(options)
+      name = options[HammerCLI.option_accessor_name('name')]
+      organization_id = options[HammerCLI.option_accessor_name("organization_id")] ||
+                        organization_id(scoped_options('organization', options))
+
+      search_options = {}
+      search_options['name'] = name if name
+      if options['option_content_view_name'] || name
+        search_options['organization_id'] = organization_id
+      end
       search_options
     end
 
     def create_lifecycle_environments_search_options(options)
       name = options[HammerCLI.option_accessor_name("name")]
-      organization_id = options[HammerCLI.option_accessor_name("organization_id")]
+      organization_id = options[HammerCLI.option_accessor_name("organization_id")] ||
+                        organization_id(scoped_options('organization', options))
 
       search_options = {}
       search_options['name'] = name if name
@@ -38,20 +67,15 @@ module HammerCLIKatello
       search_options
     end
 
-    def create_organizations_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:organizations))
-    end
-
-    def create_smart_proxies_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:smart_proxies))
-    end
-
-    def create_capsules_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:smart_proxies))
-    end
-
-    def create_hosts_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:hosts))
+    def create_host_collections_search_options(options)
+      options[HammerCLI.option_accessor_name("organization_id")] ||= organization_id(
+        scoped_options("organization", options)
+      )
+      search_options = create_search_options_with_katello_api(
+        options, api.resource(:host_collections)
+      ) || {}
+      search_options['organization_id'] ||= options['option_organization_id']
+      search_options
     end
 
     def create_search_options_with_katello_api(options, resource)
@@ -59,12 +83,10 @@ module HammerCLIKatello
       searchables(resource).each do |s|
         value = options[HammerCLI.option_accessor_name(s.name.to_s)]
         if value
-          search_options.update("#{s.name}" => "#{value}")
+          search_options.update(s.name.to_s => value.to_s)
         end
       end
       search_options
     end
-
   end # module SearchOptionsCreators
-
 end # module HammerCLIKatello

data/lib/hammer_cli_katello/subscription.rb

@@ -3,33 +3,42 @@ require 'hammer_cli_foreman'
 require 'hammer_cli_foreman/commands'
 
 module HammerCLIKatello
-
   class SubscriptionCommand < HammerCLI::AbstractCommand
-
     class ListCommand < HammerCLIKatello::ListCommand
-
       resource :subscriptions, :index
 
       output do
+        field :id, _("ID")
+        field :cp_id, _("UUID")
         field :product_name, _("Name")
+        field :subscription_type, _("Type")
         field :contract_number, _("Contract")
         field :account_number, _("Account")
         field :support_level, _("Support")
-        field :quantity, _("Quantity")
-        field :consumed, _("Consumed")
-        field :end_date, _("End Date")
-        field :id, _("ID")
-        field :product_name, _("Product")
+        field :end_date, _("End Date"), Fields::Date
         field :format_quantity, _("Quantity")
-        field :consumed, _("Attached")
+        field :consumed, _("Consumed")
       end
 
       def extend_data(data)
         data["format_quantity"] = data["quantity"] == -1 ? _("Unlimited") : data["quantity"]
+        data["subscription_type"] = get_subscription_type(data)
         data
       end
 
       build_options
+
+      def get_subscription_type(data)
+        if !data["virt_only"]
+          _("Physical")
+        elsif data["host"]
+          _("Guests of %s" % data['host']['name'])
+        elsif data["unmapper_guest"]
+          _("Temporary")
+        else
+          _("Virtual")
+        end
+      end
     end
 
     class UploadCommand < HammerCLIKatello::Command
@@ -66,9 +75,7 @@ module HammerCLIKatello
       success_message _("Manifest is being deleted in task %{id}")
       failure_message _("Manifest deletion failed")
 
-      build_options do |o|
-        o.expand.including(:systems)
-      end
+      build_options(&:expand)
     end
 
     class RefreshManifestCommand < HammerCLIKatello::Command
@@ -83,7 +90,7 @@ module HammerCLIKatello
       build_options
     end
 
-    class ManifestHistoryCommand <  HammerCLIKatello::ListCommand
+    class ManifestHistoryCommand < HammerCLIKatello::ListCommand
       command_name "manifest-history"
       resource :subscriptions, :manifest_history
 

data/lib/hammer_cli_katello/sync_plan.rb

@@ -3,7 +3,6 @@ module HammerCLIKatello
     resource :sync_plans
 
     class ListCommand < HammerCLIKatello::ListCommand
-
       output do
         field :id, _("ID")
         field :name, _("Name")
@@ -16,7 +15,6 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
-
       output ListCommand.output_definition do
         field :description, _("Description")
         field :created_at, _("Created at"), Fields::Date
@@ -27,11 +25,10 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
-
       option "--interval", "INTERVAL", _("how often synchronization should run"),
              :format => HammerCLI::Options::Normalizers::Enum.new(
-                %w(hourly daily weekly)
-              )
+               %w(hourly daily weekly)
+             )
 
       option "--sync-date", "SYNC_DATE",
              _("start date and time of the synchronization defaults to now"),
@@ -44,11 +41,10 @@ module HammerCLIKatello
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
-
       option "--interval", "INTERVAL", _("how often synchronization should run"),
              :format => HammerCLI::Options::Normalizers::Enum.new(
-                %w(hourly daily weekly)
-              )
+               %w(hourly daily weekly)
+             )
       option "--sync-date", "SYNC_DATE", _("start date and time of the synchronization"),
              :format => HammerCLI::Options::Normalizers::DateTime.new
 

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('0.0.26')
+    @version ||= Gem::Version.new('0.1.0')
   end
 end

data/lib/hammer_cli_katello.rb

@@ -6,7 +6,6 @@ require 'hammer_cli_foreman/output/fields'
 require 'hammer_cli_foreman_tasks'
 
 module HammerCLIKatello
-
   def self.exception_handler_class
     HammerCLIKatello::ExceptionHandler
   end
@@ -15,6 +14,8 @@ module HammerCLIKatello
   require 'hammer_cli_katello/output/formatters'
   require 'hammer_cli_katello/katello_environment_name_resolvable'
   require 'hammer_cli_katello/lifecycle_environment_name_resolvable'
+  require 'hammer_cli_katello/content_view_name_resolvable'
+  require 'hammer_cli_katello/organization_options'
   require 'hammer_cli_katello/repository_scoped_to_product'
   require "hammer_cli_katello/commands"
   require "hammer_cli_katello/associating_commands"
@@ -29,103 +30,97 @@ module HammerCLIKatello
   HammerCLI::MainCommand.lazy_subcommand("activation-key", _("Manipulate activation keys."),
                                          'HammerCLIKatello::ActivationKeyCommand',
                                          'hammer_cli_katello/activation_key'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand!("organization", _("Manipulate organizations"),
                                           'HammerCLIKatello::Organization',
                                           'hammer_cli_katello/organization'
-  )
+                                         )
 
   HammerCLI::MainCommand.lazy_subcommand("gpg", _("Manipulate GPG Key actions on the server"),
                                          'HammerCLIKatello::GpgKeyCommand',
                                          'hammer_cli_katello/gpg_key'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("lifecycle-environment",
                                          _("Manipulate lifecycle_environments on the server"),
                                          'HammerCLIKatello::LifecycleEnvironmentCommand',
                                          'hammer_cli_katello/lifecycle_environment'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("ping", _("Get the status of the server"),
                                          'HammerCLIKatello::PingCommand',
                                          'hammer_cli_katello/ping'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("product", _("Manipulate products."),
                                          'HammerCLIKatello::Product',
                                          'hammer_cli_katello/product'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("puppet-module", _("View Puppet Module details."),
                                          'HammerCLIKatello::PuppetModule',
                                          'hammer_cli_katello/puppet_module'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("repository", _("Manipulate repositories"),
                                          'HammerCLIKatello::Repository',
                                          'hammer_cli_katello/repository'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("repository-set",
                                          _("Manipulate repository sets on the server"),
                                          'HammerCLIKatello::RepositorySetCommand',
                                          'hammer_cli_katello/repository_set'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("subscription", _("Manipulate subscriptions."),
                                          'HammerCLIKatello::SubscriptionCommand',
                                          'hammer_cli_katello/subscription'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand('sync-plan', _("Manipulate sync plans"),
                                          'HammerCLIKatello::SyncPlan',
                                          'hammer_cli_katello/sync_plan'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand('host-collection', _("Manipulate host collections"),
                                          'HammerCLIKatello::HostCollection',
                                          'hammer_cli_katello/host_collection'
-  )
-
-  HammerCLI::MainCommand.lazy_subcommand("content-host",
-                                         _("Manipulate content hosts on the server"),
-                                         'HammerCLIKatello::ContentHostCommand',
-                                         'hammer_cli_katello/content_host'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("content-view", _("Manipulate content views."),
                                          'HammerCLIKatello::ContentView',
                                          'hammer_cli_katello/content_view'
-  )
+                                        )
 
   # Capsule is just an alias to smart proxy
   HammerCLI::MainCommand.lazy_subcommand("capsule", _("Manipulate capsule"),
                                          'HammerCLIForeman::SmartProxy',
                                          'hammer_cli_foreman/smart_proxy'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("package", _("Manipulate packages."),
                                          'HammerCLIKatello::PackageCommand',
                                          'hammer_cli_katello/package'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("package-group", _("Manipulate package groups"),
                                          'HammerCLIKatello::PackageGroupCommand',
                                          'hammer_cli_katello/package_group'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("erratum", _("Manipulate errata"),
                                          'HammerCLIKatello::ErratumCommand',
                                          'hammer_cli_katello/erratum'
-  )
+                                        )
 
   HammerCLI::MainCommand.lazy_subcommand("ostree-branch", _("Manipulate ostree branches"),
                                          'HammerCLIKatello::OstreeBranchCommand',
                                          'hammer_cli_katello/ostree_branch'
-  )
+                                        )
 
   # subcommands to hammer_cli_foreman commands
   require 'hammer_cli_katello/host'
-
+  require 'hammer_cli_katello/hostgroup'
 end