katello 3.3.0.rc2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e71d2d24ee870d0c10c9aef24333f76d6ba6cd9
-  data.tar.gz: fb29c9754551fe3fe1cb49e989dabdb47d732f74
+  metadata.gz: 72c6d6dfe62e3a0a76e95e6b9caab11e670994b4
+  data.tar.gz: 408e7b7c15707707971de9606a8ddfddfa12ea6a
 SHA512:
-  metadata.gz: c9b4d0575247f45221ae2d38ff05921af5e0d7cf0b0b20802d2c05b0f9e365353f0d7309e45586f4f8079cd17b86bb8c100ec6afe7a7de74b82a90cac5162781
-  data.tar.gz: c79a34dada9c793960804035c96a4c5f4a01376ef483476eae0edad7d9813f008818c1bcae68e66fd1681e9ece01b205bbe5d9604d83dab65c1fedf7443d1754
+  metadata.gz: d7c2353eb8c5a2132eeaa2a73aa1c8f43e3443736a2baa265233ae34363f10846aec547333cc25072a6dfa5fff9428933af308fab47fbe52306651539ceb814d
+  data.tar.gz: 9c73956553208c508f220a782ff0a6b703fb680b7f54d0b0e01ece0f762247449c3161d3174d655639460531d8e058c94116681f45924feb30afe07ef002a4e3

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -108,7 +108,8 @@ module Actions
                 end
               end
             end
-            new_repos.concat(old_repos)
+            new_repos.concat(old_repos) unless old_repos.blank?
+            new_repos
           else
             [old_version_repo]
           end

data/app/lib/actions/katello/repository/filtered_index_content.rb

@@ -20,7 +20,7 @@ module Actions
           elsif repo.file?
             ::Katello::FileUnit.import_for_repository(repo)
           else
-            ::Katello::Rpm.import_all(unit_ids, :additive => true)
+            ::Katello::Rpm.import_all(unit_ids)
           end
         end
 

data/app/lib/katello/resources/candlepin.rb

@@ -145,7 +145,7 @@ module Katello
           end
 
           def checkin(uuid, checkin_date)
-            checkin_date ||= DateTime.now
+            checkin_date ||= Time.now
             self.put(path(uuid), {:lastCheckin => checkin_date}.to_json, self.default_headers).body
           end
 
@@ -688,9 +688,9 @@ module Katello
           end
 
           def create_unlimited_subscription(owner_key, product_id)
-            start_date ||= DateTime.now
+            start_date ||= Time.now
             # End it 100 years from now
-            end_date ||= start_date + 10_950
+            end_date ||= start_date + 10_950.days
 
             subscription = {
               'startDate' => start_date,

data/app/models/katello/concerns/pulp_database_unit.rb

@@ -41,8 +41,7 @@ module Katello
 
       # Import all units of a single type and refresh their repository associations
       def import_all(uuids = nil, options = {})
-        additive = options.fetch(:additive, false)
-        index_repository_association = options.fetch(:index_repository_association, true)
+        index_repository_association = options.fetch(:index_repository_association, true) && self.manage_repository_association
 
         process_block = lambda do |units|
           units.each do |unit|
@@ -52,16 +51,20 @@ module Katello
             end
             item.update_from_json(unit)
           end
-          update_repository_associations(units, additive) if index_repository_association && self.manage_repository_association
-          units.count
+          if index_repository_association
+            units.map { |unit| unit.slice('_id', 'repository_memberships') }
+          else
+            units.count
+          end
         end
 
         if uuids
-          results = content_unit_class.fetch_by_uuids(uuids, &process_block)
+          results = content_unit_class.fetch_by_uuids(uuids, &process_block).flatten
+          update_repository_associations(results, true) if index_repository_association
         else
-          results = content_unit_class.fetch_all(&process_block)
+          results = content_unit_class.fetch_all(&process_block).flatten
+          update_repository_associations(results) if index_repository_association
         end
-        results.inject(:+)
       end
 
       def import_for_repository(repository, force = false)
@@ -110,9 +113,10 @@ module Katello
       def update_repository_associations(units_json, additive = false)
         ActiveRecord::Base.transaction do
           repo_unit_id = {}
+          repo_cache = {}
           units_json.each do |unit_json|
             unit_json['repository_memberships'].each do |repo_pulp_id|
-              if Repository.exists?(:pulp_id => repo_pulp_id)
+              if (repo_cache[repo_pulp_id] ||= Repository.exists?(:pulp_id => repo_pulp_id))
                 repo_unit_id[repo_pulp_id] ||= []
                 repo_unit_id[repo_pulp_id] << unit_json['_id']
               end

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -71,7 +71,7 @@ module Katello
         elsif has_feature?(PULP_NODE_FEATURE)
           path = ProxyAPI::PulpNode.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
         end
-        self.update_attribute(:puppet_path, path) if persisted?
+        self.update_attribute(:puppet_path, path || '') if persisted?
         path
       end
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-add-subscriptions.html

@@ -21,7 +21,7 @@
   </span>
 
   <div data-block="table">
-    <table ng-class="{'table-mask': table.working}" class="table table-full">
+    <table ng-class="{'table-mask': table.working}" class="table table-bordered">
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="quantity" sortable class="align-center"><span translate>Quantity</span></th>
@@ -37,8 +37,10 @@
 
       <tbody>
         <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions">
-          <td bst-table-cell class="row-select" style="white-space:nowrap">{{ name }}</td>
-          <td bst-table-cell colspan="8"></td>
+          <td class="row-select"></td>
+          <td colspan="8">
+            {{ name }}
+          </td>
         </tr>
         <tr bst-table-row 
             ng-repeat-end
@@ -57,7 +59,7 @@
             </select>
           </td>
           <td bst-table-cell>
-            <a href='/subscriptions/{{ subscription.id }}/info' class="confined-text">
+            <a href='/subscriptions/{{ subscription.id }}' class="confined-text">
               {{ subscription | subscriptionConsumedFilter }}
             </a>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-host-collections-table.html

@@ -30,7 +30,7 @@
 
     <div data-block="table">
       <table ng-show="table.rows.length > 0"
-             ng-class="{'table-mask': table.working}" class="table table-full table-striped">
+             ng-class="{'table-mask': table.working}" class="table table-bordered table-striped">
         <thead>
           <tr bst-table-head row-select="hostCollection">
             <th bst-table-column="name" translate>Name</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-subscriptions-list.html

@@ -20,7 +20,7 @@
   </span>
 
   <div data-block="table">
-    <table ng-class="{'table-mask': table.working}" class="table table-full">
+    <table ng-class="{'table-mask': table.working}" class="table table-bordered">
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="quantity" sortable class="align-center"><span translate>Quantity</span></th>
@@ -36,13 +36,15 @@
 
       <tbody>
         <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions | groupedFilter: subscriptionSearch">
-          <td bst-table-cell class="row-select" style="white-space:nowrap">{{ name }}</td>
-          <td bst-table-cell colspan="8" ></td>
+          <td class="row-select"></td>
+          <td colspan="8">
+            {{ name }}
+          </td>
         </tr>
         <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
           <td bst-table-cell>{{ subscription | subscriptionAttachAmountFilter }}</td>
           <td bst-table-cell>
-            <a href='/subscriptions/{{ subscription.id }}/info' class="confined-text">
+            <a href='/subscriptions/{{ subscription.id }}' class="confined-text">
               {{ subscription | subscriptionConsumedFilter }}
             </a>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/views/activation-keys.html

@@ -22,7 +22,7 @@
   </span>
 
   <div data-block="table">
-    <table class="table table-striped" ng-class="{'table-mask': table.working}">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
       <thead>
       <tr bst-table-head>
         <th bst-table-column="name" sortable><span translate>Name</span></th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-add-subscriptions.html

@@ -38,10 +38,9 @@
 
        <tbody>
          <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions">
-           <td class="row-select">
-             <a href='/subscriptions/{{ subscription.id }}/info' class="confined-text">
-              {{ name }}
-             </a>
+           <td class="row-select"></td>
+           <td colspan="8">
+            {{ name }}
            </td>
            <td bst-table-cell colspan="8"></td>
          </tr>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions-list.html

@@ -51,9 +51,7 @@
       <tbody>
         <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions | groupedFilter: subscriptionSearch">
           <td class="row-select">
-            <a href='/subscriptions/{{ subscription.id }}/info' class="confined-text">
               {{ name }}
-            </a>
           </td>
           <td bst-table-cell colspan="8"></td>
         </tr>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js

@@ -410,7 +410,7 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
         }
     })
     .state('content-view.info', {
-        url: '/info',
+        url: '',
         permission: 'view_content_views',
         templateUrl: 'content-views/details/views/content-view-info.html',
         ncyBreadcrumb: {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-repositories.html

@@ -51,7 +51,7 @@
 
     <div data-block="table">
       <table bst-table="table"
-             class="table table-striped"
+             class="table table-striped table-bordered"
              ng-class="{'table-mask': table.working}">
         <thead>
           <tr bst-table-head row-select>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-environments.html

@@ -24,7 +24,7 @@
 
   <div data-block="table">
     <table bst-table="table"
-           class="table table-striped"
+           class="table table-striped table-bordered"
            ng-class="{'table-mask': table.working}"
            ng-show="table.rows.length > 0">
       <thead>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/views/docker-tags.html

@@ -15,7 +15,7 @@
   </span>
 
   <div data-block="table">
-    <table class="table table-striped" ng-class="{'table-mask': table.working}">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="name">{{ "Name" | translate }}</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/views/gpg-key-products.html

@@ -6,7 +6,7 @@
   </span>
 
   <div data-block="table">
-    <table bst-table="table" class="table table-striped">
+    <table bst-table="table" class="table table-striped table-bordered">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="name" sortable><span translate>Name</span></th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/views/gpg-key-repositories.html

@@ -6,7 +6,7 @@
   </span>
 
   <div data-block="table">
-    <table class="table table-striped" ng-show="gpgKey.repositories.length > 0">
+    <table class="table table-striped table-bordered" ng-show="gpgKey.repositories.length > 0">
       <thead>
         <tr>
           <th translate>Name</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/views/gpg-keys.html

@@ -21,7 +21,7 @@
 
   <div data-block="table">
     <table bst-table="table"
-           class="table table-striped"
+           class="table table-striped table-bordered"
            ng-class="{'table-mask': table.working}"
            ng-show="table.rows.length > 0">
       <thead>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-add-hosts.html

@@ -24,7 +24,7 @@
 
   <div data-block="table">
     <table ng-class="{'table-mask': table.working}"
-           class="table table-full table-striped"
+           class="table table-bordered table-striped"
            ng-show="table.rows.length > 0">
       <thead>
         <tr bst-table-head row-select>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-hosts-list.html

@@ -23,7 +23,7 @@
 
   <div data-block="table">
     <table ng-class="{'table-mask': table.working}"
-           class="table table-full table-striped"
+           class="table table-bordered table-striped"
            ng-show="table.rows.length > 0">
       <thead>
         <tr bst-table-head row-select>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/views/host-collections.html

@@ -23,7 +23,7 @@
   </span>
 
   <div data-block="table">
-    <table class="table table-striped"
+    <table class="table table-striped table-bordered"
            ng-class="{'table-mask': table.working}"
            ng-show="table.rows.length > 0">
       <thead>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -152,7 +152,7 @@
     <section>
       <h4 translate>Content Counts</h4>
 
-      <table class="table table-striped">
+      <table class="table table-striped table-bordered">
         <thead>
         <tr>
           <th colspan="2" translate>Content Type</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html

@@ -89,7 +89,7 @@
 
   <div data-block="table">
     <table bst-table="table"
-           class="table table-striped"
+           class="table table-striped table-bordered"
            ng-show="table.rows.length > 0 && !table.working">
       <thead>
         <tr bst-table-head row-select>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery.html

@@ -66,7 +66,7 @@
 
   <div class="row">
     <div class="col-sm-12">
-      <table bst-table="discoveryTable" class="table table-striped">
+      <table bst-table="discoveryTable" class="table table-striped table-bordered">
         <thead>
           <tr bst-table-head row-select>
             <th bst-table-column translate>Discovered URLs</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/views/products.html

@@ -84,7 +84,7 @@
   </span>
 
   <div data-block="table">
-    <table class="table table-striped" ng-class="{'table-mask': table.working}">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
       <thead>
       <tr bst-table-head row-select>
         <th bst-table-column="name" sortable><span translate>Name</span></th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import-history.html

@@ -1,4 +1,4 @@
-<table class="table table-striped manifest-history">
+<table class="table table-striped table-bordered manifest-history">
   <thead>
     <tr>
       <th translate>Message</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscription-type.html

@@ -12,7 +12,7 @@
 </div>
 <div ng-if="subscription.virt_only === true && subscription.host">
   <span translate> Guests of </span>
-  <a href='/content_hosts/{{ subscription.host.id }}/info' translate>
+  <a href='/content_hosts/{{ subscription.host.id }}' translate>
     {{ subscription.host.name }}
   </a>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscriptions.html

@@ -26,7 +26,7 @@
    </span>
 
   <div data-block="table">
-    <table class="table" ng-class="{'table-mask': table.working}" ng-show="table.rows.length > 0">
+    <table class="table table-bordered" ng-class="{'table-mask': table.working}" ng-show="table.rows.length > 0">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="consumed" class="align-center"><span translate>Consumed</span></th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-products.html

@@ -48,7 +48,7 @@
 
   <div data-block="table">
     <table ng-show="table.rows.length > 0"
-           ng-class="{'table-mask': table.working}" class="table table-full table-striped">
+           ng-class="{'table-mask': table.working}" class="table table-bordered table-striped">
       <thead>
         <tr bst-table-head row-select="product">
           <th bst-table-column="name" translate>Name</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/views/sync-plans.html

@@ -21,7 +21,7 @@
   </span>
 
   <div data-block="table">
-    <table class="table table-striped"
+    <table class="table table-striped table-bordered"
            ng-class="{'table-mask': syncPlanTable.working}"
            ng-show="syncPlanTable.rows.length > 0">
       <thead>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/user-tasks-table.html

@@ -1,6 +1,6 @@
 <section class="nutupane-sub-section">
   <div bst-table="tasksTable">
-    <table ng-class="{'table-mask': tasksTable.working}" class="table table-full table-striped">
+    <table ng-class="{'table-mask': tasksTable.working}" class="table table-bordered table-striped">
       <thead>
       <tr bst-table-head>
         <th bst-table-column="Status" style="width: 20%" translate>Status</th>

data/lib/katello/tasks/unify_hosts.rake

@@ -99,6 +99,16 @@ namespace :katello do
       provisioning_host, facet_host = pick_hosts(host_one, host_two)
       return if provisioning_host.nil? || facet_host.nil?
 
+      if facet_host.compute_resource
+        puts "Host #{facet_host.name} is registered with subscription-manager but is assigned to a compute resource, please un-assign this host first."
+        return
+      end
+
+      if facet_host.managed?
+        puts "Host #{facet_host.name} is registered with subscription-manager but is managed, please un-unmanage this host first."
+        return
+      end
+
       puts "Unifying #{provisioning_host.name} with #{facet_host.name}\n"
       return if ENV['DRYRUN']
 

data/lib/katello/tasks/upgrade_check.rake

@@ -1,8 +1,9 @@
-CP_LISTEN_ACTION = "Actions::Candlepin::ListenOnCandlepinEvents".freeze
-
 namespace :katello do
   task :upgrade_check => ['environment'] do
     desc "Task that can be run before upgrading Katello to check if system is upgrade ready"
+    CP_LISTEN_ACTION = Actions::Candlepin::ListenOnCandlepinEvents.to_s
+    EVENT_QUEUE_ACTION = Actions::Katello::EventQueue::Monitor.to_s
+
     success = "PASS"
     fail = "FAIL"
 
@@ -10,7 +11,7 @@ namespace :katello do
     puts "Checking upgradeability...\n\n"
 
     # check for any running tasks
-    task_count = ::ForemanTasks::Task.active.where("label != '#{CP_LISTEN_ACTION}'").count
+    task_count = ::ForemanTasks::Task.active.where("label NOT IN (?)", [CP_LISTEN_ACTION, EVENT_QUEUE_ACTION]).count
     task_status = task_count > 0 ? fail : success
     puts "Checking for running tasks..."
     puts "[#{task_status}] - There are #{task_count} active tasks. "

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.3.0.rc2".freeze
+  VERSION = "3.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc2
+  version: 3.3.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: patternfly-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -2020,12 +2034,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ''