katello 3.0.0.rc1 → 3.0.0.rc2

data/db/migrate/20141210173220_create_docker_tables.rb

@@ -18,9 +18,10 @@ class CreateDockerTables < ActiveRecord::Migration
 
     add_index :katello_docker_tags, [:docker_image_id, :repository_id, :name],
               :name => :docker_tag_docker_image_repo_name, :unique => true
-
-    add_foreign_key :katello_repository_docker_images, :katello_docker_images,
-                    :column => :docker_image_id
+    unless foreign_key_exists?(:katello_repository_docker_images, :column => :docker_image_id)
+      add_foreign_key :katello_repository_docker_images, :katello_docker_images,
+                      :column => :docker_image_id
+    end
   end
 
   def down

data/db/migrate/20151219203225_rename_index_repository_puppet_module.rb

@@ -3,7 +3,7 @@ class RenameIndexRepositoryPuppetModule < ActiveRecord::Migration
     original_name = 'index_katello_repository_puppet_module_on_module_id_and_repo_id'
     shorter_name = 'index_katello_repo_puppet_module_on_module_id_and_repo_id'
 
-    if index_exists?(:katello_repository_puppet_module, [:module_id, :repo_id], :name => original_name)
+    if index_exists?(:katello_repository_puppet_modules, [:module_id, :repo_id], :name => original_name)
       rename_index :katello_repository_puppet_modules, original_name, shorter_name
     end
   end

data/db/migrate/20160203195736_remove_docker_image_schema.rb

@@ -1,5 +1,6 @@
 class RemoveDockerImageSchema < ActiveRecord::Migration
   def up
+    remove_foreign_key :katello_docker_tags, :name => "katello_docker_tags_docker_image_id_fk"
     remove_column :katello_docker_tags, :docker_image_id
     drop_table :katello_repository_docker_images
     drop_table :katello_docker_images

data/db/migrate/20160317171813_change_activation_key_column_names.rb

@@ -0,0 +1,11 @@
+class ChangeActivationKeyColumnNames < ActiveRecord::Migration
+  def self.up
+    rename_column :katello_activation_keys, :max_content_hosts, :max_hosts
+    rename_column :katello_activation_keys, :unlimited_content_hosts, :unlimited_hosts
+  end
+
+  def self.down
+    rename_column :katello_activation_keys, :max_hosts, :max_content_hosts
+    rename_column :katello_activation_keys, :unlimited_hosts, :unlimited_content_hosts
+  end
+end

data/db/migrate/20160323065901_increase_cdn_length.rb

@@ -0,0 +1,11 @@
+class IncreaseCdnLength < ActiveRecord::Migration
+  def up
+    change_column :katello_providers, :repository_url, :string, :limit => 1024
+    change_column :katello_repositories, :url, :string, :limit => 1024
+  end
+
+  def down
+    change_column :katello_providers, :repository_url, :string, :limit => 255
+    change_column :katello_repositories, :url, :string, :limit => 255
+  end
+end

data/db/migrate/20160404132250_remove_katello_from_notification_name.rb

@@ -0,0 +1,26 @@
+class RemoveKatelloFromNotificationName < ActiveRecord::Migration
+  class FakeMailNotification < ActiveRecord::Base
+    self.table_name = 'mail_notifications'
+  end
+
+  def up
+    FakeMailNotification.all.each do |notification|
+      if notification_names.keys.include?(notification.name)
+        new_name = notification_names[notification.name]
+        FakeMailNotification.where(:name => new_name).destroy_all
+        notification.name = new_name
+        notification.save!
+      end
+    end
+  end
+
+  private
+
+  def notification_names
+    {
+      :katello_promote_errata => 'promote_errata',
+      :katello_sync_errata => 'sync_errata',
+      :katello_host_advisory => 'host_errata_advisory'
+    }.with_indifferent_access
+  end
+end

data/db/seeds.d/103-provisioning_templates.rb

@@ -16,7 +16,8 @@ end
 templates = [{:name => "Katello Kickstart Default",           :source => "kickstart-katello.erb",      :template_kind => kinds[:provision]},
              {:name => "Katello Kickstart Default User Data", :source => "userdata-katello.erb",       :template_kind => kinds[:user_data]},
              {:name => "Katello Kickstart Default Finish",    :source => "finish-katello.erb",         :template_kind => kinds[:finish]},
-             {:name => "subscription_manager_registration",   :source => "snippets/_subscription_manager_registration.erb", :snippet => true}]
+             {:name => "subscription_manager_registration",   :source => "snippets/_subscription_manager_registration.erb", :snippet => true},
+             {:name => "Katello Atomic Kickstart Default",    :source => "kickstart-katello-atomic.erb", :template_kind => kinds[:provision]}]
 
 templates.each do |template|
   template[:template] = File.read(File.join(Katello::Engine.root, "app/views/foreman/unattended", template.delete(:source)))
@@ -29,6 +30,7 @@ templates.each do |template|
     pt.template_kind = template[:template_kind] if template[:template_kind]
     pt.snippet = template[:snippet] if template[:snippet]
   end
+  ProvisioningTemplate.find_by(name: template[:name]).update_attributes!(:template => template[:template])
 end
 
 # Ensure all default templates are seeded into the first org and loc

data/db/seeds.d/106-mail_notifications.rb

