katello 3.4.0.rc2 → 3.4.0

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

@@ -154,6 +154,10 @@ module Katello
           end
           discovery
         end
+
+        def regenerate_ueber_cert
+          ::Katello::Resources::Candlepin::Owner.generate_ueber_cert(self.label)
+        end
       end
     end
   end

data/app/models/katello/events/import_pool.rb

@@ -0,0 +1,17 @@
+module Katello
+  module Events
+    class ImportPool
+      EVENT_TYPE = 'import_pool'.freeze
+
+      def initialize(pool_id)
+        @pool = ::Katello::Pool.find_by(:id => pool_id)
+      end
+
+      def run
+        @pool.try(:import_data)
+      rescue RestClient::ResourceNotFound
+        Rails.logger.warn "skipped re-index of non-existent pool #{@pool.cp_id}"
+      end
+    end
+  end
+end

data/app/models/katello/glue/candlepin/owner.rb

@@ -34,6 +34,10 @@ module Katello
         Resources::Candlepin::Owner.update(self.label, :defaultServiceLevel => level)
       end
 
+      def content_access_mode
+        self.owner_details['contentAccessMode']
+      end
+
       def pools(consumer_uuid = nil)
         if consumer_uuid
           Resources::Candlepin::Owner.pools self.label, :consumer => consumer_uuid

data/app/models/katello/host/subscription_facet.rb

@@ -106,8 +106,15 @@ module Katello
         end
       end
 
-      def update_subscription_status
-        host.get_status(::Katello::SubscriptionStatus).refresh!
+      def update_subscription_status(status_override = nil)
+        status = host.get_status(::Katello::SubscriptionStatus)
+        if status_override
+          status.status = status.to_status(:status_override => status_override)
+          status.save!
+        else
+          host.get_status(::Katello::SubscriptionStatus).refresh!
+        end
+
         host.refresh_global_status!
       end
 

data/app/models/katello/ping.rb

@@ -115,19 +115,19 @@ module Katello
       def pulp_without_auth(url)
         body = backend_status(url, :pulp)
 
-        fail _("Pulp does not appear to be running.") if body.empty?
+        fail _("Pulp does not appear to be running at %s.") % url if body.empty?
         json = JSON.parse(body)
 
         if json['database_connection'] && json['database_connection']['connected'] != true
-          fail _("Pulp database connection issue.")
+          fail _("Pulp database connection issue at %s.") % url
         end
 
         if json['messaging_connection'] && json['messaging_connection']['connected'] != true
-          fail _("Pulp message bus connection issue.")
+          fail _("Pulp message bus connection issue at %s.") % url
         end
 
         unless all_pulp_workers_present?(json)
-          fail _("Not all necessary pulp workers running.")
+          fail _("Not all necessary pulp workers running at %s.") % url
         end
 
         json

data/app/models/katello/subscription_status.rb

@@ -35,9 +35,12 @@ module Katello
       end
     end
 
-    def to_status(_options = {})
+    def to_status(options = {})
       return UNKNOWN unless host.subscription_facet.try(:uuid)
-      case Katello::Candlepin::Consumer.new(host.subscription_facet.uuid, host.organization.label).entitlement_status
+      status_override = options.fetch(:status_override, nil)
+      status = status_override || Katello::Candlepin::Consumer.new(host.subscription_facet.uuid, host.organization.label).entitlement_status
+
+      case status
       when Katello::Candlepin::Consumer::ENTITLEMENTS_VALID
         VALID
       when Katello::Candlepin::Consumer::ENTITLEMENTS_PARTIAL

data/app/services/cert/certs.rb

@@ -15,5 +15,12 @@ module Cert
     def self.ssl_client_key
       @ssl_client_key ||= OpenSSL::PKey::RSA.new(File.open(Setting['pulp_client_key'], 'r').read)
     end
+
+    def self.verify_ueber_cert(organization)
+      ueber_cert = OpenSSL::X509::Certificate.new(self.ueber_cert(organization)[:cert])
+      cert_store = OpenSSL::X509::Store.new
+      cert_store.add_file Setting[:ssl_ca_file]
+      organization.regenerate_ueber_cert unless cert_store.verify ueber_cert
+    end
   end
 end

data/config/routes/api/rhsm.rb

@@ -16,6 +16,7 @@ Katello::Engine.routes.draw do
       end
       match '/consumers' => 'candlepin_proxies#consumer_create', :via => :post
       match '/hypervisors' => 'candlepin_proxies#hypervisors_update', :via => :post
