Fixes #13903 - Move release version list to be host based (Katello#6078)

daviddavis · Jun 3, 2016 · 536c81e · 536c81e
1 parent c7746d6
commit 536c81e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 21 deletions.
diff --git a/app/controllers/katello/api/v2/host_subscriptions_controller.rb b/app/controllers/katello/api/v2/host_subscriptions_controller.rb
@@ -153,6 +153,13 @@ def product_content
       respond_for_index(:collection => full_result_response(results))
     end
 
+    api :GET, "/hosts/:host_id/subscriptions/available_release_versions", N_("Show releases available for the content host")
+    param :host_id, String, :desc => N_("id of host"), :required => true
+    def available_release_versions
+      releases = @host.content_facet.try(:available_releases) || []
+      respond_for_index :collection => full_result_response(releases)
+    end
+
     private
 
     def validate_content_overrides(content_params)

diff --git a/app/controllers/katello/api/v2/systems_controller.rb b/app/controllers/katello/api/v2/systems_controller.rb
@@ -80,18 +80,6 @@ def show
       respond
     end
 
-    api :GET, "/systems/:id/releases", N_("Show releases available for the content host"), :deprecated => true
-    param :id, String, :desc => N_("UUID of the content host"), :required => true
-    desc <<-DESC
-      A hint for choosing the right value for the releaseVer param
-    DESC
-    def releases
-      response = { :results => @system.available_releases,
-                   :total => @system.available_releases.size,
-                   :subtotal => @system.available_releases.size }
-      respond_for_index :collection => response
-    end
-
     private
 
     def system_params_to_host_params(sys_params)

diff --git a/...katello/api/v2/systems/releases.json.rabl → ...ions/available_release_versions.json.rabl b/...katello/api/v2/systems/releases.json.rabl → ...ions/available_release_versions.json.rabl
diff --git a/config/routes/api/v2.rb b/config/routes/api/v2.rb
@@ -240,14 +240,9 @@ class ActionDispatch::Routing::Mapper
         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
 

diff --git a/config/routes/overrides.rb b/config/routes/overrides.rb
@@ -83,6 +83,7 @@ def matches?(request)
               put :auto_attach
               get :product_content
               get :events
+              get :available_release_versions
               put :content_override
               put :remove_subscriptions
               put :add_subscriptions

diff --git a/...javascripts/bastion_katello/content-hosts/details/content-host-details-info.controller.js b/...javascripts/bastion_katello/content-hosts/details/content-host-details-info.controller.js
@@ -15,8 +15,8 @@
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoController',
-    ['$scope', '$q', 'translate', 'ContentHost', 'ContentView', 'Organization', 'CurrentOrganization', 'ContentHostsHelper',
-    function ($scope, $q, translate, ContentHost, ContentView, Organization, CurrentOrganization, ContentHostsHelper) {
+    ['$scope', '$q', 'translate', 'HostSubscription', 'ContentView', 'Organization', 'CurrentOrganization', 'ContentHostsHelper',
+    function ($scope, $q, translate, HostSubscription, ContentView, Organization, CurrentOrganization, ContentHostsHelper) {
         function doubleColonNotationToObject(dotString) {
             var doubleColonObject = {}, tempObject, parts, part, key, property;
             for (property in dotString) {
@@ -84,7 +84,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
         $scope.releaseVersions = function () {
             var deferred = $q.defer();
 
-            ContentHost.releaseVersions({ id: $scope.host.subscription_facet_attributes.uuid }, function (response) {
+            HostSubscription.releaseVersions({ id: $scope.host.id }, function (response) {
                 if (response.total === 0) {
                     $scope.showVersionAlert = true;
                 }

diff --git a/...bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-subscription.factory.js b/...bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-subscription.factory.js
@@ -16,7 +16,8 @@ angular.module('Bastion.hosts').factory('HostSubscription',
             removeSubscriptions: {method: 'put', isArray: false, params: {action: 'remove_subscriptions'}},
             addSubscriptions: {method: 'put', isArray: false, params: {action: 'add_subscriptions'}},
             productContent: {method: 'get', isArray: false, params: {action: 'product_content'}},
-            contentOverride: {method: 'put', isArray: false, params: {action: 'content_override'}}
+            contentOverride: {method: 'put', isArray: false, params: {action: 'content_override'}},
+            releaseVersions: {method: 'get', isArray: false, params: {action: 'available_release_versions'}}
         });
 
     }]

diff --git a/test/controllers/api/v2/host_subscriptions_controller_test.rb b/test/controllers/api/v2/host_subscriptions_controller_test.rb
@@ -205,6 +205,12 @@ def test_invalid_content_fails
       assert_response 400
     end
 
+    def test_available_release_versions
+      get :available_release_versions, :host_id => @host.id
+
+      assert_response :success
+    end
+
     def test_destroy
       assert_sync_task(::Actions::Katello::Host::Unregister, @host)
       delete :destroy, :host_id => @host.id