katello 3.0.2 → 3.1.0.rc1

data/config/routes/api/v2.rb

@@ -155,6 +155,7 @@ Katello::Engine.routes.draw do
           api_resources :activation_keys, :only => [:index]
           api_resources :content_views, :only => [:index, :create]
           api_resources :environments, :only => [:index, :show, :create, :update, :destroy] do
+            api_resources :repositories, :only => [:index]
             collection do
               get :paths
               get :auto_complete_search
@@ -239,14 +240,9 @@ Katello::Engine.routes.draw do
         end
 
         api_resources :systems, :only => [:index, :show, :create, :update, :destroy] do
-          member do
-            get :releases
-          end
           collection do
             get :auto_complete_search
           end
-          api_resources :activation_keys, :only => [:index]
-          api_resources :host_collections, :only => [:index]
           api_resources :products, :only => [:index]
         end
 
@@ -344,7 +340,9 @@ Katello::Engine.routes.draw do
 
         api_resources :environments, :only => [] do
           api_resources :products, :only => [:index] do
-            get :repositories, :on => :member
+            api_resources :repositories, :only => [:index] do
+              get :index, :on => :member
+            end
           end
 
           api_resources :content_views, :only => [:index]
@@ -356,6 +354,9 @@ Katello::Engine.routes.draw do
         end
 
         api_resources :products, :only => [] do
+          api_resources :repositories, :only => [:index] do
+            get :index, :on => :member
+          end
           get :repositories, :on => :member
           api_resources :sync, :only => [:index] do
             delete :index, :on => :collection, :action => :cancel

data/config/routes/overrides.rb

@@ -1,21 +1,25 @@
 module Katello
   class WhitelistConstraint
-    PATHS ||= [%r{\A/api/v2/organizations/\S+/parameters}]
+    PATHS ||= [%r{\A/api/v2/organizations/\S+/parameters}].freeze
 
     def matches?(request)
-      PATHS.map { |path| request.env["REQUEST_PATH"].match(path) }.any? ? false : true
+      PATHS.map { |path| request.env["REQUEST_PATH"].try(:match, path) }.any? ? false : true
     end
   end
 end
 
 Foreman::Application.routes.draw do
-  override_message = '{"message": "Route forbidden by Katello, check katello/config/routes/overrides"}'
+  override_message = '{"message": "Route overriden by Katello, use the /katello API endpoint instead.  See /apidoc for more details."}'
 
   match "/api/v2/organizations/*all", :to => proc { [404, {}, [override_message]] },
-                                      :via => :get,
+                                      :via => :put,
                                       :constraints => Katello::WhitelistConstraint.new
 
-  match "/api/v1/organizations/:id", via: :delete, to: proc { [404, {}, [override_message]] }
+  match "/api/v2/organizations", :to => proc { [404, {}, [override_message]] },
+                                      :via => :post,
+                                      :constraints => Katello::WhitelistConstraint.new
+
+  match "/api/v2/organizations/:id", via: :delete, to: proc { [404, {}, [override_message]] }
 
   resources :hosts, :only => [] do
     get 'puppet_environment_for_content_view', :on => :collection
@@ -79,6 +83,7 @@ Foreman::Application.routes.draw do
               put :auto_attach
               get :product_content
               get :events
+              get :available_release_versions
               put :content_override
               put :remove_subscriptions
               put :add_subscriptions

data/db/migrate/20140117160939_refactor_content_views.rb

@@ -45,12 +45,12 @@ class RefactorContentViews < ActiveRecord::Migration
   def down
     create_table "katello_content_view_definition_bases", :force => true do |t|
       t.string "name", :limit => 255
-      t.string "label",                              :null => false, :limit => 255
+      t.string "label", :null => false, :limit => 255
       t.text "description"
       t.integer "organization_id"
       t.datetime "created_at",                         :null => false
       t.datetime "updated_at",                         :null => false
-      t.boolean "composite",       :default => false, :null => false
+      t.boolean "composite", :default => false, :null => false
       t.string "type", :limit => 255
       t.integer "source_id"
     end
@@ -70,8 +70,8 @@ class RefactorContentViews < ActiveRecord::Migration
     create_table "katello_filter_rules", :force => true do |t|
       t.string "type", :limit => 255
       t.text "parameters"
-      t.integer "filter_id",                    :null => false
-      t.boolean "inclusion",  :default => true
+      t.integer "filter_id", :null => false
+      t.boolean "inclusion", :default => true
       t.datetime "created_at",                   :null => false
       t.datetime "updated_at",                   :null => false
     end

data/db/migrate/20140318174203_drop_cdn_import_success_column.rb

@@ -4,6 +4,6 @@ class DropCdnImportSuccessColumn < ActiveRecord::Migration
   end
 
   def down
-    add_column :katello_products,  "cdn_import_success", :boolean, :default => true, :null => false
+    add_column :katello_products, "cdn_import_success", :boolean, :default => true, :null => false
   end
 end

data/db/migrate/20140404122011_drop_repositories_enabled_column.rb

@@ -4,6 +4,6 @@ class DropRepositoriesEnabledColumn < ActiveRecord::Migration
   end
 
   def down
-    add_column :katello_repositories,  :enabled, :boolean, :default => true
+    add_column :katello_repositories, :enabled, :boolean, :default => true
   end
 end

data/db/migrate/20140610083129_add_pulp_proxy_to_host.rb

@@ -6,7 +6,7 @@ class AddPulpProxyToHost < ActiveRecord::Migration
     add_index :hosts,      :content_source_id
     add_index :hostgroups, :content_source_id
 
-    add_foreign_key :hosts,      :smart_proxies, :name => "hosts_content_source_id_fk",       :column => "content_source_id"
+    add_foreign_key :hosts,      :smart_proxies, :name => "hosts_content_source_id_fk", :column => "content_source_id"
     add_foreign_key :hostgroups, :smart_proxies, :name => "hostgroups_content_source_id_fk", :column => "content_source_id"
   end
 end

data/db/migrate/20140930170628_add_errata.rb

@@ -26,7 +26,7 @@ class AddErrata < ActiveRecord::Migration
     end
 
     add_index :katello_erratum_packages, [:erratum_id, :nvrea, :name, :filename], :unique => true,
-                                                                                  :name =>  'katello_erratum_packages_eid_nvrea_n_f'
+                                                                                  :name => 'katello_erratum_packages_eid_nvrea_n_f'
     add_foreign_key "katello_erratum_packages", "katello_errata",
                     :name => "katello_erratum_packages_errata_id_fk", :column => "erratum_id"
 

data/db/migrate/20141222151001_add_host_content_view_environment.rb

@@ -8,7 +8,7 @@ class AddHostContentViewEnvironment < ActiveRecord::Migration
 
     [Hostgroup, Host::Managed].each do |model|
       model.find_each do |host|
-        lifecycle_environment =  host.environment.try(:lifecycle_environment)
+        lifecycle_environment = host.environment.try(:lifecycle_environment)
         content_view = host.environment.try(:content_view)
         if lifecycle_environment && content_view
           host.update_column(:content_view_id, content_view.id)

data/db/migrate/20150602153756_remove_user_notices.rb

@@ -7,7 +7,7 @@ class RemoveUserNotices < ActiveRecord::Migration
     create_table "katello_user_notices", :force => true do |t|
       t.integer "user_id"
       t.integer "notice_id"
-      t.boolean "viewed",    :default => false, :null => false
+      t.boolean "viewed", :default => false, :null => false
     end
 
     add_index "katello_user_notices", ["notice_id"], :name => "index_user_notices_on_notice_id"

data/db/migrate/20150602153757_remove_notices.rb

@@ -5,9 +5,9 @@ class RemoveNotices < ActiveRecord::Migration
 
   def down
     create_table "katello_notices", :force => true do |t|
-      t.string   "text",            :limit => 1024,                    :null => false
+      t.string   "text",            :limit => 1024, :null => false
       t.text     "details"
-      t.boolean  "global",                          :default => false, :null => false
+      t.boolean  "global", :default => false, :null => false
       t.string   "level",                                              :null => false, :limit => 255
       t.datetime "created_at",                                         :null => false
       t.datetime "updated_at",                                         :null => false

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -325,7 +325,7 @@ class MigrateContentHosts < ActiveRecord::Migration
       if hostname.nil?
         logger.warn("Content host #{system.uuid} does not have a hostname, removing.")
         unregister_system(system)
-        next
+        break
       end
 
       MigrateContentHosts::Host.reset_column_information

data/db/migrate/20160203195736_remove_docker_image_schema.rb

@@ -1,6 +1,8 @@
 class RemoveDockerImageSchema < ActiveRecord::Migration
   def up
-    remove_foreign_key :katello_docker_tags, :name => "katello_docker_tags_docker_image_id_fk"
+    if foreign_key_exists?(:katello_docker_tags, :name => "katello_docker_tags_docker_image_id_fk")
+      remove_foreign_key :katello_docker_tags, :name => "katello_docker_tags_docker_image_id_fk"
+    end
     remove_column :katello_docker_tags, :docker_image_id
     drop_table :katello_repository_docker_images
     drop_table :katello_docker_images

data/db/migrate/20160505181337_rename_katello_settings.rb

@@ -0,0 +1,9 @@
+class RenameKatelloSettings < ActiveRecord::Migration
+  def up
+    Setting.where(category: 'Setting::Katello').update_all(:category => 'Setting::Content')
+  end
+
+  def down
+    Setting.where(category: 'Setting::Content').update_all(:category => 'Setting::Katello')
+  end
+end

data/db/migrate/20160520175340_add_host_applicable_package.rb

@@ -0,0 +1,8 @@
+class AddHostApplicablePackage < ActiveRecord::Migration
+  def change
+    create_table "katello_content_facet_applicable_rpms" do |t|
+      t.references 'content_facet', :null => false
+      t.references 'rpm', :null => false
+    end
+  end
+end

data/db/migrate/20160605160933_remove_jobs.rb

@@ -0,0 +1,25 @@
+class RemoveJobs < ActiveRecord::Migration
+  def up
+    drop_table :katello_job_tasks
+    drop_table :katello_jobs
+  end
+
+  def down
+    create_table "katello_job_tasks", force: :cascade do |t|
+      t.integer "job_id"
+      t.integer "task_status_id"
+    end
+
+    add_index "katello_job_tasks", ["job_id"], name: "index_job_tasks_on_job_id", using: :btree
+    add_index "katello_job_tasks", ["task_status_id"], name: "index_job_tasks_on_task_status_id", using: :btree
+
+    create_table "katello_jobs", force: :cascade do |t|
+      t.integer "job_owner_id"
+      t.string  "job_owner_type", limit: 255
+      t.string  "pulp_id",        limit: 255, null: false
+    end
+
+    add_index "katello_jobs", ["job_owner_id"], name: "index_jobs_on_job_owner_id", using: :btree
+    add_index "katello_jobs", ["pulp_id"], name: "index_jobs_on_pulp_id", using: :btree
+  end
+end

data/db/migrate/20160605162929_remove_system_smart_proxy.rb

@@ -0,0 +1,5 @@
+class RemoveSystemSmartProxy < ActiveRecord::Migration
+  def change
+    remove_column :smart_proxies, :content_host_id, :integer
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-associations.controller.js

@@ -14,8 +14,8 @@
  *   Provides the functionality for activation key associations.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization',
-    function ($scope, $location, translate, Nutupane, ActivationKey, ContentHostsHelper, CurrentOrganization) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization', 'Host',
+    function ($scope, $location, translate, Nutupane, ActivationKey, ContentHostsHelper, CurrentOrganization, Host) {
         var contentHostsNutupane, params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -31,17 +31,26 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsC
             $scope.table.working = false;
         }
 
-        contentHostsNutupane = new Nutupane(ActivationKey, params, 'contentHosts');
+        contentHostsNutupane = new Nutupane(Host, params);
+        contentHostsNutupane.searchTransform = function (term) {
+            var searchQuery, addition = "activation_key_id=" + $scope.$stateParams.activationKeyId;
+            if (term === "" || angular.isUndefined(term)) {
+                searchQuery = addition;
+            } else {
+                searchQuery = term + " and " + addition;
+            }
+            return searchQuery;
+        };
+
         contentHostsNutupane.masterOnly = true;
         $scope.detailsTable = contentHostsNutupane.table;
 
         $scope.activationKey.$promise.then(function () {
-            params.id = $scope.activationKey.id;
             contentHostsNutupane.setParams(params);
             contentHostsNutupane.load();
         });
 
-        $scope.getSubscriptionStatusColor = ContentHostsHelper.getSubscriptionStatusColor;
+        $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
 
         $scope.memory = ContentHostsHelper.memory;
     }]

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

@@ -26,21 +26,21 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="contentHost in detailsTable.rows"
+        <tr bst-table-row ng-repeat="host in detailsTable.rows"
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
-            <a ui-sref="content-hosts.details.info({hostId: contentHost.host_id})">
-              {{ contentHost.name }}
+            <a ui-sref="content-hosts.details.info({hostId: host.host_id})">
+              {{ host.name }}
             </a>
           </td>
           <td bst-table-cell>
-            <span class="fa fa-circle" ng-class="getSubscriptionStatusColor(contentHost.entitlementStatus)">
+            <span ng-class="getHostStatusIcon(host.subscription_global_status)">
             </span>
           </td>
-          <td bst-table-cell>{{ contentHost.environment.name }}</td>
-          <td bst-table-cell>{{ contentHost.content_view.name || "" }}</td>
-          <td bst-table-cell>{{ contentHost.service_level }}</td>
-          <td bst-table-cell>{{ contentHost.release_ver }}</td>
+          <td bst-table-cell>{{ host.environment.name }}</td>
+          <td bst-table-cell>{{ host.content_view.name || "" }}</td>
+          <td bst-table-cell>{{ host.service_level }}</td>
+          <td bst-table-cell>{{ host.release_ver }}</td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-action-packages.controller.js

@@ -21,9 +21,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackag
 
         function successMessage(type) {
             var messages = {
-                install: translate("Succesfully scheduled package installation"),
-                update: translate("Succesfully scheduled package update"),
-                remove: translate("Succesfully scheduled package removal")
+                install: translate("Successfully scheduled package installation"),
+                update: translate("Successfully scheduled package update"),
+                remove: translate("Successfully scheduled package removal"),
+                "update all": translate("Successfully scheduled an update of all packages")
             };
             return messages[type];
         }
@@ -31,7 +32,12 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackag
         function installParams() {
             var params = $scope.nutupane.getAllSelectedResults();
             params['content_type'] = $scope.content.contentType;
-            params.content = $scope.content.content.split(/ *, */);
+            if ($scope.content.action === "update all") {
+                params['update_all'] = true;
+                params.content = null;
+            } else {
+                params.content = $scope.content.content.split(/ *, */);
+            }
             params['organization_id'] = CurrentOrganization;
             return params;
         }
@@ -102,6 +108,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackag
                 HostBulkAction.updateContent(params, success, error);
             } else if ($scope.content.action === "remove") {
                 HostBulkAction.removeContent(params, success, error);
+            } else if ($scope.content.action === "update all") {
+                HostBulkAction.updateContent(params, success, error);
             }
 
             return deferred.promise;
@@ -117,6 +125,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackag
                 action = $scope.content.action;
             }
 
+            if (action === "update all") {
+                action = "update";
+            }
+
             if ($scope.content.contentType === 'package_group') {
                 $scope.packageActionFormValues.remoteAction = 'group_' + action;
             } else if ($scope.content.contentType === 'package') {

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

@@ -4,6 +4,28 @@
   <section>
     <h4 translate>Content Host Package Management</h4>
 
+    <span class="input-group-btn">
+      <button class="btn btn-default"
+              type="button"
+              translate
+              ng-hide="denied('edit_hosts')"
+              ng-click="confirmContentAction('update all', content)"
+              ng-disabled="(table.numSelected === 0)">
+        Update All Packages
+      </button>
+      <button class="btn btn-default dropdown-toggle"
+              ng-hide="!remoteExecutionPresent"
+              ng-disabled="(table.numSelected === 0) || !packageActionForm.$valid || content.confirm"
+              type="button" id="update-all-use-remote-execution" data-toggle="dropdown">
+        <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu" role="menu" aria-labelledby="install-use-remote-execution">
+        <li role="presentation"><a ng-click="performViaKatelloAgent('update all', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
+        <li role="presentation"><a ng-click="performViaRemoteExecution('update all', false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
+        <li role="presentation"><a ng-click="performViaRemoteExecution('update all', true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
+      </ul>
+    </span>
+
     <form id="packageActionForm" name="packageActionForm" class="form" method="post" action="/katello/remote_execution">
       <input type="hidden" name="name" ng-value="content.content"/>
       <input type="hidden" name="remote_action" ng-value="packageActionFormValues.remoteAction"/>
@@ -13,7 +35,7 @@
       <input type="hidden" name="customize" ng-value="packageActionFormValues.customize"/>
     </form>
 
-    <form name="systemContentForm" class="form" ng-hide="content.workingMode || denied('edit_hosts')">
+    <form name="systemContentForm" class="form" ng-hide="content.workingMode || denied('edit_hosts')" novalidate>
 
       <div>
         <input id="package" type="radio"
@@ -117,9 +139,12 @@
         <div class="confirmation_text" ng-show="content.action == 'remove'" translate>
           Are you sure you want to remove {{ content.content }} from the {{ getSelectedSystemIds().length }} system(s) selected?
         </div>
+        <div class="confirmation_text" ng-show="content.action == 'update all'" translate>
+          Are you sure you want to update all packages on the {{ getSelectedSystemIds().length }} system(s) selected?
+        </div>
 
         <button class="btn btn-default" ng-click="performContentAction()" translate>Yes</button>
-        <button class="btn btn-default" ng-click="content.confirm = false" translate>No</button>
+        <button type="button" class="btn btn-default" ng-click="content.confirm = false" translate>No</button>
       </div>
 
     </form>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts-helper.service.js

@@ -7,28 +7,26 @@
  */
 angular.module('Bastion.content-hosts').service('ContentHostsHelper',
     function () {
-        this.getSubscriptionStatusColor = function (status) {
+        this.getHostStatusIcon = function (globalStatus) {
+            var icons;
             var colors = {
-                    'valid': 'green',
-                    'partial': 'yellow',
-                    'invalid': 'red',
-                    0: 'green',
-                    1: 'yellow',
-                    2: 'red',
-                    3: 'red'
-                };
+                // we can remove 'valid', 'partial', and 'invalid' when http://projects.theforeman.org/issues/15347 is fixed
+                'valid': 'green',
+                'partial': 'yellow',
+                'invalid': 'red',
+                0: 'green',
+                1: 'yellow',
+                2: 'red'
+            };
 
-            return colors[status] ? colors[status] : 'red';
-        };
-
-        this.getGlobalStatusColor = function (status) {
-            var colors = {
-                    0: 'green',
-                    1: 'yellow',
-                    2: 'red'
-                };
+            globalStatus = colors[globalStatus] || "red";
+            icons = {
+                'green': globalStatus + ' host-status pficon pficon-ok status-ok',
+                'yellow': globalStatus + ' host-status pficon pficon-info status-warn',
+                'red': globalStatus + ' host-status pficon pficon-error-circle-o status-error'
+            };
 
-            return colors[status] ? colors[status] : 'red';
+            return icons[globalStatus];
         };
     }
 );