katello 3.7.0.rc1 → 3.7.0.rc2

data/app/views/katello/api/v2/upstream_subscriptions/base.json.rabl

@@ -1,7 +1,6 @@
 object @resource ||= @object
 
-attributes :pool_id => :id
-attributes :pool_id
+attributes :id
 attributes :status
 attributes :quantity
 attributes :available
@@ -12,7 +11,4 @@ attributes :consumed
 attributes :product_name
 attributes :product_id
 attributes :subscription_id
-
-if params[:pool_ids]
-  attributes :local_pool_ids
-end
+attributes :local_pool_ids

data/app/views/katello/layouts/react.html.erb

@@ -3,13 +3,13 @@
 <% end %>
 
 <% content_for(:javascripts) do %>
-    <%= javascript_include_tag *webpack_asset_paths('katello', :extension => 'js'), "data-turbolinks-track" => true, 'defer' => 'defer' %>
+    <%= javascript_include_tag *webpack_asset_paths('katello', :extension => 'js') %>
 <% end %>
 
 <% content_for(:content) do %>
     <%= notifications %>
-    <div id="reactRoot"></div>
     <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
+    <div id="reactRoot"></div>
 <% end %>
-
 <%= render file: "layouts/base" %>
+<%= mount_react_component('katello', '#reactRoot') %>

data/config/katello.yaml

@@ -0,0 +1,89 @@
+:katello:
+  #if this block is not define, all types are enabled
+  #types are defined in lib/katello/repository_types/*.rb
+  :content_types:
+    :yum: true
+    :file: true
+    :deb: true
+    :puppet: true
+    :docker: true
+    :ostree: true
+
+  :use_cp: true # set to true/false if you want to override default
+  :use_pulp: true # set to true/false if you want to override default
+
+  :rest_client_timeout: 30
+  :gpg_strict_validation: false
+
+  :puppet_repo_root: '/etc/puppet/environments/'
+
+  :post_sync_url: "http://localhost:3000/katello/api/v2/repositories/sync_complete?token=katello"
+
+  :redhat_repository_url: https://cdn.redhat.com
+
+  :consumer_cert_rpm: 'katello-ca-consumer-latest.noarch.rpm'
+  :consumer_cert_sh:  'katello-rhsm-consumer'
+
+  # Setup your candlepin environment here
+  :candlepin:
+    # refers to the url of the candlepin
+    # example https://localhost:8443/candlepin
+    :url: https://192.168.42.116:31329/candlepin
+
+    # Specify your oauth key and secret used to authenticate between Katello and Candlepin
+    :oauth_key: katello
+    :oauth_secret: katello
+
+    # refers to the candlepin-ca.crt location that is needed
+    # to connect to candlepin over https.This is not necessary
+    # if the candlepin server is running on the same machine as katello
+    # but required if the server is on a different machine.
+    # In the different machine case the katello host needs to have a
+    # copy of /etc/candlepin/certs/candlepin-ca.crt copied from
+    # the candlepin host and the location of the copied file needs to be
+    # specified here..
+    :ca_cert_file:
+    # :bulk_load_size: 1000
+  # Setup your pulp environment here
+  :pulp:
+    # refers to the url of the pulp
+    # example https://localhost/pulp/api
+    :url: https://192.168.42.116:30133/pulp/api/v2/
+
+    :sync_threads: 4
+    :bulk_load_size: 100
+    # refers to the apache certificate
+    # (typically /etc/pki/tls/certs/localhost.crt) location that is needed
+    # to connect to pulp over https.
+    :ca_cert_file:
+    :default_login: admin
+    :sync_KBlimit:
+    :upload_chunk_size: 1048575 # upload size in bytes to pulp. see SSLRenegBufferSize in apache
+    :skip_checksum_validation: false
+
+  :qpid:
+    :url: amqp:ssl:katello-devel.example.com:5671
+    :subscriptions_queue_address: katello_event_queue
+
+  :cdn_proxy:
+  #    :host: localhost
+  #    :port: 3128
+  #    :user: login
+  #    :password: password
+
+# Logging configuration can be changed by uncommenting the loggers
+# section and the logger configuration desired.
+#
+#  :loggers:
+#    :glue:
+#      :enabled: true
+#    :pulp_rest:
+#      :enabled: true
+#    :cp_rest:
+#      :enabled: true
+#    :cp_proxy:
+#      :enabled: true
+#    :action:
+#      :enabled: true
+#    :manifest_import_logger:
+#      :enabled: true

data/config/routes.rb

@@ -18,6 +18,9 @@ Katello::Engine.routes.draw do
   get '/katello/providers/redhat_provider', to: redirect('/redhat_repositories')
   match '/redhat_repositories' => 'react#index', :via => [:get]
 
+  match '/subscriptions' => 'react#index', :via => [:get]
+  match '/subscriptions/*page' => 'react#index', :via => [:get]
+
   match '/xui' => 'react#index', :via => [:get]
   match '/xui/*page' => 'react#index', :via => [:get]
 end

data/db/migrate/20160302091113_change_environment_prior.rb

@@ -0,0 +1,9 @@
+class ChangeEnvironmentPrior < ActiveRecord::Migration[4.2]
+  def up
+    add_column :katello_environment_priors, :id, :primary_key
+  end
+
+  def down
+    remove_column :katello_environment_priors, :id
+  end
+end

data/db/migrate/20180410140909_add_organization_id_to_pool.rb

@@ -4,7 +4,8 @@ class AddOrganizationIdToPool < ActiveRecord::Migration[5.1]
     add_foreign_key 'katello_pools', 'taxonomies',
                 :name => 'katello_pools_organization_id', :column => 'organization_id'
 
-    Katello::Pool.find_each do |pool|
+    ::Katello::Pool.reset_column_information
+    ::Katello::Pool.find_each do |pool|
       pool.update_attributes(:organization_id => pool.subscription.organization_id) if pool.subscription
     end
   end

data/db/migrate/20180612163403_add_foreign_key_to_hypervisor_id.rb

@@ -0,0 +1,10 @@
+class AddForeignKeyToHypervisorId < ActiveRecord::Migration[5.1]
+  def up
+    add_foreign_key(:katello_pools, :hosts,
+                    :name => 'katello_pools_hypervisor_fk', :column => 'hypervisor_id')
+  end
+
+  def down
+    remove_foreign_key(:katello_pools, :name => 'katello_pools_hypervisor_fk')
+  end
+end

data/db/migrate/20180612164926_add_content_org_id.rb

@@ -0,0 +1,39 @@
+class AddContentOrgId < ActiveRecord::Migration[5.1]
+  class FakeContent < Katello::Model
+    self.table_name = 'katello_contents'
+    has_many :product_contents, :class_name => 'FakeProductContent', :dependent => :destroy, :foreign_key => 'content_id'
+    has_many :products, :through => :product_contents
+  end
+
+  class FakeProductContent < Katello::Model
+    self.table_name = 'katello_product_contents'
+    belongs_to :product, :class_name => 'Katello::Product', :foreign_key => 'product_id', :inverse_of => :product_contents
+    belongs_to :content, :class_name => 'FakeContent', :foreign_key => 'content_id', :inverse_of => :product_contents
+  end
+
+  class FakeProduct < Katello::Model
+    self.table_name = 'katello_products'
+  end
+
+  def up
+    add_column :katello_contents, :organization_id, :integer, :null => true
+    add_foreign_key :katello_contents, :taxonomies, :column => :organization_id, :primary_key => :id
+
+    Katello::Content.where(:organization_id => nil).find_each do |content|
+      org_ids = content.products.pluck(:organization_id).uniq
+      org_ids.each do |org_id|
+        attrs = content.attributes.except('id')
+        attrs['organization_id'] = org_id
+        new_content = FakeContent.create!(attrs)
+        new_content.products = content.products.where('katello_products.organization_id' => org_id)
+      end
+    end
+
+    FakeContent.where(:organization_id => nil).destroy_all
+    change_column :katello_contents, :organization_id, :integer, :null => false
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20180612165011_remove_content_fields_from_host.rb

@@ -0,0 +1,7 @@
+class RemoveContentFieldsFromHost < ActiveRecord::Migration[5.1]
+  def change
+    # These fields were moved to the content facet
+    remove_column :hosts, :content_view_id
+    remove_column :hosts, :lifecycle_environment_id
+  end
+end

data/db/migrate/20180626160422_add_upstream_pool_id_to_katello_pool.rb

@@ -0,0 +1,9 @@
+class AddUpstreamPoolIdToKatelloPool < ActiveRecord::Migration[5.1]
+  def up
+    add_column :katello_pools, :upstream_pool_id, :string
+  end
+
+  def down
+    remove_column :katello_pools, :upstream_pool_id
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html

@@ -67,7 +67,7 @@
                required/>
       </div>
 
-      <div>
+      <div class = "bottom-padded-content">
       <span uib-dropdown class="input-group-btn">
         <button class="btn btn-default" type="button"
                 translate

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

@@ -15,7 +15,7 @@
       </li>
       <li>
         <p translate>Install the pre-built bootstrap RPM:</p>
-        <pre><code>rpm -Uvh https://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/{{ consumerCertRPM }}</code></pre>
+        <pre><code>curl --insecure --output {{ consumerCertRPM }} https://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/{{ consumerCertRPM }}<br />yum localinstall {{ consumerCertRPM }} </code></pre>
       </li>
       <li>
         <p translate>Register using subscription-manager:</p>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment-content.controller.js

@@ -20,8 +20,7 @@
         function fetchRepositories(contentView) {
             var promise, params = {
                 'environment_id': $scope.$stateParams.environmentId,
-                'content_type': ContentService.getRepositoryType(),
-                library: true
+                'content_type': ContentService.getRepositoryType()
             };
 
             if (contentView && contentView.id !== 'all') {
@@ -64,7 +63,7 @@
             return versionId;
         }
 
-        nutupaneParams = {'environment_id': $scope.$stateParams.environmentId, library: true};
+        nutupaneParams = {'environment_id': $scope.$stateParams.environmentId};
         if ($location.search().repositoryId) {
             nutupaneParams['repository_id'] = $location.search().repositoryId;
         }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment.html

@@ -1,3 +1,5 @@
+<span page-title ng-model="environment">{{ 'Lifecycle Environment:' | translate }} {{ environment.name }}</span>
+
 <div data-extend-template="layouts/details-page-with-breadcrumbs.html">
   <header data-block="header">
     {{ environment.name }}
@@ -13,7 +15,7 @@
   </div>
 
   <nav data-block="navigation">
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs details-nav">
       <li ng-class="{active: isState('environment.details')}">
         <a ui-sref="environment.details({environmentId: environment.id})">
           <span translate>Details</span>
@@ -32,4 +34,4 @@
   <section data-block="content">
     <div ui-view></div>
   </section>
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.controller.js

@@ -3,30 +3,35 @@
  * @name  Bastion.environments.controller:EnvironmentsController
  *
  * @requires $scope
+ * @requires PathsService
+ * @requires $location
  * @requires Organization
  * @requires CurrentOrganization
+ * @requires Nutupane
+ * @requires Environment
  *
  * @description
  *   Provides the functionality for the environments path page.
  */
 angular.module('Bastion.environments').controller('EnvironmentsController',
-    ['$scope', 'Organization', 'CurrentOrganization',
-        function ($scope, Organization, CurrentOrganization) {
+    ['$scope', 'PathsService', '$location', 'Organization', 'CurrentOrganization', 'Nutupane', 'Environment',
+        function ($scope, PathsService, $location, Organization, CurrentOrganization, Nutupane, Environment) {
 
-            Organization.paths({id: CurrentOrganization}, function (paths) {
-                var actualPaths = [];
-
-                $scope.library = paths[0].environments[0];
-
-                angular.forEach(paths, function (path, index) {
-                    paths[index].environments.splice(0, 1);
+            var params = {
+                'organization_id': CurrentOrganization,
+                'search': $location.search().search || "",
+                'sort_by': 'name',
+                'sort_order': 'ASC',
+                'paged': true
+            };
 
-                    if (paths[index].environments.length !== 0) {
-                        actualPaths.push(path);
-                    }
-                });
+            var nutupane = new Nutupane(Environment, params);
+            $scope.table = nutupane.table;
 
-                $scope.paths = actualPaths;
+            PathsService.getActualPaths().then(function (data) {
+                $scope.library = data.library;
+                $scope.paths = data.paths;
+                $scope.loading = false;
             });
 
             $scope.lastEnvironment = function (path) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/new-environment.controller.js

@@ -8,7 +8,7 @@
      * @description
      *   Handles creating a new environment.
      */
-    function NewEnvironmentController($scope, Environment, FormUtils, Notification) {
+    function NewEnvironmentController($scope, Environment, FormUtils, Notification, PathsService) {
 
         function success() {
             $scope.transitionTo('environments');
@@ -30,12 +30,18 @@
         $scope.environment = new Environment();
         $scope.priorEnvironment = Environment.get({id: $scope.$stateParams.priorId});
 
-        $scope.priorEnvironment.$promise.then(function () {
-            $scope.loading = false;
+        $scope.priorEnvironment.$promise.then(function (prior) {
+            PathsService.getCurrentPath(prior).then(function (path) {
+                $scope.currentPath = path || null;
+                $scope.environment['prior_id'] = $scope.priorEnvironment.id;
+                if (path) {
+                    $scope.environment['path_id'] = $scope.currentPath[1].id;
+                }
+                $scope.loading = false;
+            });
         });
 
         $scope.save = function (environment) {
-            environment['prior_id'] = $scope.$stateParams.priorId;
             environment.$save(success, error);
         };
 
@@ -46,12 +52,19 @@
             }
         });
 
+        $scope.$watch('environment.prior_id', function (priorId) {
+            angular.forEach($scope.currentPath, function (env) {
+                if (env.id === priorId) {
+                    $scope.priorEnvironment = env;
+                }
+            });
+        });
     }
 
     angular
         .module('Bastion.environments')
         .controller('NewEnvironmentController', NewEnvironmentController);
 
-    NewEnvironmentController.$inject = ['$scope', 'Environment', 'FormUtils', 'Notification'];
+    NewEnvironmentController.$inject = ['$scope', 'Environment', 'FormUtils', 'Notification', 'PathsService'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/paths.service.js

@@ -0,0 +1,51 @@
+angular.module('Bastion.environments').service('PathsService',
+    ['$q', 'Organization', 'CurrentOrganization',
+        function ($q, Organization, CurrentOrganization) {
+
+            this.getActualPaths = function () {
+                var actualPaths = [];
+
+                return this.loadPaths().then(function (paths) {
+                    var data = {};
+                    data.library = paths[0].environments[0];
+
+                    angular.forEach(paths, function (path, index) {
+                        paths[index].environments.splice(0, 1);
+
+                        if (paths[index].environments.length !== 0) {
+                            actualPaths.push(path);
+                        }
+                    });
+                    data.paths = actualPaths;
+                    return data;
+                });
+            };
+
+            this.loadPaths = function () {
+                var deferred = $q.defer();
+
+                Organization.paths({id: CurrentOrganization}, function (response) {
+                    deferred.resolve(response);
+                });
+                return deferred.promise;
+            };
+
+            this.getCurrentPath = function (prior) {
+                return this.loadPaths().then(function (paths) {
+                    var currentPath = null;
+                    if (prior.library) {
+                        currentPath = [prior];
+                    } else {
+                        angular.forEach(paths, function (path) {
+                            angular.forEach(path.environments, function (env) {
+                                if (env.id === prior.id) {
+                                    currentPath = path;
+                                }
+                            });
+                        });
+                    }
+                    return currentPath.environments;
+                });
+            };
+        }]
+);