katello 3.1.0.1 → 3.2.0.rc1

data/app/views/foreman/job_templates/install_errata.erb

@@ -15,4 +15,4 @@ foreign_input_sets:
   exclude: action,package
 %>
 
-<%= render_template('Package Action - SSH Default', :action => 'update', :package => "--advisories=#{input(:errata)}") %>
+<%= render_template('Package Action - SSH Default', :action => 'update', :package => "--advisory=#{input(:errata)}") %>

data/app/views/katello/api/v2/activation_keys/product_content.json.rabl

@@ -14,4 +14,5 @@ child @collection[:results] => :results do
   node :override do |pc|
     pc.content_override(@activation_key)
   end
+  attributes :enabled
 end

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -19,7 +19,7 @@ child @lifecycle_environments => :lifecycle_environments do
   end
   node :counts do |env|
     counts = {
-      :content_hosts => env.systems.readable.count,
+      :content_hosts => env.hosts.authorized("view_hosts").count,
       :content_views => env.content_views.non_default.count,
       :products => env.products.enabled.count
     }
@@ -36,7 +36,7 @@ child @lifecycle_environments => :lifecycle_environments do
         :composite => content_view.composite,
         :last_published => content_view.versions.empty? ? nil : content_view.versions.last.created_at,
         :counts => {
-          :content_hosts => content_view.systems.readable.count,
+          :content_hosts => content_view.hosts.authorized("view_hosts").count,
           :products => content_view.products.enabled.count
         }
       }

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

@@ -11,8 +11,6 @@ child :lifecycle_environment => :lifecycle_environment do
 end
 
 node :errata_counts do |content_facet|
-  if content_facet.host.content_host
-    errata = content_facet.installable_errata
-    partial('katello/api/v2/errata/counts', :object => Katello::RelationPresenter.new(errata))
-  end
+  errata = content_facet.installable_errata
+  partial('katello/api/v2/errata/counts', :object => Katello::RelationPresenter.new(errata))
 end

data/app/views/katello/api/v2/content_facet/show.json.rabl

@@ -26,4 +26,4 @@ child :host_collections => :host_collections do
   attributes :id, :name
 end
 
-attributes :description, :facts
+attributes :description, :facts, :content_source_id

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

@@ -9,6 +9,7 @@ attributes :content_view_id
 attributes :default
 attributes :description
 attributes :package_count
+attributes :file_count
 attributes :package_group_count
 attributes :puppet_module_count
 attributes :docker_manifest_count
@@ -47,13 +48,13 @@ child :environments => :environments do
     {
       :readable => env.readable?,
       :promotable_or_removable => env.promotable_or_removable?,
-      :all_systems_editable => Katello::System.all_editable?(version.content_view_id, env.id),
-      :all_keys_editable => Katello::System.all_editable?(version.content_view_id, env.id)
+      :all_hosts_editable => version.all_hosts_editable?(env),
+      :all_keys_editable => Katello::ActivationKey.all_editable?(version.content_view_id, env.id)
     }
   end
 
-  node :system_count do |env|
-    Katello::System.in_environment(env).where(:content_view_id => version.content_view_id).count
+  node :host_count do |env|
+    ::Host.authorized('view_hosts').in_content_view_environment(:content_view => version.content_view, :lifecycle_environment => env).count
   end
 
   node :activation_key_count do |env|

data/app/views/katello/api/v2/environments/show.json.rabl

@@ -19,7 +19,7 @@ end
 
 node :counts do |env|
   counts = {
-    :content_hosts => env.systems.readable.count,
+    :content_hosts => env.hosts.authorized("view_hosts").count,
     :content_views => env.content_views.non_default.count
   }
   if env.library?

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

@@ -0,0 +1,7 @@
+object @resource
+
+attributes :id
+attributes :name
+attributes :path
+attributes :uuid
+attributes :checksum

data/app/views/katello/api/v2/{systems → file_units}/index.json.rabl

@@ -3,5 +3,5 @@ object false
 extends "katello/api/v2/common/metadata"
 
 child @collection[:results] => :results do
-  extends "katello/api/v2/systems/base"
+  extends "katello/api/v2/file_units/base"
 end

data/app/views/katello/api/v2/file_units/show.json.rabl

@@ -0,0 +1,3 @@
+object @resource
+
+extends "katello/api/v2/file_units/base"

data/app/views/katello/api/v2/host_errata/index.json.rabl

@@ -3,5 +3,5 @@ object false
 extends "katello/api/v2/common/metadata"
 
 child @collection[:results] => :results do
-  extends("katello/api/v2/systems/erratum")
+  extends("katello/api/v2/content_facet/erratum")
 end

data/app/views/katello/api/v2/host_errata/show.json.rabl

@@ -1,3 +1,3 @@
 object @resource
 
-extends "katello/api/v2/systems/erratum"
+extends "katello/api/v2/content_facet/erratum"

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

@@ -6,7 +6,7 @@ attributes :uuid
 attributes :description
 
 node :repository do |package_group|
-  if repo = package_group.repository
+  if (repo = package_group.repository)
     {
       :id => repo.id,
       :name => repo.name,

data/app/views/katello/api/v2/ping/show.json.rabl

@@ -2,7 +2,7 @@ object Katello::Util::Data.ostructize(@resource)
 
 attribute :status
 child :services => :services do
-  [:foreman_tasks, :foreman_auth, :candlepin, :candlepin_auth, :pulp, :pulp_auth].each do |service|
+  Katello::Ping::SERVICES.each do |service|
     child service => service do
       attribute :status
       attribute :duration_ms

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

@@ -20,7 +20,8 @@ node :content_counts do |repo|
     :package => repo.rpms.count,
     :package_group => repo.package_groups.count,
     :erratum => repo.errata.count,
-    :puppet_module => repo.puppet_modules.count
+    :puppet_module => repo.puppet_modules.count,
+    :file => repo.files.count
   }
 end
 

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -5,7 +5,7 @@ extends 'katello/api/v2/common/timestamps'
 
 attributes :content_type
 attributes :docker_upstream_name
-attributes :mirror_on_sync
+attributes :mirror_on_sync, :verify_ssl_on_sync
 attributes :unprotected, :full_path, :checksum_type, :container_repository_name
 attributes :download_policy
 attributes :url,

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

@@ -1 +1 @@
-attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at
+attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through

data/app/views/katello/api/v2/subscription_facet/base_with_root.json.rabl

@@ -2,9 +2,5 @@ child :subscription_facet => :subscription_facet_attributes do
   extends 'katello/api/v2/subscription_facet/base'
 end
 
-node :content_host_id do |host|
-  host.content_host.try(:id)
-end
-
 attributes :subscription_status, :subscription_status_label, :subscription_global_status,
            :if => @object.get_status(Katello::SubscriptionStatus).relevant?

data/app/views/katello/api/v2/subscription_facet/show.json.rabl

@@ -7,7 +7,7 @@ child :subscription_facet => :subscription_facet_attributes do |facet|
   end
 
   node :virtual_host do |_subscription_facet|
-    if host = consumer.virtual_host
+    if (host = consumer.virtual_host)
       {:name => host.name, :id => host.id}
     end
   end
@@ -26,7 +26,3 @@ child :subscription_facet => :subscription_facet_attributes do |facet|
     attributes :id, :name
   end
 end
-
-node :content_host_id do |host|
-  host.content_host.try(:id)
-end

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

@@ -16,9 +16,9 @@ attributes :name => :product_name
 attributes :unmapped_guest
 attributes :virt_only
 
-node :host, :if => lambda { |sub| sub && sub.host } do |subscription|
+node :host, :if => lambda { |sub| sub && sub.hypervisor } do |subscription|
   {
-    id: subscription.host.uuid,
-    name: subscription.host.name
+    id: subscription.hypervisor.id,
+    name: subscription.hypervisor.name
   }
 end

