hammer_cli_katello 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 91526da6c7ebab95a7aba39558d81c0a47fbe074
-  data.tar.gz: 6c44980914fdd9a4e8d308863f65aeaac002f09a
+SHA256:
+  metadata.gz: 53e2f4ceb875e5146dc941c0c2f6ba8a00095e525c1a8a99ad0252ed92f8cf60
+  data.tar.gz: '01080c7f6a9e503fcf2446d41f20b131ca2293aeb849e08243da25ccfc1e5cbc'
 SHA512:
-  metadata.gz: 0b530c2a5f82758bd0e074f9988d7973be4134a9f832877c2afc4c336f73a6e5a172778d9bfeeb6bb53370787d896a2f08578048fe818a71a9f9e68657e1e595
-  data.tar.gz: c9b15e7566318c658abefb3a372405571fe2f0875666f1d9bdec6596159d95021baf62e704ca2af33c96ebfbdaf61e9b5d9716d65c2c6d3859903d3d745d429f
+  metadata.gz: 0d4ce299d3e164363f6209a127d8425bbbfdf7571fc38771e8ce52c671e2b550659fb6af5cc97fd066f50b3af81935802c832e585aa7c280136e75b0acc561b5
+  data.tar.gz: 666a449b3d17c960642fdbb498cc8367e6049dab07a58d640322672798d8937338a78bf089e2e59c5db42d68afa652db1af2fa861ac1b5e54a5470e05a95bd09

data/lib/hammer_cli_katello/content_view_version.rb

@@ -301,6 +301,7 @@ module HammerCLIKatello
           export_json_options[:repositories] = []
         else
           repositories = fetch_cvv_repositories(cvv)
+          check_repo_type(repositories)
           check_repo_download_policy(repositories)
 
           repositories.each do |repo|
@@ -316,7 +317,7 @@ module HammerCLIKatello
       end
 
       def create_tar(cv, cvv, repositories, json)
-        export_prefix = "export-#{cv['label']}-#{cvv['id']}"
+        export_prefix = "export-#{cv['label']}-#{cvv['major']}.#{cvv['minor']}"
         export_file = "#{export_prefix}.json"
         export_repos_tar = "#{export_prefix}-repos.tar"
         export_tar = "#{export_prefix}.tar"
@@ -349,6 +350,17 @@ module HammerCLIKatello
         end
       end
 
+      def check_repo_type(repositories)
+        repositories.select do |repo|
+          if repo['content_type'] != 'yum'
+            raise _("The Repository '#{repo['name']}' is a non-yum repository."\
+            " Only Yum is supported at this time."\
+            " Please remove the repository from the Content View,"\
+            " republish and try the export again.")
+          end
+        end
+      end
+
       def check_repo_download_policy(repositories)
         non_immediate = repositories.select do |repo|
           show(:repositories, 'id' => repo['library_instance_id'])['download_policy'] != 'immediate'
@@ -378,7 +390,7 @@ module HammerCLIKatello
       command_name "import"
 
       success_message _("Content view imported.")
-      failure_message _("Could not import the content view.")
+      failure_message _("Could not import the content view")
 
       option "--organization-id", "ORGANIZATION_ID", _("Organization numeric identifier")
       option(
@@ -393,6 +405,7 @@ module HammerCLIKatello
 
       build_options
 
+      # rubocop:disable Metrics/AbcSize
       def execute
         unless File.exist?(options['option_export_tar'])
           raise _("Export tar #{options['option_export_tar']} does not exist.")
@@ -403,18 +416,19 @@ module HammerCLIKatello
 
         export_json = read_json(import_tar_params)
         cv = content_view(export_json['name'], options['option_organization_id'])
+        major = export_json['major'].to_s
+        minor = export_json['minor'].to_s
+        import_checks(export_json, cv, major, minor)
 
         if export_json['composite_components']
           composite_version_ids = export_json['composite_components'].map do |component|
             find_local_component_id(component)
           end
-
           update(:content_views, 'id' => cv['id'], 'component_ids' => composite_version_ids)
           publish(cv['id'], export_json['major'], export_json['minor'])
         else
           sync_repositories(export_json['repositories'], options['option_organization_id'],
                             import_tar_params)
-
           publish(
             cv['id'], export_json['major'],
             export_json['minor'], repos_units(export_json['repositories'])
@@ -422,6 +436,7 @@ module HammerCLIKatello
         end
         return HammerCLI::EX_OK
       end
+      # rubocop:enable Metrics/AbcSize
 
       def sync_repositories(repositories, organization_id, options)
         export_tar_dir =  options[:dirname]

data/lib/hammer_cli_katello/cv_import_export_helper.rb

@@ -22,6 +22,33 @@ module HammerCLIKatello
       found_composite_version.first['id']
     end
 
+    def import_checks(cv, import_cv, major, minor)
+      version = "#{major}.#{minor}".to_f
+
+      if import_cv.nil?
+        raise _("The Content View #{cv['name']} is not present on this server,"\
+        " please create the Content View and try the import again.")
+      end
+
+      if import_cv['latest_version'].to_f >= version
+        raise _("The latest version (#{import_cv['latest_version']}) of"\
+        " the Content View '#{cv['name']}'"\
+        " is greater or equal to the version you are trying to import (#{version})")
+      end
+
+      unless import_cv['repository_ids'].nil?
+        repositories = import_cv['repository_ids'].collect do |repo_id|
+          show(:repositories, 'id' => repo_id)
+        end
+        repositories.each do |repo|
+          if repo['mirror_on_sync'] == true
+            raise _("The Repository '#{repo['name']}' is set with Mirror-on-Sync to YES."\
+            " Please change Mirror-on-Sync to NO and try the import again.")
+          end
+        end
+      end
+    end
+
     def untar_export(options)
       export_tar_file = options[:filename]
       export_tar_dir =  options[:dirname]

data/lib/hammer_cli_katello/ostree_branch.rb

@@ -24,7 +24,6 @@ module HammerCLIKatello
         field :name, _("Name")
         field :version, _("Version")
         field :commit, _("Commit")
-        field :version_date, _("Date")
       end
 
       build_options

data/lib/hammer_cli_katello/version.rb

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

data/test/functional/content_view/version/export_test.rb

@@ -51,9 +51,9 @@ describe 'content-view version export' do
     File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
 
     Dir.expects(:chdir).with("/var/lib/pulp/published/yum/https/repos/").returns(true)
-    Dir.expects(:mkdir).with('/tmp/exports/export-cv-5').returns(0)
+    Dir.expects(:mkdir).with('/tmp/exports/export-cv-1.0').returns(0)
     Dir.expects(:chdir).with('/tmp/exports').returns(0)
-    Dir.expects(:chdir).with('/tmp/exports/export-cv-5').returns(0)
+    Dir.expects(:chdir).with('/tmp/exports/export-cv-1.0').returns(0)
 
     result = run_cmd(@cmd + params)
     assert_equal(HammerCLI::EX_OK, result.exit_code)
@@ -87,9 +87,9 @@ describe 'content-view version export' do
     File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
 
     Dir.expects(:chdir).with("/var/lib/pulp/published/yum/https/repos/").never
-    Dir.expects(:mkdir).with('/tmp/exports/export-cv-999').returns(0)
+    Dir.expects(:mkdir).with('/tmp/exports/export-cv-1.0').returns(0)
     Dir.expects(:chdir).with('/tmp/exports').returns(0)
-    Dir.expects(:chdir).with('/tmp/exports/export-cv-999').returns(0)
+    Dir.expects(:chdir).with('/tmp/exports/export-cv-1.0').returns(0)
 
     result = run_cmd(@cmd + params)
     assert_equal(HammerCLI::EX_OK, result.exit_code)
@@ -182,4 +182,43 @@ describe 'content-view version export' do
     result = run_cmd(@cmd + params)
     assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
   end
+
+  it "fails export if any repository is not yum" do
+    params = [
+      '--id=5',
+      '--export-dir=/tmp/exports'
+    ]
+
+    ex = api_expects(:content_view_versions, :show)
+    ex.returns(
+      'id' => '5',
+      'repositories' => [{'id' => '2'}],
+      'major' => 1,
+      'minor' => 0,
+      'content_view' => {'name' => 'cv'},
+      'content_view_id' => 4321
+    )
+
+    ex = api_expects(:content_views, :show)
+    ex.returns(
+      'id' => '4321',
+      'composite' => false
+    )
+
+    ex = api_expects(:repositories, :show).with_params('id' => '2')
+    ex.returns(
+      'id' => '2',
+      'label' => 'Test_Repo',
+      'content_type' => 'file',
+      'backend_identifier' => 'Default_Organization-Library-Test_Repo',
+      'relative_path' => 'Default_Organization/Library/Test_Repo',
+      'library_instance_id' => '1'
+    )
+
+    File.expects(:exist?).with('/usr/share/foreman').returns(true)
+    File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
+
+    result = run_cmd(@cmd + params)
+    assert_equal(result.exit_code, 70)
+  end
 end

data/test/functional/content_view/version/import_test.rb

@@ -183,6 +183,100 @@ describe 'content-view version import' do
     assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
   end
 
+  it "fails import if cv has not been created" do
+    params = [
+      '--export-tar=/tmp/exports/export-2.tar',
+      '--organization-id=1'
+    ]
+
+    File.expects(:exist?).with('/usr/share/foreman').returns(true)
+    File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
+
+    File.expects(:exist?).with("/tmp/exports/export-2.tar").returns(true)
+    Dir.expects(:chdir).with('/tmp/exports').returns(0)
+    Dir.expects(:chdir).with('/tmp/exports/export-2').returns(0)
+    File.expects(:read).with("/tmp/exports/export-2/export-2.json").returns(
+      JSON.dump(
+        'name' => 'Foo View'
+      )
+    )
+
+    ex = api_expects(:content_views, :index)
+    ex = ex.with_params('name' => 'Foo View', 'organization_id' => '1')
+    ex.returns([])
+
+    result = run_cmd(@cmd + params)
+    assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
+  end
+
+  it "fails import if repo is set to mirror-on-sync" do
+    params = [
+      '--export-tar=/tmp/exports/export-2.tar',
+      '--organization-id=1'
+    ]
+
+    File.expects(:exist?).with('/usr/share/foreman').returns(true)
+    File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
+
+    File.expects(:exist?).with("/tmp/exports/export-2.tar").returns(true)
+    Dir.expects(:chdir).with('/tmp/exports').returns(0)
+    Dir.expects(:chdir).with('/tmp/exports/export-2').returns(0)
+    File.expects(:read).with("/tmp/exports/export-2/export-2.json").returns(
+      JSON.dump(
+        'name' => 'Foo View',
+        'major' => '2',
+        'minor' => '1'
+      )
+    )
+
+    ex = api_expects(:content_views, :index)
+    ex = ex.with_params('name' => 'Foo View', 'organization_id' => '1')
+    ex.returns(
+      'results' => [{
+        'id' => '5',
+        'repositories' => [{'id' => '2', 'label' => 'foo', 'mirror_on_sync' => 'true'}],
+        'content_view' => {'name' => 'cv'}
+      }]
+    )
+
+    result = run_cmd(@cmd + params)
+    assert_equal(result.exit_code, 70)
+  end
+
+  it "fails import if cv version already exists" do
+    params = [
+      '--export-tar=/tmp/exports/export-2.tar',
+      '--organization-id=1'
+    ]
+
+    File.expects(:exist?).with('/usr/share/foreman').returns(true)
+    File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
+
+    File.expects(:exist?).with("/tmp/exports/export-2.tar").returns(true)
+    Dir.expects(:chdir).with('/tmp/exports').returns(0)
+    Dir.expects(:chdir).with('/tmp/exports/export-2').returns(0)
+    File.expects(:read).with("/tmp/exports/export-2/export-2.json").returns(
+      JSON.dump(
+        'name' => 'Foo View',
+        'major' => '2',
+        'minor' => '1'
+      )
+    )
+
+    ex = api_expects(:content_views, :index)
+    ex = ex.with_params('name' => 'Foo View', 'organization_id' => '1')
+    ex.returns(
+      'results' => [{
+        'id' => '5',
+        'content_view' => {'name' => 'cv'},
+        'versions' => [{'version' => '2.1', 'id' => '654'}]
+      }]
+    )
+
+    result = run_cmd(@cmd + params)
+    assert_equal(result.exit_code, 70)
+  end
+
   it "fails import if any repository does not exist" do
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
@@ -198,7 +292,9 @@ describe 'content-view version import' do
     File.expects(:read).with("/tmp/exports/export-2/export-2.json").returns(
       JSON.dump(
         'name' => 'Foo View',
-        'repositories' => ['label' => 'foo']
+        'repositories' => ['label' => 'foo'],
+        'major' => '2',
+        'minor' => '1'
       )
     )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Adam Price
@@ -34,7 +34,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -485,8 +485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer