hammer_cli_katello 1.1.1 → 1.3.0

data/lib/hammer_cli_katello/organization.rb

@@ -20,9 +20,17 @@ module HammerCLIKatello
       output do
         field :label, _("Label")
         field :description, _("Description")
-        field :redhat_repository_url, _("Red Hat Repository URL")
         field :simple_content_access_label, _("Simple Content Access")
         field :service_levels, _("Service Levels"), Fields::List
+        from :cdn_configuration do
+          label "CDN configuration", hide_blank: true do
+            field :url, _("URL"), Fields::Field, hide_blank: true
+            field :upstream_organization_label, _("Upstream Organization"),
+                                               Fields::Field, hide_blank: true
+            field :username, _("Username"), Fields::Field, hide_blank: true
+            field :ssl_ca_credential_id, _("SSL CA Credential ID"), Fields::Field, hide_blank: true
+          end
+        end
       end
 
       def extend_data(data)
@@ -44,7 +52,9 @@ module HammerCLIKatello
       success_message _("Organization updated.")
       failure_message _("Could not update the organization")
 
-      build_options
+      build_options do |o|
+        o.expand(:all).except(:environments)
+      end
     end
 
     class CreateCommand < HammerCLIForeman::Organization::CreateCommand
@@ -54,7 +64,9 @@ module HammerCLIKatello
       success_message _("Organization created.")
       failure_message _("Could not create the organization")
 
-      build_options
+      build_options do |o|
+        o.expand(:all).except(:environments)
+      end
     end
 
     class DeleteCommand < HammerCLIForeman::Organization::DeleteCommand
@@ -68,6 +80,19 @@ module HammerCLIKatello
       build_options
     end
 
+    class ConfigureCdnCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIKatello::ResolverCommons
+      resource :organizations, :cdn_configuration
+      command_name "configure-cdn"
+      success_message _("Updated CDN configuration.")
+      failure_message _("Could not update CDN configuration.")
+
+      build_options do |o|
+        o.expand(:all).except(:organizations, :locations)
+        o.without(:organization_id, :location_id)
+      end
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/package.rb

@@ -3,7 +3,6 @@ module HammerCLIKatello
     resource :packages
 
     class ListCommand < HammerCLIKatello::ListCommand
-      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
       include LifecycleEnvironmentNameMapping
 
       output do
@@ -40,6 +39,8 @@ module HammerCLIKatello
       build_options do |o|
         o.expand.including(:products, :content_views)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand

data/lib/hammer_cli_katello/ping.rb

@@ -51,6 +51,13 @@ module HammerCLIKatello
           end
         end
 
+        label "pulp3_content", :hide_blank => true do
+          from "pulp3_content" do
+            field "status", _("Status"), Fields::Field, :hide_blank => true
+            field "_response", _("Server Response"), Fields::Field, :hide_blank => true
+          end
+        end
+
         label "foreman_tasks" do
           from "foreman_tasks" do
             field "status", _("Status")

data/lib/hammer_cli_katello/repository.rb

@@ -62,10 +62,6 @@ module HammerCLIKatello
         field :full_path, _("Published At")
         field :relative_path, _("Relative Path")
         field :download_policy, _("Download Policy"), Fields::Field, :hide_blank => true
-        field :ostree_upstream_sync_policy, _("OSTree Upstream Sync Policy"),
-              Fields::Field, :hide_blank => true
-        field :_ostree_upstream_sync_depth, _("OSTree Upstream Sync Depth"),
-              Fields::Field, :hide_blank => true
         field :docker_upstream_name, _("Upstream Repository Name"),
               Fields::Field, :hide_blank => true
         field :docker_tags_whitelist, _("Container Image Tags Filter"),
@@ -403,6 +399,12 @@ module HammerCLIKatello
       build_options(:without => [:content]) do |o|
         o.expand.including(:products, :organizations)
       end
+
+      option "--ostree-repository-name", "OSTREE REPOSITORY NAME",
+        _("Name of OSTree repository in archive."),
+        :attribute_name => :option_ostree_repository_name,
+        :required => false
+
       option "--path", "PATH", _("Upload file, directory of files, or glob of files " \
                                  "as content for a repository.\n" \
                                  "Globs must be escaped by single or double quotes"),
@@ -423,6 +425,7 @@ module HammerCLIKatello
           repo_id = get_identifier
           update_content_upload(upload_id, repo_id, file)
         end
+        opts[:ostree_repository_name] = options["option_ostree_repository_name"]
         results = import_uploads([
           {
             id: upload_id,
@@ -479,6 +482,9 @@ module HammerCLIKatello
                   sync_capsule: sync_capsule
         }
         params[:content_type] = options["option_content_type"] if options["option_content_type"]
+        if options["option_ostree_repository_name"]
+          params[:ostree_repository_name] = options["option_ostree_repository_name"]
+        end
         resource.call(:import_uploads, params)
       end
 
@@ -541,33 +547,6 @@ module HammerCLIKatello
       end
     end
 
-    class ExportCommand < HammerCLIKatello::SingleResourceCommand
-      include HammerCLIForemanTasks::Async
-      include OrganizationOptions
-      extend RepositoryScopedToProduct
-
-      validate_repo_name_requires_product_options
-      action :export
-      command_name "export"
-      desc _("Export content from a repository to the configured directory")
-
-      success_message _("Repository is being exported in task %{id}.")
-      failure_message _("Could not export the repository")
-
-      validate_options :before, 'IdResolution' do
-        organization_options = [:option_organization_id, :option_organization_name, \
-                                :option_organization_label]
-
-        if option(:option_product_name).exist?
-          any(*organization_options).required
-        end
-      end
-
-      build_options do |o|
-        o.expand.including(:products)
-      end
-    end
-
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/search_options_creators.rb

@@ -57,7 +57,8 @@ module HammerCLIKatello
     def create_lifecycle_environments_search_options(options, mode = nil)
       search_options = {}
       if mode != :multi
-        name = options[HammerCLI.option_accessor_name("name")]
+        name = options[HammerCLI.option_accessor_name("environment_name")] ||
+               options[HammerCLI.option_accessor_name("name")]
         search_options['name'] = name if name
       end
       organization_id = organization_id(scoped_options('organization', options, :single))

data/lib/hammer_cli_katello/srpm.rb

@@ -39,6 +39,8 @@ module HammerCLIKatello
       build_options do |o|
         o.expand.including(:products, :content_views)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand

data/lib/hammer_cli_katello/version.rb

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