+      match '/hypervisors/:owner/' => 'candlepin_proxies#async_hypervisors_update', :via => :post
       match '/owners/:organization_id/environments' => 'candlepin_proxies#rhsm_index', :via => :get
       match '/owners/:organization_id/pools' => 'candlepin_proxies#get', :via => :get, :as => :proxy_owner_pools_path
       match '/owners/:organization_id/servicelevels' => 'candlepin_proxies#get', :via => :get, :as => :proxy_owner_servicelevels_path
@@ -39,8 +40,8 @@ Katello::Engine.routes.draw do
       match '/deleted_consumers' => 'candlepin_proxies#get', :via => :get, :as => :proxy_deleted_consumers_path
       match '/entitlements/:id' => 'candlepin_proxies#get', :via => :get, :as => :proxy_entitlements_path
       match '/subscriptions' => 'candlepin_proxies#post', :via => :post, :as => :proxy_subscriptions_post_path
-      match '/consumers/:id/profile/' => 'candlepin_proxies#upload_package_profile', :via => :put
-      match '/consumers/:id/packages/' => 'candlepin_proxies#upload_package_profile', :via => :put
+      match '/consumers/:id/profile/' => 'candlepin_dynflow_proxy#upload_package_profile', :via => :put
+      match '/consumers/:id/packages/' => 'candlepin_dynflow_proxy#upload_package_profile', :via => :put
       match '/consumers/:id/tracer/' => 'candlepin_proxies#upload_tracer_profile', :via => :put
       match '/consumers/:id/checkin/' => 'candlepin_proxies#checkin', :via => :put
       match '/consumers/:id' => 'candlepin_proxies#facts', :via => :put
@@ -54,6 +55,7 @@ Katello::Engine.routes.draw do
       match '/consumers/:id/content_overrides/' => 'candlepin_proxies#delete', :via => :delete, :as => :proxy_consumer_content_overrides_delete_path
       match '/consumers/:id/available_releases' => 'candlepin_proxies#available_releases', :via => :get
       match '/systems/:id/enabled_repos' => 'candlepin_proxies#enabled_repos', :via => :put
+      match '/jobs/:jobId' => 'candlepin_proxies#get', :via => :get, :as => :proxy_jobs_get_path
       match '/status' => 'candlepin_proxies#server_status', :via => :get
     end
   end

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

@@ -40,6 +40,7 @@
   </div>
 
   <nav data-block="navigation">
+    <div content-access-mode-banner></div>
     <ul class="nav nav-tabs details-nav">
       <li ng-class="{active: isState('activation-key.info')}">
         <a ui-sref="activation-key.info">
@@ -89,4 +90,4 @@
   <section data-block="content">
     <div ui-view></div>
   </section>
-</div>
+</div>

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

@@ -3,12 +3,10 @@
 
   <div data-extend-template="layouts/partials/table.html">
     <div data-block="search">
-      <div class="input-group">
-        <input type="text"
-               class="form-control"
-               placeholder="{{ 'Filter' | translate }}"
-               ng-model="hostCollectionFilter"/>
-      </div>
+      <input type="text"
+             class="form-control"
+             placeholder="{{ 'Filter' | translate }}"
+             ng-model="hostCollectionFilter"/>
     </div>
 
     <div data-block="list-actions">

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

@@ -1,9 +1,9 @@
 <span page-title ng-model="activationKey">{{ 'Details for Activation Key:' | translate }} {{ activationKey.name }}</span>
 
 <div bst-alert="info">
-  <p translate>
+  <span translate>
     This activation key may be used during system registration. For example:
-  </p>
+  </span>
   <p translate>
     subscription-manager register --org="{{ activationKey.organization.label }}" --activationkey="{{ activationKey.name }}"
   </p>

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

@@ -5,7 +5,7 @@
     <h2 translate>New Activation Key</h2>
   </header>
 
-  <div data-block="content">
+  <div data-block="content" class="row">
     <form name="activationKeyForm" class="col-sm-5" novalidate role="form">
 
       <div bst-form-group label="{{ 'Name' | translate }}">

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

@@ -45,6 +45,7 @@
   </nav>
 
   <nav data-block="navigation">
+    <div content-access-mode-banner></div>
     <ul class="nav nav-tabs">
       <li ng-class="{active: isState('content-host.info')}">
         <a translate

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

@@ -292,4 +292,4 @@
       </dd>
     </dl>
   </div>
-</div>
+</div>

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

@@ -55,7 +55,6 @@
              ng-class="{'table-mask': table.working}">
         <thead>
           <tr bst-table-head row-select>
-            <th bst-table-column="affectedRepos">Affected?</th>
             <th bst-table-column="name" translate>Name</th>
             <th bst-table-column="product" translate>Product</th>
             <th bst-table-column="type" translate>Type</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/new/views/content-view-new.html

@@ -27,7 +27,7 @@
     </form>
   </div>
 
-  <div data-block="content">
+  <div data-block="content" class="row">
     <form name="contentViewForm" class="col-sm-5" novalidate role="form">
       <div bst-form-group label="{{ 'Name' | translate }}">
         <input id="name"

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

@@ -1,17 +1,10 @@
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="search">
-    <div class="col-sm-6">
-      <form class="form-inline">
-        <div class="form-group">
-            <input type="text"
-                   class="form-control"
-                   placeholder="{{ 'Filter' | translate }}"
-                   ng-model="dockerTagFilter"/>
-
-        </div>
-      </form>
-    </div>
+    <input type="text"
+           class="form-control"
+           placeholder="{{ 'Filter' | translate }}"
+           ng-model="dockerTagFilter"/>
   </div>
 
   <span data-block="no-rows-message" translate>

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

@@ -3,7 +3,7 @@
     <h2 translate>Create GPG Key</h2>
   </header>
 
-  <div data-block="content">
+  <div data-block="content" class="row">
     <form name="gpgKeyForm" class="col-sm-5" novalidate role="form"
           action="{{ uploadURL }}"
           ng-upload="uploadContent(content)"

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

@@ -5,7 +5,7 @@
     <h2 translate>Create Host Collection</h2>
   </header>
 
-  <div data-block="content">
+  <div data-block="content" class="row">
     <form name="hostCollectionForm" class="col-sm-5" novalidate role="form">
       <div bst-form-group label="{{ 'Name' | translate }}">
         <input id="name"

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

@@ -4,7 +4,7 @@
 
 <div bst-alerts error-messages="errorMessages" success-messages="successMessages"></div>
 
-<div data-block="content">
+<div data-block="content" class="row">
   <form name="repositoryForm" class="col-sm-5" novalidate role="form">
     <div>
       <h4 translate> General Information </h4>

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

@@ -23,7 +23,7 @@
         </li>
 
         <li role="menuitem" ng-hide="denied('create_sync_plans')">
-          <a ui-sref="product.new-sync-plan">
+          <a ui-sref="openProductModal()">
             <span translate>New Sync Plan</span>
           </a>
         </li>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/new-sync-plan-modal.controller.js