@@ -7,21 +7,21 @@
 
 # Mail Notifications
 notifications = [
-  {:name              => :katello_host_advisory,
+  {:name              => :host_errata_advisory,
    :description       => N_('A summary of available and applicable errata for your hosts'),
    :mailer            => 'Katello::ErrataMailer',
    :method            => 'host_errata',
    :subscription_type => 'report'
   },
 
-  {:name              => :katello_sync_errata,
+  {:name              => :sync_errata,
    :description       => N_('A summary of new errata after a repository is synchronized'),
    :mailer            => 'Katello::ErrataMailer',
    :method            => 'sync_errata',
    :subscription_type => 'alert'
   },
 
-  {:name              => :katello_promote_errata,
+  {:name              => :promote_errata,
    :description       => N_('A post-promotion summary of hosts with installable errata'),
    :mailer            => 'Katello::ErrataMailer',
    :method            => 'promote_errata',

data/db/seeds.d/109-atomic_os.rb

@@ -0,0 +1,11 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
+#
+
+::User.current = ::User.anonymous_api_admin
+os_attributes = {:major => "7", :minor => "2", :name => ::Operatingsystem::REDHAT_ATOMIC_HOST_OS}
+Operatingsystem.where(os_attributes).first_or_create!
+
+::User.current = nil

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activationKeyConsumed.filter.js

@@ -6,7 +6,7 @@ angular.module('Bastion.activation-keys').filter('activationKeyConsumedFilter',
     ['$filter', 'translate',
     function ($filter, translate) {
         return function (activationKey) {
-            var quantity = $filter('unlimitedFilter')(activationKey['max_content_hosts'], activationKey['unlimited_content_hosts']);
+            var quantity = $filter('unlimitedFilter')(activationKey['max_hosts'], activationKey['unlimited_hosts']);
             return translate('%(consumed)s out of %(quantity)s')
                 .replace('%(consumed)s', activationKey['usage_count'])
                 .replace('%(quantity)s', quantity);

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

@@ -3,7 +3,9 @@
  * @name  Bastion.activation-keys.controller:ActivationKeyAssociationsController
  *
  * @requires $scope
+ * @requires $location
  * @requires translate
+ * @requires Nutupane
  * @requires ActivationKey
  * @requires ContentHostsHelper
  * @requires CurrentOrganization
@@ -12,21 +14,31 @@
  *   Provides the functionality for activation key associations.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsController',
-    ['$scope', 'translate', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization',
-    function ($scope, translate, ActivationKey, ContentHostsHelper, CurrentOrganization) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization',
+    function ($scope, $location, translate, Nutupane, ActivationKey, ContentHostsHelper, CurrentOrganization) {
+        var contentHostsNutupane, params = {
+            'organization_id': CurrentOrganization,
+            'search': $location.search().search || "",
+            'page': 1,
+            'sort_by': 'name',
+            'sort_order': 'ASC',
+            'paged': true
+        };
+
+        $scope.table.working = true;
 
         if ($scope.contentHosts) {
             $scope.table.working = false;
-        } else {
-            $scope.table.working = true;
         }
 
+        contentHostsNutupane = new Nutupane(ActivationKey, params, 'contentHosts');
+        contentHostsNutupane.masterOnly = true;
+        $scope.detailsTable = contentHostsNutupane.table;
+
         $scope.activationKey.$promise.then(function () {
-            ActivationKey.contentHosts({id: $scope.activationKey.id, 'organization_id': CurrentOrganization },
-                function (response) {
-                    $scope.contentHosts = response.results;
-                    $scope.table.working = false;
-                });
+            params.id = $scope.activationKey.id;
+            contentHostsNutupane.setParams(params);
+            contentHostsNutupane.load();
         });
 
         $scope.getSubscriptionStatusColor = ContentHostsHelper.getSubscriptionStatusColor;

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

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

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

@@ -1,47 +1,48 @@
 <span page-title ng-model="activationKey">{{ 'Content Hosts for Activation Key:' | translate }} {{ activationKey.name }}</span>
 
-<div class="nutupane">
+<div data-extend-template="layouts/details-nutupane.html">
 
-  <h3 translate>
-    Attached to Content Hosts
-  </h3>
+  <div data-block="messages"></div>
+  <div data-block="actions"></div>
+  <div data-block="selection-summary"></div>
 
-  <div bst-alert="info" ng-show="!table.working && contentHosts.length === 0">
-    <span translate>This activation key is not associated with any content hosts.</span>
-  </div>
-
-  <table class="table table-bordered table-striped" bst-table="table" ng-show="contentHosts.length > 0" ng-class="{'table-mask': table.working}">
-    <thead>
-      <tr bst-table-head>
-        <th bst-table-column="name" sortable><span translate>Name</span></th>
-        <th bst-table-column="status">
-          {{ "Subscription Status" | translate }}
-        </th>
-        <th bst-table-column="environment" sortable><span translate>Environment</span></th>
-        <th bst-table-column="contentView"><span translate>Content View</span></th>
-        <th bst-table-column="serviceLevel"><span translate>Service Level</span></th>
-        <th bst-table-column="releaseVersion"><span translate>Release Version</span></th>
-      </tr>
-    </thead>
+  <span data-block="no-rows-message" translate>
+    This activation key is not associated with any content hosts.
+  </span>
 
-    <tbody>
-      <tr bst-table-row ng-repeat="contentHost in contentHosts"
-          ng-controller="ContentHostStatusController">
-        <td bst-table-cell>
-          <a ui-sref="content-hosts.details.info({hostId: contentHost.host_id})">
-            {{ contentHost.name }}
-          </a>
-        </td>
-        <td bst-table-cell>
-          <span class="fa fa-circle" ng-class="getSubscriptionStatusColor(contentHost.entitlementStatus)">
-          </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>
-      </tr>
-    </tbody>
-  </table>
+  <div data-block="table">
+    <table class="table table-bordered table-striped" bst-table="table" ng-class="{'table-mask': detailsTable.working}">
+      <thead>
+        <tr bst-table-head>
+          <th bst-table-column="name" sortable><span translate>Name</span></th>
+          <th bst-table-column="status" translate>
+            Subscription Status
+          </th>
+          <th bst-table-column="environment" sortable><span translate>Environment</span></th>
+          <th bst-table-column="contentView"><span translate>Content View</span></th>
+          <th bst-table-column="serviceLevel"><span translate>Service Level</span></th>
+          <th bst-table-column="releaseVersion"><span translate>Release Version</span></th>
+        </tr>
+      </thead>
 
+      <tbody>
+        <tr bst-table-row ng-repeat="contentHost in detailsTable.rows"
+            ng-controller="ContentHostStatusController">
+          <td bst-table-cell>
+            <a ui-sref="content-hosts.details.info({hostId: contentHost.host_id})">
+              {{ contentHost.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+            <span class="fa fa-circle" ng-class="getSubscriptionStatusColor(contentHost.entitlementStatus)">
+            </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>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>

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

@@ -31,7 +31,7 @@
           {{ "Close" | translate }}
         </button>
 
-        <div bst-modal="removeActivationKey(activationKey)">
+        <div bst-modal="removeActivationKey(activationKey)" model="activationKey">
           <div data-block="modal-header" translate>Remove Activation Key "{{ activationKey.name }}"?</div>
           <div data-block="modal-body" translate>Are you sure you want to remove Activation Key "{{ activationKey.name }}"?</div>
         </div>

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

@@ -36,9 +36,9 @@
         <span class="info-label" translate>Host Limit</span>
 
         <span class="info-value"
-              bst-edit-custom="activationKey.max_content_hosts"
+              bst-edit-custom="activationKey.max_hosts"
               formatter="unlimitedFilter"
-              formatter-options="activationKey.unlimited_content_hosts"
+              formatter-options="activationKey.unlimited_hosts"
               readonly="denied('edit_activation_keys', activationKey)"
               on-save="save(activationKey)">
 
@@ -47,17 +47,17 @@
               <span translate>
                 Unlimited Content Hosts:
               </span>
-              <input type='checkbox' ng-model="activationKey.unlimited_content_hosts"/>
+              <input type='checkbox' ng-model="activationKey.unlimited_hosts"/>
             </div>
-            <div ng-hide="activationKey.unlimited_content_hosts" >
+            <div ng-hide="activationKey.unlimited_hosts" >
               <span translate>
                 Limit:
               </span>
-              <input ng-model="activationKey.max_content_hosts"
-                     name="max_content_hosts"
+              <input ng-model="activationKey.max_hosts"
+                     name="max_hosts"
                      type="number"
                      min="1"
-                     ng-required="!activationKey.unlimited_content_hosts"
+                     ng-required="!activationKey.unlimited_hosts"
                      tabindex="2"/>
             </div>
           </div>

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

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

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

@@ -31,7 +31,7 @@ angular.module('Bastion.activation-keys').controller('NewActivationKeyController
         }
 
         $scope.activationKey = $scope.activationKey || new ActivationKey();
-        $scope.activationKey['unlimited_content_hosts'] = true;
+        $scope.activationKey['unlimited_hosts'] = true;
 
         $scope.panel = {loading: false};
         $scope.organization = CurrentOrganization;

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

@@ -29,18 +29,18 @@
              required/>
     </div>
 
-    <div bst-form-group label="{{ 'Content Host Limit' | translate }}" field="max_content_hosts">
-      <span translate>Unlimited Content Hosts:</span>
+    <div bst-form-group label="{{ 'Host Limit' | translate }}" field="max_hosts">
+      <span translate>Unlimited Hosts:</span>
       <input type="checkbox"
              name="limit"
-             ng-model="activationKey.unlimited_content_hosts"/>
+             ng-model="activationKey.unlimited_hosts"/>
 
-      <div bst-form-group label="{{ 'Limit' | translate }}" ng-hide="activationKey.unlimited_content_hosts">
-        <input id="max_content_hosts"
-               name="max_content_hosts"
+      <div bst-form-group label="{{ 'Limit' | translate }}" ng-hide="activationKey.unlimited_hosts">
+        <input id="max_hosts"
+               name="max_hosts"
                class="form-control"
-               ng-model="activationKey.max_content_hosts"
-               ng-required="!activationKey.unlimited_content_hosts"
+               ng-model="activationKey.max_hosts"
+               ng-required="!activationKey.unlimited_hosts"
                type="number"
                min="1"
                max="2147483648"

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

@@ -10,10 +10,10 @@
 angular.module('Bastion.capsule-content').config(['$stateProvider', '$urlRouterProvider', function ($stateProvider, $urlRouterProvider) {
 
     // Catch the url to prevent the router to perform redirect.
-    $urlRouterProvider.when('/smart_proxies/:proxyId', function ($match, $stateParams) {
+    $urlRouterProvider.when('/smart_proxies/:proxyId', ['$match', '$stateParams', function ($match, $stateParams) {
         $stateParams.pageName = 'smart_proxies/detail';
         return true;
-    });
+    }]);
 
     // Add rule to redirect links on the smart proxy detail page.
     // Changing state doesn't work there since there's no <ui-view> element there

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

@@ -75,14 +75,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
 
         $scope.table = $scope.contentHostTable;
 
-        $scope.unregisterContentHost = function (contentHost) {
-            contentHost.$remove(function () {
-                $scope.removeRow(contentHost.id);
-                $scope.successMessages.push(translate('Content Host %s has been deleted.').replace('%s', contentHost.name));
-                $scope.transitionTo('content-hosts.index');
-            });
-        };
-
         $scope.reloadSearch = function (search) {
             $scope.table.search(search);
             $state.go('content-hosts.index');

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-errata.controller.js

@@ -58,24 +58,27 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
 
         $scope.setupErrataOptions = function (host) {
             var libraryString = translate("Library Synced Content"),
-                currentEnv = translate("Current Environment (%e/%cv)").replace("%e", host.content.lifecycle_environment.name).replace("%cv", host.content.content_view_name),
+                currentEnv,
                 previousEnv;
 
-            $scope.errataOptions = [{name: currentEnv, label: 'current', order: 3}];
-
-            if (!host.content['lifecycle_environment_library?']) {
-                Environment.get({id: host.content.lifecycle_environment.id}).$promise.then(function (env) {
-                    previousEnv = translate("Previous Environment (%e/%cv)").replace('%e', env.prior.name).replace("%cv", host.content_view_name);
-                    $scope.errataOptions.push({name: previousEnv,
-                        label: 'prior', order: 2, 'content_view_id': host.content.content_view_id, 'environment_id': env.prior.id});
-
-                });
-            }
-            if (!host.content['content_view_default?']) {
-                Organization.get({id: host.organization_id}).$promise.then(function (org) {
-                    $scope.errataOptions.push({name: libraryString, label: 'library', order: 1,
-                        'content_view_id': org.default_content_view_id, 'environment_id': org.library_id});
-                });
+            if (host.hasContent()) {
+                currentEnv = translate("Current Environment (%e/%cv)").replace("%e", host.content.lifecycle_environment.name).replace("%cv", host.content.content_view_name);
+                $scope.errataOptions = [{name: currentEnv, label: 'current', order: 3}];
+
+                if (!host.content['lifecycle_environment_library?']) {
+                    Environment.get({id: host.content.lifecycle_environment.id}).$promise.then(function (env) {
+                        previousEnv = translate("Previous Environment (%e/%cv)").replace('%e', env.prior.name).replace("%cv", host.content_view_name);
+                        $scope.errataOptions.push({name: previousEnv,
+                                                   label: 'prior', order: 2, 'content_view_id': host.content.content_view_id, 'environment_id': env.prior.id});
+
+                    });
+                }
+                if (!host.content['content_view_default?']) {
+                    Organization.get({id: host.organization_id}).$promise.then(function (org) {
+                        $scope.errataOptions.push({name: libraryString, label: 'library', order: 1,
+                                                   'content_view_id': org.default_content_view_id, 'environment_id': org.library_id});
+                    });
+                }
             }
         };