foreman-katello-engine 0.0.2 → 0.0.3

data/Gemfile

@@ -1 +1,3 @@
 source "https://rubygems.org"
+
+gemspec

data/app/controllers/activation_keys_controller.rb

@@ -1,5 +1,12 @@
 class ActivationKeysController < ApplicationController
   def index
-    # TODO: load relevant activation keys form Katello
+    if org = Organization.find_by_id(params[:environment_id])
+      if match = org.name.match(/\Akt-\[(.*)\]\[(.*)\]\Z/)
+        org_name, env_name = match[1], match[2]
+      end
+    end
+
+    ak_data = ForemanKatelloEngine::Bindings.activation_keys_to_subscriptions(org_name, env_name)
+    render :status => 200, :json => ak_data, :content_type => 'application/json'
   end
 end

data/app/views/activation_keys/_host_tab_pane.html.erb

@@ -1,11 +1,34 @@
 <%= javascript_tag do %>
 
 $(function() {
-    var KT_AK_LABEL = "<%= kt_ak_label %>"
-    var availableActivationKeys = $.parseJSON('{' +
-                                              '"rhel6selfservice": ["Red Hat Enterprise Linux 6 Server Self-Service"],' +
-                                              '"katello-and-friends": ["Katello", "Pulp", "Candlepin", "Foreman"],' +
-                                              '"headpin-and-friends": ["Headpin", "Thumbslug", "Candlepin"] }');
+    var KT_AK_LABEL = "<%= kt_ak_label %>";
+    var availableActivationKeys = {};
+
+    function ktLoadActivationKeys() {
+        $("#ak-subscriptions-info").hide();
+        $("#ak-subscriptions-spinner").show();
+        var url = foreman_url('/activation_keys');
+        var environmentId = $("#kt_environment_id").val();
+        if(environmentId) {
+            $.ajax({
+                type: 'get',
+                url:  url,
+                data:'environment_id=' + environmentId,
+                success: function(response) {
+                    availableActivationKeys = response;
+                },
+                error: function(error) {
+                    $.jnotify("Error while loading activation keys from Katello", { type: "error", sticky: true });
+                },
+                complete: function() {
+                    ktAkUpdateSubscriptionsInfo();
+                }
+            });
+        } else {
+            availableActivationKeys = {};
+            ktAkUpdateSubscriptionsInfo();
+        }
+    }
 
     function ktFindParamContainer(name){
         var ret;
@@ -136,7 +159,7 @@ $(function() {
         ktSetParam(KT_AK_LABEL, ktActivationKeysValue);
     }
 
-    function ktAkUpdateubscriptionsInfo() {
+    function ktAkUpdateSubscriptionsInfo() {
         var subsInfo = $("ul#ak-subscriptions-info");
         subsInfo.empty();
         var selectedKeys = $("#kt_activation_keys").val().split(/,\s*/);
@@ -144,19 +167,25 @@ $(function() {
           if(availableActivationKeys[key]) {
             // hack to make it working with deface
             var ul = "<ul>", ul_end = "</ul>", li = "<li>", li_end = "</li>";
-            content = li + key + ul + li;
-            content += availableActivationKeys[key].join(li_end + li);
-            content += li_end + ul_end + li_end;
+            content = li + key + ul;
+            if(!availableActivationKeys[key].length == 0) {
+                content += li;
+                content += availableActivationKeys[key].join(li_end + li);
+                content += li_end;
+            }
+            content +=  ul_end + li_end;
             subsInfo.append(content);
           }
         });
+        $("#ak-subscriptions-info").show();
+        $("#ak-subscriptions-spinner").hide();
     }
 
     function ktOnLoad() {
         ktHideParams();
         ktParamToAkInput();
-        ktAkUpdateubscriptionsInfo();
         ktOrganizationsToKtEnv();
+        ktLoadActivationKeys();
     };
 
     function ktOnSubmit() {
@@ -191,11 +220,11 @@ $(function() {
         select: function(event, ui) {
             var oldTerms = this.value.replace(/[^, ][^,]*$/,"");
             this.value = oldTerms + ui.item.value;
-            ktAkUpdateubscriptionsInfo();
+            ktAkUpdateSubscriptionsInfo();
             return false;
         },
         close: function() {
-            ktAkUpdateubscriptionsInfo();
+            ktAkUpdateSubscriptionsInfo();
         }
 
     }).bind("focus", function(event) {
@@ -203,6 +232,13 @@ $(function() {
 	    $(this).autocomplete( "search" );
         }});
 
+    $("#kt_environment_id").change(ktLoadActivationKeys);
+
+    $("#ak_refresh_subscriptions").click(function () {
+        ktLoadActivationKeys();
+        return false;
+    });
+
 });
 
 <% end %>
@@ -217,6 +253,12 @@ $(function() {
     <p><b>Subscriptions information based on selected activation keys:</b></p>
     <ul id="ak-subscriptions-info">
     </ul>
-    <p>Activation keys and subscriptions can be managed <b><a href="/katello" target="_blank">here</a></b></p>
+    <div id="ak-subscriptions-spinner" style="display: none">
+      <%= image_tag "spinner.gif" %>
+    </div>
+    <p>Activation keys and subscriptions can be managed
+      <b><a href="<%= Setting['katello_url'] %>/activation_keys" target="_blank">here</a></b>
+    </p>
+    <p><a href="" id="ak_refresh_subscriptions">Reload data from Katello</a></p>
   </div>
 </div>

data/foreman-katello-engine.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "foreman-katello-engine"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.authors = ["Katello"]
   s.date = "2013-03-04"
@@ -10,5 +10,6 @@ Gem::Specification.new do |s|
   s.homepage = "http://katello.org"
   s.licenses = ["GPL-2"]
   s.require_paths = ["lib"]
+  s.add_dependency "katello_api"
   s.summary = "Katello specific parts of Foreman"
 end

data/lib/foreman_katello_engine/bindings.rb

@@ -0,0 +1,52 @@
+require 'katello_api'
+
+module ForemanKatelloEngine
+  module Bindings
+
+    class << self
+
+      def initialize_settings
+        # proceed only if db set up correctly
+        Setting.first rescue return
+        [
+         Foreman::DefaultSettings::Loader.set('katello_url', 'url of a Katello instance', 'https://localhost/katello')
+        ].each { |s| Foreman::DefaultSettings::Loader.create(s.update(:category => "General")) }
+      end
+
+      def client_config
+        {
+          :base_url => Setting['katello_url'],
+          :enable_validations => false,
+          :oauth => {
+            :consumer_key => Setting['oauth_consumer_key'],
+            :consumer_secret => Setting['oauth_consumer_secret']
+          }
+        }
+      end
+
+      def environment
+        KatelloApi::Resources::Environment.new(client_config)
+      end
+
+      def activation_key
+        KatelloApi::Resources::ActivationKey.new(client_config)
+      end
+
+      def activation_keys_to_subscriptions(org_name, env_name)
+        environments, _ = self.environment.index('organization_id' => org_name, :name => env_name)
+        if environment = environments.first
+          activation_keys, _ = self.activation_key.index('environment_id' => environment['id'])
+          return activation_keys.reduce({}) do |h, ak|
+            h.update(ak['name'] => ak['pools'].map { |pool| pool['subscription'] })
+          end
+        else
+          return nil
+        end
+      end
+
+    end
+  end
+
+end
+
+

data/lib/foreman_katello_engine/engine.rb

@@ -4,6 +4,8 @@ module ForemanKatelloEngine
   class Engine < ::Rails::Engine
 
     initializer 'foreman_katello_engine.helper' do |app|
+      require 'foreman_katello_engine/bindings'
+      ForemanKatelloEngine::Bindings.initialize_settings
       ActionView::Base.send :include, ForemanKatelloEngine::HostsAndHostgroupsHelper
     end
 

metadata

@@ -1,22 +1,45 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: foreman-katello-engine
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
-authors:
+authors: 
 - Katello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
-dependencies: []
+
+date: 2013-03-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: katello_api
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Katello specific parts of Foreman
 email: katello-devel@redhat.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -31,30 +54,40 @@ files:
 - foreman-katello-engine.gemspec
 - lib/foreman-katello-engine.rb
 - lib/foreman_katello_engine.rb
+- lib/foreman_katello_engine/bindings.rb
 - lib/foreman_katello_engine/engine.rb
 homepage: http://katello.org
-licenses:
+licenses: 
 - GPL-2
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Katello specific parts of Foreman
 test_files: []
+