@@ -0,0 +1,46 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.proudcts.controller:NewSyncPlanModalController
+ *
+ * @requires $scope
+ * @requires $uibModalInstance
+ * @requires SyncPlan
+ * @requires SyncPlanHelper
+ *
+ * @description
+ *   A controller for creating a new sync plan in a modal.
+ */
+angular.module('Bastion.products').controller('NewSyncPlanModalController',
+    ['$scope', '$uibModalInstance', 'SyncPlan', 'SyncPlanHelper',
+        function ($scope, $uibModalInstance, SyncPlan, SyncPlanHelper) {
+            function success(syncPlan) {
+                $uibModalInstance.close(syncPlan);
+            }
+
+            function error(response) {
+                var form = SyncPlanHelper.getForm();
+
+                angular.forEach(response.data.errors, function (errors, field) {
+                    form[field].$setValidity('server', false);
+                    form[field].$error.messages = errors;
+                });
+            }
+
+            $scope.ok = function (syncPlan) {
+                SyncPlanHelper.createSyncPlan(syncPlan, success, error);
+            };
+
+            $scope.cancel = function () {
+                $uibModalInstance.dismiss('cancel');
+            };
+
+            $scope.isFormDisabled = function () {
+                var form = SyncPlanHelper.getForm();
+                return form && !form.$valid;
+            };
+
+            $scope.intervals = SyncPlanHelper.getIntervals();
+            $scope.syncPlan = new SyncPlan();
+            $scope.syncPlan.interval = $scope.intervals[0].id;
+        }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/product-form.controller.js

@@ -4,19 +4,21 @@
  *
  * @requires $scope
  * @requires $q
+ * @requires $uibModal
  * @requires Product
  * @requires GPGKey
  * @requires SyncPlan
  * @requires FormUtils
  *
+ *
  * @description
  *   Provides the functionality specific to Products for use with the Nutupane UI pattern.
  *   Defines the columns to display and the transform function for how to generate each row
  *   within the table.
  */
 angular.module('Bastion.products').controller('ProductFormController',
-    ['$scope', '$q', 'Product', 'GPGKey', 'SyncPlan', 'FormUtils', 'GlobalNotification',
-    function ($scope, $q, Product, GPGKey, SyncPlan, FormUtils, GlobalNotification) {
+    ['$scope', '$q', '$uibModal', 'Product', 'GPGKey', 'SyncPlan', 'FormUtils', 'GlobalNotification',
+    function ($scope, $q, $uibModal, Product, GPGKey, SyncPlan, FormUtils, GlobalNotification) {
 
         function fetchGpgKeys() {
             return GPGKey.queryUnpaged(function (gpgKeys) {
@@ -62,5 +64,16 @@ angular.module('Bastion.products').controller('ProductFormController',
         $q.all([fetchSyncPlans().$promise, fetchGpgKeys().$promise]).finally(function () {
             $scope.page.loading = false;
         });
+
+        $scope.openSyncPlanModal = function () {
+            $uibModal.open({
+                templateUrl: 'products/new/views/new-sync-plan-modal.html',
+                controller: 'NewSyncPlanModalController'
+            }).result.then(function ($value) {
+                fetchSyncPlans().$promise.then(function () {
+                    $scope.product['sync_plan_id'] = $value.id;
+                });
+            });
+        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/views/new-sync-plan-modal.html

@@ -0,0 +1,18 @@
+<div data-extend-template="components/views/bst-modal.html" ng-controller="NewSyncPlanController">
+  <h4 data-block="modal-header" translate>
+    New Sync Plan
+  </h4>
+
+  <div data-block="modal-body">
+    <div ng-include="'sync-plans/new/views/new-sync-plan-form.html'"></div>
+  </div>
+
+  <span data-block="modal-confirm-button">
+    <button class="btn btn-primary" ng-click="ok(syncPlan)"
+            ng-disabled="isFormDisabled()">
+      <span translate>Save</span>
+    </button>
+  </span>
+</div>
+
+

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/views/product-new-form.html

@@ -1,30 +1,31 @@
-<form name="productForm" class="col-sm-5" novalidate role="form">
+<div class="row">
+  <form name="productForm" class="col-sm-5" novalidate role="form">
 
-  <div bst-form-group label="{{ 'Name' | translate }}">
-    <input id="name"
-           name="name"
-           ng-model="product.name"
-           type="text"
-           autofocus
-           required/>
-  </div>
+    <div bst-form-group label="{{ 'Name' | translate }}">
+      <input id="name"
+             name="name"
+             ng-model="product.name"
+             type="text"
+             autofocus
+             required/>
+    </div>
 
-  <div bst-form-group label="{{ 'Label' | translate }}">
-    <input id="label"
-           name="label"
-           ng-model="product.label"
-           type="text"
-           required/>
-  </div>
+    <div bst-form-group label="{{ 'Label' | translate }}">
+      <input id="label"
+             name="label"
+             ng-model="product.label"
+             type="text"
+             required/>
+    </div>
 
-  <div bst-form-group label="{{ 'GPG Key' | translate }}">
-    <select id="gpg_key_id"
-            name="gpg_key_id"
-            ng-model="product.gpg_key_id"
-            ng-options="gpg_key.id as gpg_key.name for gpg_key in gpgKeys">
-      <option value=""></option>
-    </select>
-  </div>
+    <div bst-form-group label="{{ 'GPG Key' | translate }}">
+      <select id="gpg_key_id"
+              name="gpg_key_id"
+              ng-model="product.gpg_key_id"
+              ng-options="gpg_key.id as gpg_key.name for gpg_key in gpgKeys">
+        <option value=""></option>
+      </select>
+    </div>
 
   <div bst-form-group label="{{ 'Sync Plan' | translate }}">
     <select id="sync_plan_id"
@@ -33,23 +34,24 @@
             ng-options="syncPlan.id as syncPlan.name for syncPlan in syncPlans">
       <option value=""></option>
     </select>
-    <a ui-sref="products.new.sync-plan" translate>
+    <a ng-click="openSyncPlanModal()">
       <i class="pficon pficon-add-circle-o"></i>
-      Create Sync Plan
+      <span translate>Create Sync Plan</span>
     </a>
   </div>
 
-  <div bst-form-group label="{{ 'Description' | translate }}">
-    <textarea id="description"
-              name="description"
-              ng-model="product.description">
-    </textarea>
-  </div>
+    <div bst-form-group label="{{ 'Description' | translate }}">
+      <textarea id="description"
+                name="description"
+                ng-model="product.description">
+      </textarea>
+    </div>
 
-  <div bst-form-buttons
-       on-cancel="transitionTo('products')"
-       on-save="save(product)"
-       working="working">
-  </div>
+    <div bst-form-buttons
+         on-cancel="transitionTo('products')"
+         on-save="save(product)"
+         working="working">
+    </div>
 
-</form>
+  </form>
+</div>