data/app/views/katello/api/v2/subscriptions/index.json.rabl

@@ -4,5 +4,6 @@ extends 'katello/api/v2/common/org_reference'
 extends "katello/api/v2/common/metadata"
 
 child @collection[:results] => :results do
+  attributes :quantity_attached
   extends "katello/api/v2/subscriptions/base"
 end

data/app/views/katello/api/v2/tasks/task_status_show.json.rabl

@@ -6,7 +6,6 @@ extends 'katello/api/v2/common/timestamps'
 attributes :finish_time, :start_time
 attributes :id, :task_owner_type, :progress, :uuid, :state, :user_id, :task_owner_id, :parameters, :task_type
 attributes :pending? => :pending
-attributes :system
 attributes :human_readable_message
 
 @result = (@task || @object).result

data/app/views/katello/providers/redhat/show.html.erb

@@ -15,7 +15,7 @@
 
   <% if @provider.products.empty? %>
     <div>
-      <%= _("No Red Hat products currently exist, please import a manifest <a href='/subscriptions'>here</a> to receive Red Hat content.").html_safe %>
+      <%= _("No Red Hat products currently exist, please import a manifest <a href='/subscriptions/manifest/import' data-no-turbolink='true'>here</a> to receive Red Hat content.").html_safe %>
     </div>
   <% else %>
     <% tabs = redhat_repo_tabs %>

data/app/views/katello/sync_management/_products.html.erb

@@ -29,7 +29,11 @@
       <% else %>
         <tr>
           <td colspan="<%= @show_org ? 6 : 5 %>">
-            <%= (_("There are no products or repositories enabled. Try enabling via %{custom} or %{redhat}.") % {:custom => link_to(_("Custom Content Repositories"), '/products'), :redhat => link_to(_(" Red Hat Repositories"), redhat_provider_providers_path)}).html_safe %>
+            <%= (_("There are no products or repositories enabled. Try enabling via %{custom} or %{redhat}.") %
+                 {:custom => link_to(_("Custom Content Repositories"), '/products', data: {no_turbolink: true}),
+                  :redhat => link_to(_("Red Hat Repositories"), redhat_provider_providers_path, data: {no_turbolink: true})
+                 }).html_safe
+             %>
           </td>
         </tr>
       <% end %>

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -34,18 +34,10 @@ end %>
   <input type="hidden" name="host[content_facet_attributes][id]" value="<%= @host.content_facet.try(:id) %>">
 <% end %>
 
