katello 2.4.5 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be38f4975bf5c9b2a8596c82d63f2ca60a8bfd58
-  data.tar.gz: 5dbf0236b140b5938f842fcb1298766087b04072
+  metadata.gz: 6556a9a45be788950f7121e13324f371dae87f9c
+  data.tar.gz: e5df82ecc9631da6506fa9d86120c3e487261719
 SHA512:
-  metadata.gz: 944515a03d76c5260454ae0ba04699eae107eed5ecf5c4827da0ebd5dc475e2c0d886f5460bbe29fc19452d6cc42d2a7c8381ad7cdbae99b0ed7ee800eaab47a
-  data.tar.gz: a3c8ee25acd0adcd3fe5df7da7b45ad6c3045f1b5bdd1d380ace390fdbbb30c33ddc19d1e8fedaa66e2071f0ee8dacd88a630e3fa60360fdba0547dad6819572
+  metadata.gz: f816179cda53ada12c385dbd8006096fcd3f218a9e12a993b5eaec365b7f89ca1ebd8d93a324808249fe96c167ebf69953c30d7f31cbe00871ae9c6322b82237
+  data.tar.gz: f669b7c4724baef60b37de2416500cff4373d27b3b85c5a0d3167b1f3fc107d8d64e98c6a27b11fb6fd2529850d073521a94a68e58bb3ffa79c0acdbbc9b6e67

data/README.md

@@ -15,7 +15,19 @@ Linux based systems.
 
 ## Development
 