-<% data_url = using_hostgroups_page? ? environment_selected_hostgroups_path : hostgroup_or_environment_selected_hosts_path %>
-<%= select_f f, :environment_id, Environment.all, :id, :to_label, {:include_blank => blank_or_inherit_f(f, :environment)},
-  {:label => _("Puppet Environment"), :onchange => 'update_puppetclasses(this);', 'data-url'=> data_url,
-   'data-content_puppet_match' => (@host || @hostgroup).new_record? || (@host || @hostgroup).content_and_puppet_match?,
-    :help_inline => %(<a id="reset_puppet_environment">#{_("Reset Puppet Environment to match selected Content View")}</a>).html_safe
-  } %>
-
-
 <% proxies = SmartProxy.with_content.unscoped.with_taxonomy_scope(@location,@organization,:path_ids) %>
 <% if proxies.count > 0 %>
     <%= select_f f, :content_source_id, proxies, :id, :name,
              { :include_blank => blank_or_inherit_f(f, :content_source) },
              { :label       => _("Content Source"),
                :help_inline => _("Use this as a source for installation and updates.") } %>
-<% end %>
+<% end %>

data/app/views/overrides/activation_keys/_host_synced_content_select.html.erb

@@ -1,3 +1,4 @@
+<%= javascript "katello/hosts/host_and_hostgroup_edit" %>
 <%
 kickstart_repo_id = using_hostgroups_page? ? kickstart_repository_id(@hostgroup) : kickstart_repository_id(@host, :selected_host_group => @hostgroup)
 host = using_hostgroups_page? ? @hostgroup : @host

data/config/routes/api/v2.rb

@@ -37,7 +37,6 @@ Katello::Engine.routes.draw do
             post :copy
             put :add_subscriptions
             put :remove_subscriptions
-            get :subscriptions
           end
           match '/releases' => 'activation_keys#available_releases', :via => :get, :on => :member
           api_resources :host_collections, :only => [:index]
@@ -47,7 +46,7 @@ Katello::Engine.routes.draw do
             match '/host_collections/available' => 'activation_keys#available_host_collections', :via => :get
           end
           api_resources :products, :only => [:index]
-          api_resources :subscriptions, :only => [] do
+          api_resources :subscriptions, :only => [:index] do
             collection do
               match '/available' => 'subscriptions#available', :via => :get
             end
@@ -171,6 +170,7 @@ Katello::Engine.routes.draw do
             get :redhat_provider
           end
           api_resources :products, :only => [:index]
+          api_resources :repositories, :only => [:index]
           api_resources :subscriptions, :only => [:index] do
             collection do
               match '/available' => 'subscriptions#available', :via => :get
@@ -196,6 +196,12 @@ Katello::Engine.routes.draw do
           end
         end
 
+        api_resources :files, :only => [:index, :show], :controller => 'file_units' do
+          collection do
+            get :auto_complete_search
+          end
+        end
+
         api_resources :ping, :only => [:index]
         match "/status" => "ping#server_status", :via => :get
 
@@ -311,6 +317,7 @@ Katello::Engine.routes.draw do
             get :search, :on => :collection
           end
           api_resources :package_groups, :only => [:index, :show]
+          api_resources :files, :only => [:index, :show], :controller => 'file_units'
           api_resources :errata, :only => [:index, :show], :constraints => {:id => /[0-9a-zA-Z\-\+%_.:]+/}
           api_resources :distributions, :only => [:index, :show], :constraints => {:id => /[0-9a-zA-Z \-\+%_.]+/}
           api_resources :puppet_modules, :only => [:index, :show] do

data/config/routes/overrides.rb

@@ -34,6 +34,8 @@ Foreman::Application.routes.draw do
 
   namespace :api do
     scope "(:api_version)", :module => :v2, :defaults => {:api_version => 'v2'}, :api_version => /v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
+      match '/hosts/post_index' => 'hosts#index', :via => :post
+
       resources :hosts, :only => [] do
         member do
           put :host_collections
@@ -50,6 +52,7 @@ Foreman::Application.routes.draw do
             collection do
               put :apply
               get :auto_complete_search
+              put :applicability
             end
           end
 
@@ -57,6 +60,12 @@ Foreman::Application.routes.draw do
             match '/auto_complete_search' => 'host_autocomplete#auto_complete_search', :via => :get
             match '/bulk/add_host_collections' => 'hosts_bulk_actions#bulk_add_host_collections', :via => :put
             match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put
+            match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put
+
+            match '/bulk/add_subscriptions' => 'hosts_bulk_actions#add_subscriptions', :via => :put
+            match '/bulk/remove_subscriptions' => 'hosts_bulk_actions#remove_subscriptions', :via => :put
+            match '/bulk/auto_attach' => 'hosts_bulk_actions#auto_attach', :via => :put
+
             match '/bulk/install_content' => 'hosts_bulk_actions#install_content', :via => :put
             match '/bulk/installable_errata' => 'hosts_bulk_actions#installable_errata', :via => :post
             match '/bulk/update_content' => 'hosts_bulk_actions#update_content', :via => :put

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -200,7 +200,7 @@ class MigrateContentHosts < ActiveRecord::Migration
   def create_subscription_facet(host, system)
     logger.info("Creating subscription facet for host #{host.name}.")
     subscription_facet = host.subscription_facet = MigrateContentHosts::SubscriptionFacet.new
-    subscription_facet.activation_keys = system.activation_keys
+    subscription_facet.activation_keys = system.activation_keys.uniq
     subscription_facet.uuid = system.uuid
     subscription_facet.save!
   end

data/db/migrate/20160617124149_remove_duplicate_view_filters.rb

@@ -0,0 +1,38 @@
+class RemoveDuplicateViewFilters < ActiveRecord::Migration
+  class Role < ActiveRecord::Base
+  end
+
+  class Filter < ActiveRecord::Base
+    belongs_to :role
+    has_many :filterings, :dependent => :destroy
+    has_many :permissions, :through => :filterings
+
+    scope :unlimited, -> { where(:search => nil, :taxonomy_search => nil) }
+  end
+
+  class Filtering < ActiveRecord::Base
+    belongs_to :filter
+    belongs_to :permission
+  end
+
+  class Permission < ActiveRecord::Base
+    has_many :filterings, :dependent => :destroy
+    has_many :filters, :through => :filterings
+  end
+
+  def up
+    viewer_role = Role.find_by(:name => "Viewer")
+    permissions = [:view_activation_keys, :view_content_hosts,
+                   :view_content_views, :view_gpg_keys, :view_host_collections,
+                   :view_lifecycle_environments, :view_products,
+                   :view_subscriptions, :view_sync_plans]
+
+    permissions.each do |perm_name|
+      permission = Permission.find_by(:name => perm_name)
+      next unless permission
+      filters = Filter.unlimited.joins(:permissions).where(:role => viewer_role,
+                                                           "permissions.id" => [permission.id])
+      filters.drop(1).each(&:destroy)
+    end
+  end
+end

data/db/migrate/20160627125310_delete_system.rb

@@ -0,0 +1,7 @@
+class DeleteSystem < ActiveRecord::Migration
+  def change
+    drop_table :katello_system_activation_keys
+    drop_table :katello_system_repositories
+    drop_table :katello_systems
+  end
+end

data/db/migrate/20160722193256_add_verify_ssl_on_sync_to_repository.rb

@@ -0,0 +1,9 @@
+class AddVerifySslOnSyncToRepository < ActiveRecord::Migration
+  def up
+    add_column :katello_repositories, :verify_ssl_on_sync, :boolean, :null => false, :default => true
+  end
+
+  def down
+    remove_column :katello_repositories, :verify_ssl_on_sync
+  end
+end

data/db/migrate/20160727144242_add_registered_through_to_katello_subscription_facets.rb

@@ -0,0 +1,5 @@
+class AddRegisteredThroughToKatelloSubscriptionFacets < ActiveRecord::Migration
+  def change
+    add_column :katello_subscription_facets, :registered_through, :string
+  end
+end

data/db/migrate/20160808002834_add_files.rb

@@ -0,0 +1,30 @@
+class AddFiles < ActiveRecord::Migration
+  def change
+    create_table "katello_files" do |t|
+      t.timestamps
+      t.string "uuid", :null => false, :limit => 255
+      t.string 'name', :limit => 255
+      t.string 'checksum', :limit => 255
+      t.string 'path'
+    end
+
+    add_index :katello_files, :uuid, :unique => true
+    add_index :katello_files, [
+      :id,
+      :uuid,
+      :name
+    ],
+    :name => 'katello_files_fields_index'
+
+    create_table "katello_repository_files" do |t|
+      t.references :file, :null => false
+      t.references :repository, :null => true
+      t.timestamps
+    end
+
+    add_index :katello_repository_files, [:file_id, :repository_id], :unique => true
+
+    add_foreign_key "katello_repository_files", "katello_files", :column => "file_id"
+    add_foreign_key "katello_repository_files", "katello_repositories", :column => "repository_id"
+  end
+end