-The recommended way to set up Katello for development to use the [katello-devel-installer](https://github.com/Katello/katello-installer#development-usage) directly or via [katello-deploy](https://github.com/Katello/katello-deploy#development-deployment).
+The most common way to set up Katello for development is to use
+[katello-deploy](https://github.com/Katello/katello-deploy#development-deployment).
+This will set up a Vagrant instance with the Katello codebase checked out. You
+can also run `setup.rb` directly with katello-deploy if you prefer to not use
+Vagrant.
+
+There is also
+[katello-devel-installer](https://github.com/Katello/katello-installer#development-usage)
+if you would like to use that.
+
+If you have questions or issues with any of the above methods, feel free to ask
+for assistance on #theforeman-dev IRC channel or via the foreman-dev mailing
+list.
 
 ### Test Run
 
@@ -29,14 +41,13 @@ At this point, the development environment should be completely setup and the Ka
     rails s
     ```
 
-2. Access Foreman in your browser (e.g. `http://<hostname>:3000/`)
-3. Login to Foreman (default: `admin` and `changeme`)
-4. Create an initial Foreman organization
-5. Navigate to the Katello engine (e.g. `http://<hostname>:3000/katello`)
+1. Access Foreman in your browser (e.g. `https://<hostname>/`). Note that while Rails will listen on port 3000, the dev installer will set up a reverse proxy so HTTPS on port 443 will work.
+1. Login to Foreman (default: `admin` and `changeme`)
+1. If you go to `https://<hostname>/about` and view the "Plugins" tab, you should see a "Katello" plugin listed.
 
 ### Reset Development Environment
 
-In order to reset the development environment, all backend data and the database needs to be reset. To reiterate, the following will destroy all data in Pulp, Candlepin and your Foreman/Katello database. From the Foreman checkout run:
+In order to reset the development environment, all backend data and the database needs to be reset. To reiterate, *the following will destroy all data in Pulp, Candlepin and your Foreman/Katello database*. From the Foreman checkout run:
 
 ```bash
 rake katello:reset
@@ -50,7 +61,7 @@ That's rather unfortunate. But don't worry! We can help. Just file a bug
 
 ## Contributing
 
-See [getting involved](http://www.katello.org/get-involved/).
+See the [developer documentation](http://www.katello.org/developers/index.html).
 
 ## Contact & Resources
 

data/app/assets/javascripts/katello/common/index.js

@@ -2,7 +2,6 @@
 //= require "katello/common/katello.common.js"
 //= require "katello/common/katello"
 //= require "katello/common/menu"
-//= require "katello/common/chosen.jquery"
 //= require "katello/common/spin.min"
 //= require "katello/common/jquery.jeditable.custominputs"
 //= require "katello/common/katello_object"

data/app/assets/javascripts/katello/common/katello.common.js

@@ -112,11 +112,6 @@ KT.common = (function() {
             }
           });
         },
-        orgSwitcherSetup : function() {
-             $('.favorite').live('click', function(e) {
-                KT.orgswitcher.checkboxChanged($(this).parent().find('.default_org'));
-            });
-        },
         rootURL : function() {
             if (root_url === undefined) {
                 root_url = KT.routes.options.prefix;
@@ -169,9 +164,10 @@ KT.common = (function() {
             }
         },
         link_hover_setup : function(shade){
-            $('a').live('mouseenter',
-                function(){ KT.common.icon_hover_change($(this), shade); }
-            ).live('mouseleave',
+            $('a').on('mouseenter',
+                function(){
+                    KT.common.icon_hover_change($(this), shade); }
+            ).on('mouseleave',
                 function(){ KT.common.icon_hover_change($(this), shade); }
             );
         }

data/app/assets/javascripts/katello/common/katello.js

@@ -250,8 +250,6 @@ $(document).ready(function (){
     // Add a handler for ellipsis
     $(".tipsify").tooltip({ placement: 'bottom', delay : 350 });
     $(".tipsify-left").tooltip({ placement: 'left'});
-
-    KT.common.orgSwitcherSetup();
 });
 
 /**
@@ -268,14 +266,6 @@ $(window).ready(function(){
       $('body').css('cursor', 'default');
     });
 
-    //allow all buttons with class .button to be clicked via enter or space button
-    $('.button').live('keyup', function(e){
-        if(e.which === 13 || e.which === 32)
-        {
-            $(this).click();
-        }
-    });
-
     window.alert = function(message){KT.common.customAlert(message);return false;};
     $.rails.confirm = function(message) {
         KT.common.customConfirm({message: message}); return false;

data/app/assets/javascripts/katello/common/vendor.js

@@ -4,6 +4,5 @@
 //= require "jquery.ui.tabs"
 //= require "jquery.ui.progressbar"
 //= require "jquery.ui.effect.all"
-//= require "katello/jquery.ba-bbq"
 //= require "katello/jquery.periodicalupdater"
 //= require "katello/jquery.trunk8"

data/app/assets/javascripts/katello/hosts/activation_key_edit.js

@@ -77,7 +77,7 @@ function ktSetParam(name, value) {
     var paramContainer = ktFindParamContainer(name);
     if(value) {
         if(! paramContainer) { // we create the param for kt_activation_keys
-            $("div#parameters a.btn-success").click();
+            $("div#parameters a[target~='#global_parameters_table']").click();
             paramContainer = $("div#parameters .fields").last();
             paramContainer.find("input").val(name);
         }

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -118,7 +118,7 @@ KT.hosts.onKatelloHostEditLoad = function(){
 
     $.each(prefxies, function(index, prefix) {
         $.each(attributes, function(attrIndex, attribute) {
-            $('#' + prefix + '_' + attribute).live('change', function () {
+            $('body').on('change', '#' + prefix + '_' + attribute, function () {
                 KT.hosts.toggle_installation_medium();
             });
         });

data/app/assets/javascripts/katello/organizations/download_certificate.js

@@ -1,5 +1,5 @@
 $(document).ready(function() {
-    $('#download_debug_cert_key').live('click', function(e) {
+    $('body').on('click', '#download_debug_cert_key', function(e) {
         e.preventDefault();
         window.location.href = $("#download_debug_cert_key").data("url");
         return false;

data/app/assets/javascripts/katello/providers/provider_redhat.js

@@ -37,7 +37,7 @@ KT.redhat_provider_page = (function($) {
             id = checkbox.attr("value"),
             set_checkbox = checkbox.parents(".repo_set").find('.repo_set_enable');
 
-        if (checkbox.attr("checked") !== undefined) {
+        if (checkbox.is(":checked")) {
             options['repo'] = "1";
         } else {
             options['repo'] = "0";

data/app/assets/javascripts/katello/sync_management/sync_management.js

@@ -11,15 +11,13 @@ $(document).ready(function() {
     KT.content.reset_products(KT.repo_status);
     KT.content_actions.addSyncing(ids);
 
-
-
-
     $('#select_all').click(KT.content.select_all);
     $('#select_none').click(KT.content.select_none);
     $('#collapse_all').click(KT.content.collapse_all);
     $('#expand_all').click(KT.content.expand_all);
 
     KT.content.showAll();
+    KT.content.select_repo();
 
     $("#products_table").delegate(".cancel_sync", "click", function(){
         var repo_id = $(this).parents("tr").attr("data-id");
@@ -35,7 +33,6 @@ $(document).ready(function() {
           KT.content.updateProduct(item.product_id, false, 0);
        });
        KT.content_actions.addSyncing(ids);
-
     })
     .bind("ajax:beforeSend",
       function(evt, data, status, xhr) {
@@ -44,7 +41,6 @@ $(document).ready(function() {
         }
     });
 
-
     $("#sync_toggle").change(function(){
         var img = "<img  src='" + KT.common.spinner_path() + "'>";
         $("#sync_toggle_cont").append(img);
@@ -57,6 +53,10 @@ $(document).ready(function() {
         $("#sync_toggle_cont").find("img").remove();
     });
 
+    $.each($("input[name='repoids[]']"), function(index, checkbox) {
+      $(checkbox).click(KT.content.select_repo);
+    });
+
 });
 
 KT.content_actions = (function(){
@@ -151,11 +151,9 @@ KT.content_actions = (function(){
         addSyncing: addSyncing,
         startUpdater: startUpdater,
         getSyncing: function(){return syncing}
-
     };
 })();
 
-
 KT.content = (function(){
 
      var draw_syncing = function(repo_id, progress){
@@ -243,10 +241,12 @@ KT.content = (function(){
             element.text(text);
         },
         select_all = function(){
-            $("#products_table").find("input[type=checkbox]").attr('checked',true);
+            $("#products_table").find("input[type=checkbox]").prop('checked',true);
+            KT.content.select_repo();
         },
         select_none = function(){
             $("#products_table").find("input[type=checkbox]").removeAttr('checked');
+            KT.content.select_repo();
         },
         select_repo = function(){
             if($("input[name='repoids[]']:checked").length > 0) {
@@ -270,17 +270,13 @@ KT.content = (function(){
                 var total = 0;
                 $.each(percentages, function(i, val){total += val;});
                 updateProduct(prod_id, percentages.length === 0, total/percentages.length);
-
             });
-
         },
         showOnlySyncing = function(){
             $("#products_table").find("tbody").find("tr").hide();
             $.each(KT.content_actions.getSyncing(), function(index, repoid){
                 var repo = $("#repo-" + repoid);
                 showChain(repo);
-
-
             });
         },
         showChain = function(element){
@@ -301,6 +297,11 @@ KT.content = (function(){
             });
         },
         expand_all = function() {
+          var sync_toggle = $("#sync_toggle");
+          if($(sync_toggle).is(":checked")) {
+            $(sync_toggle).removeAttr("checked");
+            KT.content.showAll();
+          }
           $("#products_table").find("tr").removeClass("collapsed").addClass("expanded").each(function(){
             $(this).expand();
           });

data/app/assets/stylesheets/katello/_overrides.scss

@@ -1,7 +1,5 @@
 $primary_color: rgb(0, 112, 143);
 $static_width: 1152px;
-$fa-font-path: "../bastion/font-awesome";
-
 
 // Foreman Overrides
 fieldset {

data/app/assets/stylesheets/katello/katello.scss

@@ -1,9 +1,5 @@
 @import "katello/overrides";
-
-@import "bastion/font-awesome/scss/font-awesome";
-
 @import "katello/katello_base";
-
 @import "katello/look";
 
 @import "katello/fancyqueries";
@@ -12,12 +8,11 @@
 @import "katello/widgets/tabs";
 @import "katello/katello_sprites";
 
-@import "katello/jquery-ui-1.8.11.custom";
-@import "katello/jquery.loadmask";
-@import "katello/jquery.jnotify";
-@import "katello/jquery.treeTable";
-@import "katello/jquery.jscrollpane";
-@import "katello/ui.spinner";
+@import "jquery-ui-1.8.11.custom.css";
+@import "jquery.loadmask.css";
+@import "jquery.treeTable.css";
+@import "jquery.jscrollpane.css";
+@import "ui.spinner.css";
 
 @import "katello/contents";
 @import "katello/generic";

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -7,9 +7,9 @@ module Katello
     wrap_parameters false
 
     around_filter :repackage_message
-    before_filter :find_system, :only => [:consumer_show, :consumer_destroy, :consumer_checkin, :enabled_repos,
-                                          :upload_package_profile, :regenerate_identity_certificates, :facts,
-                                          :available_releases]
+    before_filter :find_host, :only => [:consumer_show, :consumer_destroy, :consumer_checkin, :enabled_repos,
+                                        :upload_package_profile, :regenerate_identity_certificates, :facts,
+                                        :available_releases, :serials]
     before_filter :authorize, :only => [:consumer_create, :list_owners, :rhsm_index]
     before_filter :authorize_client_or_user, :only => [:consumer_show, :upload_package_profile, :regenerate_identity_certificates]
     before_filter :authorize_client_or_admin, :only => [:hypervisors_update]
@@ -90,7 +90,7 @@ module Katello
     #api :GET, "/consumers/:id", N_("Show a system")
     #param :id, String, :desc => N_("UUID of the consumer"), :required => true
     def consumer_show
-      render :json => Resources::Candlepin::Consumer.get(@system.uuid)
+      render :json => Resources::Candlepin::Consumer.get(params[:id])
     end
 
     #api :GET, "/owners/:organization_id/environments", N_("List environments for RHSM")
@@ -111,34 +111,39 @@ module Katello
     #api :POST, "/hypervisors", N_("Update the hypervisors information for environment")
     #desc 'See virt-who tool for more details.'
     def hypervisors_update
-      cp_response, _ = System.register_hypervisors(@environment, @content_view, params.except(:controller, :action, :format))
-      render :json => cp_response
+      login = User.consumer? ? User.anonymous_api_admin.login : User.current.login
+      task = User.as(login) do
+        sync_task(::Actions::Katello::Host::Hypervisors, @environment, @content_view,
+                            params.except(:controller, :action, :format))
+      end
+      render :json => task.output[:results]
     end
 
     #api :PUT, "/consumers/:id/checkin/", N_("Update consumer check-in time")
     #param :date, String, :desc => N_("check-in time")
     def consumer_checkin
-      @system.checkin(params[:date])
-      render :json => Resources::Candlepin::Consumer.get(@system.uuid)
+      @host.update_attributes(:last_checkin => params[:date])
+      Candlepin::Consumer.new(@host.subscription_facet.uuid).checkin(params[:date])
+      render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
     end
 
     #api :PUT, "/consumers/:id/packages", N_("Update installed packages")
     #api :PUT, "/consumers/:id/profile", N_("Update installed packages")
     #param :id, String, :desc => N_("UUID of the consumer"), :required => true
     def upload_package_profile
-      fail HttpErrors::BadRequest, _("No package profile received for %s") % @system.name unless params.key?(:_json)
-      @system.upload_package_profile(params[:_json])
-      render :json => Resources::Candlepin::Consumer.get(@system.uuid)
+      User.as_anonymous_admin do
+        sync_task(::Actions::Katello::Host::UploadPackageProfile, @host, params[:_json])
+      end
+      render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
     end
 
     def available_releases
-      render :json => @system.available_releases
+      render :json => @host.content_facet.try(:available_releases) || []
     end
 
     def list_owners
       orgs = User.current.allowed_organizations
       # rhsm expects owner (Candlepin format)
-      # rubocop:disable SymbolName
       respond_for_index :collection => orgs.map { |o| { :key => o.label, :displayName => o.name } }
     end
 
@@ -146,8 +151,8 @@ module Katello
     #param :id, String, :desc => N_("UUID of the consumer")
     #desc 'Schedules the consumer identity certificate regeneration'
     def regenerate_identity_certificates
-      @system.regenerate_identity_certificates
-      render :json => Resources::Candlepin::Consumer.get(@system.uuid)
+      Candlepin::Consumer.new(params[:uuid]).regenerate_identity_certificates
+      render :json => Resources::Candlepin::Consumer.get(@host.uuid)
     end
 
     api :PUT, "/systems/:id/enabled_repos", N_("Update the information about enabled repositories")
@@ -161,7 +166,7 @@ module Katello
       end
     end
     param :id, String, :desc => N_("UUID of the system"), :required => true
-    def enabled_repos # rubocop:disable Metrics/MethodLength
+    def enabled_repos
       repos_params = params['enabled_repos'] rescue raise(HttpErrors::BadRequest, _("Expected attribute is missing:") + " enabled_repos")
       repos_params = repos_params['repos'] || []
 
@@ -169,17 +174,16 @@ module Katello
         if !repo['baseurl'].blank?
           URI(repo['baseurl'].first).path
         else
-          logger.warn("System #{@system.name} (#{@system.id}) attempted to bind to unspecific repo (#{repo}).")
+          logger.warn("System #{@host.name} (#{@host.id}) attempted to bind to unspecific repo (#{repo}).")
           nil
         end
       end
 
-      processed_ids, error_ids = @system.save_bound_repos_by_path!(paths.compact)
-
-      result = {:processed_ids => processed_ids,
-                :error_ids     => error_ids,
-                :result        => "ok"}
-      result[:result] = "error" if error_ids.present?
+      result = nil
+      User.as_anonymous_admin do
+        @host.content_host.save_bound_repos_by_path!(paths.compact)
+        result = @host.content_facet.update_repositories_by_paths(paths.compact)
+      end
 
       respond_for_show :resource => result
     end
@@ -187,25 +191,21 @@ module Katello
     #api :POST, "/environments/:environment_id/consumers", N_("Register a consumer in environment")
     def consumer_create
       content_view_environment = find_content_view_environment
-      foreman_host = find_foreman_host(content_view_environment.environment.organization)
-
-      sync_task(::Actions::Katello::System::Destroy, foreman_host.content_host) if foreman_host.try(:content_host)
+      host = Katello::Host::SubscriptionFacet.find_or_create_host(params[:facts]['network.hostname'],
+                 content_view_environment.environment.organization, rhsm_params)
 
-      @system = System.new(system_params.merge(:environment  => content_view_environment.environment,
-                                               :content_view => content_view_environment.content_view,
-                                               :serviceLevel => params[:service_level],
-                                               :host_id      => foreman_host.try(:id)))
+      sync_task(::Actions::Katello::Host::Register, host, System.new, rhsm_params, content_view_environment)
+      host.reload
 
-      sync_task(::Actions::Katello::System::Create, @system)
-      @system.reload
-      render :json => Resources::Candlepin::Consumer.get(@system.uuid)
+      render :json => Resources::Candlepin::Consumer.get(host.subscription_facet.uuid)
     end
 
     #api :DELETE, "/consumers/:id", N_("Unregister a consumer")
     #param :id, String, :desc => N_("UUID of the consumer"), :required => true
     def consumer_destroy
-      User.current = User.anonymous_admin
-      sync_task(::Actions::Katello::System::Destroy, @system)
+      User.as_anonymous_admin do
+        sync_task(::Actions::Katello::Host::Unregister, @host)
+      end
       render :text => _("Deleted consumer '%s'") % params[:id], :status => 204
     end
 
@@ -215,23 +215,20 @@ module Katello
     def consumer_activate
       # Activation keys are userless by definition so use the internal generic user
       # Set it before calling find_activation_keys to allow communication with candlepin
-      User.current    = User.anonymous_admin
+      User.current = User.anonymous_admin
       activation_keys = find_activation_keys
-      foreman_host    = find_foreman_host(activation_keys.first.organization)
-
-      sync_task(::Actions::Katello::System::Destroy, foreman_host.content_host) if foreman_host.try(:content_host)
+      host = Katello::Host::SubscriptionFacet.find_or_create_host(params[:facts]['network.hostname'],
+                                    activation_keys.first.organization, rhsm_params)
 
-      @system = System.new(system_params.merge(:host_id => foreman_host.try(:id)))
-      sync_task(::Actions::Katello::System::Create, @system, activation_keys)
-      @system.reload
+      sync_task(::Actions::Katello::Host::Register, host, System.new, rhsm_params, nil, activation_keys)
+      host.reload
 
-      render :json => Resources::Candlepin::Consumer.get(@system.uuid)
+      render :json => Resources::Candlepin::Consumer.get(host.subscription_facet.uuid)
     end
 
     #api :GET, "/status", N_("Shows version information")
     #description N_("This service is available for unauthenticated users")
     def server_status
-      # rubocop:disable SymbolName
       status = { :managerCapabilities => Resources::Candlepin::CandlepinPing.ping['managerCapabilities'],
                  :result => Resources::Candlepin::CandlepinPing.ping['result'],
                  :rulesSource => Resources::Candlepin::CandlepinPing.ping['rulesSource'],
@@ -244,18 +241,19 @@ module Katello
     end
 
     def facts
-      attrs = params.clone
-      slice_attrs = [:name, :description, :location,
-                     :facts, :guestIds, :installedProducts,
-                     :releaseVer, :serviceLevel, :lastCheckin, :autoheal
-                    ]
-      attrs[:installedProducts] = [] if attrs.key?(:installedProducts) && attrs[:installedProducts].nil?
       User.as_anonymous_admin do
-        sync_task(::Actions::Katello::System::Update, @system, attrs.slice(*slice_attrs))
+        sync_task(::Actions::Katello::Host::Update, @host, rhsm_params)
+        Katello::Host::SubscriptionFacet.update_facts(@host, rhsm_params[:facts])
       end
       render :json => {:content => _("Facts successfully updated.")}, :status => 200
     end
 
+    def serials
+      @host.subscription_facet.last_checkin = DateTime.now
+      @host.subscription_facet.save!
+      render :json => Katello::Resources::Candlepin::Consumer.serials(@host.subscription_facet.uuid)
+    end
+
     private
 
     def disable_strong_params
@@ -270,21 +268,22 @@ module Katello
       params[:organization_id] = params[:owner] if params[:owner]
     end
 
-    def find_system(uuid = nil)
-      @system = System.where(:uuid => uuid || params[:id]).first
-      if @system.nil?
+    def find_host(uuid = nil)
+      uuid ||= params[:id]
+      facet = Katello::Host::SubscriptionFacet.where(:uuid => uuid).first
+      if facet.nil?
         # check with candlepin if consumer is Gone, raises RestClient::Gone
-        Resources::Candlepin::Consumer.get params[:id]
-        fail HttpErrors::NotFound, _("Couldn't find consumer '%s'") % params[:id]
+        User.as_anonymous_admin { Resources::Candlepin::Consumer.get(uuid) }
+        fail HttpErrors::NotFound, _("Couldn't find consumer '%s'") % uuid
       end
-      @system
+      @host = facet.host
     end
 
     def find_content_view_environment
       environment = nil
 
       if params.key?(:environment_id)
-        environment = get_content_view_environment_by_cp_id(params[:environment_id])
+        environment = get_content_view_environment("cp_id", params[:environment_id])
       elsif params.key?(:organization_id) && !params.key?(:environment_id)
         organization = find_organization
         environment = organization.library.content_view_environment
@@ -300,14 +299,14 @@ module Katello
     # Hypervisors are restricted to the content host's environment and content view
     def find_hypervisor_environment_and_content_view
       if User.consumer?
-        find_system(User.current.uuid)
-        @organization = @system.organization
-        @environment = @system.environment
-        @content_view = @system.content_view
+        @host = find_host(User.current.uuid)
+        @organization = @host.content_facet.content_view.organization
+        @environment = @host.content_facet.lifecycle_environment
+        @content_view = @host.content_facet.content_view
         params[:owner] = @organization.label
         params[:env] = @content_view.cp_environment_label(@environment)
       else
-        @organization = Organization.find_by_label(params[:owner])
+        @organization = Organization.find_by(:label => params[:owner])
         deny_access unless @organization
         if params[:env] == 'Library'
           @environment = @organization.library
@@ -316,9 +315,9 @@ module Katello
           deny_access unless @content_view && @content_view.readable?
         else
           (env_name, cv_name) = params[:env].split('/')
-          @environment = @organization.kt_environments.find_by_label(env_name)
+          @environment = @organization.kt_environments.find_by(:label => env_name)
           deny_access unless @environment && @environment.readable?
-          @content_view = @environment.content_views.find_by_label(cv_name)
+          @content_view = @environment.content_views.find_by(:label => cv_name)
           deny_access unless @content_view && @content_view.readable?
         end
       end
@@ -328,7 +327,7 @@ module Katello
       organization = nil
 
       if params.key?(:organization_id)
-        organization = Organization.find_by_label(params[:organization_id])
+        organization = Organization.find_by(:label => params[:organization_id])
       end
 
       if organization.nil?
@@ -350,7 +349,7 @@ module Katello
       if ak_names = params[:activation_keys]
         ak_names        = ak_names.split(",")
         activation_keys = ak_names.map do |ak_name|
-          activation_key = organization.activation_keys.find_by_name(ak_name)
+          activation_key = organization.activation_keys.find_by(:name => ak_name)
           fail HttpErrors::NotFound, _("Couldn't find activation key '%s'") % ak_name unless activation_key
 
           if !activation_key.unlimited_content_hosts && activation_key.usage_count >= activation_key.max_content_hosts
@@ -368,11 +367,6 @@ module Katello
       activation_keys
     end
 
-    def find_foreman_host(organization)
-      Host.where(:name => params[:facts]['network.hostname'],
-                 :organization_id => organization.id).first if params[:facts]
-    end
-
     def get_content_view_environment(key, value)
       cve = nil
       if value
@@ -383,10 +377,6 @@ module Katello
       cve
     end
 
-    def get_content_view_environment_by_cp_id(id)
-      get_content_view_environment("cp_id", id)
-    end
-
     def get_content_view_environments(label = nil, organization = nil)
       organization ||= @organization
 
@@ -394,27 +384,11 @@ module Katello
           where("#{Organization.table_name}.id = ?", organization.id)
       environments = environments.where("#{Katello::ContentViewEnvironment.table_name}.label = ?", label) if label
 
-      environments.delete_if do |env|
-        if env.content_view.default
-          !env.environment.readable?
-        else
-          !env.content_view.readable?
-        end
-      end
-
-      environments
+      environments.reject { |env| (env.content_view.default && !env.environment.readable?) || !env.content_view.readable? }
     end
 
-    def system_params
-      system_params = params.slice(:name, :organization_id, :facts, :installedProducts)
-
-      if params.key?(:cp_type)
-        system_params[:cp_type] = params[:cp_type]
-      elsif params.key?(:type)
-        system_params[:cp_type] = params[:type]
-      end
-
-      system_params
+    def rhsm_params
+      params.slice(:name, :type, :facts, :installedProducts, :autoheal, :releaseVer, :serviceLevel, :uuid, :capabilities, :guestIds, :lastCheckin)
     end
 
     def logger
@@ -453,7 +427,7 @@ module Katello
 
     def client_authorized?
       authorized = authenticate_client && User.consumer?
-      authorized = (User.current.uuid == @system.uuid) if @system && User.consumer?
+      authorized = (User.current.uuid == @host.subscription_facet.uuid) if @host && User.consumer?
       authorized
     end