foreman-katello-engine 0.0.5 → 0.0.6

data/README.md

@@ -26,24 +26,11 @@ Modified functionality
 
 ### Host Group forms
 
-New tab 'Katello' is added to the host groups form, exposing a select
-box for katello environment and activation keys.
+New tab 'Activation Keys is added to the host groups form, exposing a select
+box for activation keys.
 
-Katello Environment is modeled by Foreman organizations. For now, a
-naming convention makes it possible to identify Katello specific
-organizations like this:
-
-```
-Foreman Organization       | Katello Entity
------------------------------------------------------------------
-kt-[ACME_Corporation]      | organization ACME_Corporation
-kt-[ACME_Corporation][Dev] | environment Dev in ACME_Corporation
-```
-
-These organizations are hidden from the 'Organizations' tab and put
-into the 'Katello Environment' select box. Before submitting the form,
-the changed are reflected back to the Foreman organizations
-checkboxes.
+Also environments select box is improved to group Foreman environments
+by Katello organizations and environments.
 
 The activation keys are modeled similarly using foreman custom params.
 The value entered into 'Activation Keys' is saved as
@@ -54,24 +41,6 @@ The activation keys are autocompleted for better user experience and
 the list of products for each used activation key is displayed at the
 bottom of the Katello tab.
 
-### Katello-friendly provisioning
-
-To register a provisioned system to katello a new provisioning
-template snippet needs to be crated, lets call it katello:
-
-```
-<% if @host.params['kt_activation_keys'] %>
-rpm -ivh "http://katello.example.com/pub/candlepin-cert-consumer-katello.example.com-1.0-1.noarch.rpm"
-subscription-manager register --org "<%= @host.params['kt_org'] %>" --activationkey "<%= @host.params['kt_activation_keys'] %>"
-<% end %>
-```
-
-and reference it from the kickstart template:
-
-```
-<%= snippets "katello" %>
-```
-
 Testing
 -------
 

data/app/controllers/foreman_katello_engine/activation_keys_controller.rb

@@ -0,0 +1,12 @@
+module ForemanKatelloEngine
+  class ActivationKeysController < ApplicationController
+    def index
+      environment = ::Environment.find_by_id(params[:environment_id])
+      raise "Selected environment has now Katello connection" unless environment.katello_id
+      kt_org_label, kt_env_label, kt_cv_label = environment.katello_id.split('/')
+
+      ak_data = ForemanKatelloEngine::Bindings.activation_keys_to_subscriptions(kt_org_label, kt_env_label, kt_cv_label)
+      render :status => 200, :json => ak_data, :content_type => 'application/json'
+    end
+  end
+end

data/app/controllers/foreman_katello_engine/api/environments_controller.rb

@@ -0,0 +1,35 @@
+module ForemanKatelloEngine
+  module Api
+    class EnvironmentsController < ::Api::V2::BaseController
+
+      def show
+        @environment = ForemanKatelloEngine::Environment.find(params[:org], params[:env], params[:content_view])
+        if @environment
+          render :template => "api/v1/environments/show"
+        else
+          render_error 'not_found', :status => :not_found
+        end
+      end
+
+      def create
+        begin
+          organization = Organization.find(params[:org_id]) if params[:org_id].present?
+          @environment = ForemanKatelloEngine::Environment.create!(params[:org],
+                                                                   params[:env],
+                                                                   params[:content_view],
+                                                                   params[:content_view_id]) do |env|
+            env.organizations << organization if organization
+          end
+        rescue ForemanKatelloEngine::Environment::Conflict => e
+          render_error 'standard_error', :status => 409, :locals => { :exception => e }
+          return
+        rescue ArgumentError => e
+          render_error 'standard_error', :status => 422, :locals => { :exception => e }
+          return
+        end
+        render :template => "api/v1/environments/show"
+      end
+
+    end
+  end
+end

data/app/helpers/foreman_katello_engine/hosts_and_hostgroups_helper.rb

@@ -15,5 +15,53 @@ module ForemanKatelloEngine
       "kt_activation_keys"
     end
 
+    def envs_by_kt_org
+      ::Environment.all.find_all(&:katello_id).group_by do |env|
+        if env.katello_id
+          env.katello_id.split('/').first
+        end
+      end
+    end
+
+    def envs_by_kt_env(envs)
+      envs.group_by do |env|
+        env.katello_id.split('/')[1]
+      end
+    end
+
+    def envs_without_kt_org
+      envs_without_kt_org = ::Environment.all.reject(&:katello_id)
+    end
+
+    def envs_without_kt_org_options
+      options_from_collection_for_select(envs_without_kt_org,
+                                         :id,
+                                         :to_label,
+                                         (@host || @hostgroup).environment_id)
+    end
+
+    def grouped_env_options
+      envs_by_org = envs_by_kt_org.reduce({}) do |hash, (org, envs)|
+        hash.update(org => envs_by_kt_env(envs))
+      end
+      grouped_options = envs_by_org.sort_by(&:first).map do |org, envs_by_env|
+        optgroup = %[<optgroup label="#{org}">]
+        opts = envs_by_env.sort_by(&:first).map do |kt_env, envs|
+          envs.sort_by(&:katello_id).map do |env|
+            selected = env.id == (@host || @hostgroup).environment_id ? "selected" : ""
+            if cv = env.katello_id.split('/')[2]
+              %[<option value="#{env.id}" class="kt-cv" #{selected}>#{cv}</option>]
+            else
+              %[<option value="#{env.id}" class="kt-env" #{selected}>#{kt_env}</option>]
+            end
+          end.join
+        end.join
+        optgroup << opts
+        optgroup << '</optgroup>'
+      end.join
+
+      return grouped_options.html_safe + envs_without_kt_org_options
+    end
+
   end
 end

data/app/models/foreman_katello_engine/environment.rb

@@ -0,0 +1,39 @@
+module ForemanKatelloEngine
+  class Environment
+
+    class Conflict < StandardError; end
+
+    def self.find(org_label, env_label, content_view_label)
+      katello_id = generate_katello_id(org_label, env_label, content_view_label)
+      ::Environment.where(:katello_id => katello_id).first
+    end
+
+    def self.create!(org_label, env_label, content_view_label, content_view_id)
+      katello_id = generate_katello_id(org_label, env_label, content_view_label)
+      ::Environment.transaction do
+        if existing_env = ::Environment.where(:katello_id => katello_id).first
+          raise Conflict, "environment already exists: #{existing_env.id} - #{existing_env.name}"
+        end
+        ::Environment.create! do |env|
+          env.name = generate_name(org_label, env_label, content_view_label, content_view_id)
+          env.katello_id = katello_id
+          yield env if block_given?
+        end
+      end
+    end
+
+    def self.generate_katello_id(org_label, env_label, content_view_label)
+      raise ArgumentError, "org_label has to be specified" if org_label.blank?
+      raise ArgumentError, "env_label has to be specified" if env_label.blank?
+      [org_label, env_label, content_view_label].reject(&:blank?).join('/')
+    end
+
+    # content_view_id provides the uniqueness of the name
+    def self.generate_name(org_label, env_label, content_view_label, content_view_id)
+      name = ["KT", org_label, env_label, content_view_label, content_view_id].reject(&:blank?).join('_')
+      return name.gsub('-','_')
+    end
+
+
+  end
+end

data/app/models/setting/katello.rb

@@ -0,0 +1,14 @@
+class Setting::Katello < ::Setting
+
+  def self.load_defaults
+    return unless (self.table_exists? rescue false)
+    BLANK_ATTRS << "katello_url"
+    Setting.transaction do
+      [
+       self.set('katello_url', 'url of a Katello instance', 'https://localhost/katello'),
+      ].compact.each { |s| self.create s.update(:category => "Setting::Katello")}
+    end
+    true
+  end
+
+end

data/app/overrides/add_activation_keys_input.rb

@@ -1,9 +1,17 @@
 Deface::Override.new(:virtual_path => "hostgroups/_form",
                      :name => "add_activation_keys_tab",
                      :insert_after => 'ul.nav > code[erb-silent]:contains("show_organization_tab?") ~ code[erb-silent]:contains("end")',
-                     :partial => 'activation_keys/host_tab')
+                     :partial => 'foreman_katello_engine/activation_keys/host_tab')
 
 Deface::Override.new(:virtual_path => "hostgroups/_form",
                      :name => "add_activation_keys_tab_pane",
                      :insert_after => 'div.tab-content > code[erb-silent]:contains("show_organization_tab?") ~ code[erb-silent]:contains("end")',
-                     :partial => 'activation_keys/host_tab_pane')
+                     :partial => 'foreman_katello_engine/activation_keys/host_tab_pane')
+Deface::Override.new(:virtual_path => "hostgroups/_form",
+                     :name => "hostgroups_update_environments_select",
+                     :replace => 'code[erb-loud]:contains("select_f"):contains(":environment_id")',
+                     :partial => 'foreman_katello_engine/activation_keys/host_environment_select')
+Deface::Override.new(:virtual_path => "hosts/_form",
+                     :name => "hosts_update_environments_select",
+                     :replace => 'code[erb-loud]:contains("select_f"):contains(":environment_id")',
+                     :partial => 'foreman_katello_engine/activation_keys/host_environment_select')

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

@@ -0,0 +1,13 @@
+<style>
+  option.kt-env { margin-left: 0em; }
+  option.kt-cv  { margin-left: 1em; }
+</style>
+
+<%= field(f, :environment_id, {:include_blank => true}) do
+    f.select :environment_id,
+             grouped_env_options,
+             {:include_blank =>true},
+             {:onchange => 'update_puppetclasses(this);',
+              :"data-url" => environment_selected_hostgroups_path,
+              :'data-host-id' => (@host && @host.id)}
+end %>

data/app/views/foreman_katello_engine/activation_keys/_host_tab.html.erb

@@ -0,0 +1,3 @@
+<li id="activation_keys_tab">
+  <a href="#activation_keys" data-toggle="tab">Activation Keys</a>
+</li>

data/app/views/{activation_keys → foreman_katello_engine/activation_keys}/_host_tab_pane.html.erb

@@ -5,10 +5,17 @@ $(function() {
     var availableActivationKeys = {};
 
     function ktLoadActivationKeys() {
+        if(ktSelectedOrgEnvCv()[0]) {
+            ktAkTab().show();
+        } else {
+            ktAkTab().hide();
+            return; //no Katello-specific env selected
+        }
+
         $("#ak-subscriptions-info").hide();
         $("#ak-subscriptions-spinner").show();
-        var url = foreman_url('/activation_keys');
-        var environmentId = $("#kt_environment_id").val();
+        var url = foreman_url('/foreman_katello_engine/activation_keys');
+        var environmentId = $("#hostgroup_environment_id").val();
         if(environmentId) {
             $.ajax({
                 type: 'get',
@@ -43,8 +50,8 @@ $(function() {
     }
 
     function ktOrganizations() {
-        return $.grep($("#organizations label.organization"), function (el) {
-            return $(el).text().trim().match(/^kt-/)
+        return $.grep($("#organizations #hostgroup_organization_ids option"), function (el) {
+            return $(el).text().trim().match(/^KT-/)
         });
     }
 
@@ -63,54 +70,27 @@ $(function() {
         });
     }
 
-    function ktOrganizationsToKtEnv() {
-        var ktOrgs = [], ktOrgsToEnvs = [], selectedEnvId;
-        var ktEnvironmentSelect = $("#kt_environment_id");
-        $.each(ktOrganizations(), function (i, label) {
-            var input = $(label).find("input[ type = 'checkbox' ]");
-            var frOrgName = $(label).text().trim();
-            var frOrgId = input.val();
-            var match = ktParseOrgName(frOrgName);
-            if(match) {
-                if(input.attr('checked')) {
-                    selectedEnvId = frOrgId;
-                }
-                var ktOrg = match[1]; ktEnv = match[2];
-                if(ktOrgs.indexOf(ktOrg) == -1) {
-                    ktOrgs.push(ktOrg);
-                    ktOrgsToEnvs[ktOrg] = [];
-                }
-                ktOrgsToEnvs[ktOrg].push([frOrgId, ktEnv]);
-            }
-            $(this).parent().hide();
-        });
+    function ktSelectedOrgEnvCv() {
+        var selectedEnvId = $("#hostgroup_environment_id").val();
+        var selectedOption = $("#hostgroup_environment_id option[ value ='" + selectedEnvId + "' ]");
 
-        ktEnvironmentSelect.empty();
-        var content = '<option value=""></option>';
-        $.each(ktOrgs, function (i, org) {
-            content += '<optgroup label="' + org + '">';
-            $.each(ktOrgsToEnvs[org], function (j, env) {
-                // we don't quotre the value beacuse of deface bug
-                content += '<option value=';
-                content += env[0];
-
-                if(env[0] == selectedEnvId) {
-                    content += " selected";
-                }
-                content += '>' + env[1] + '</option>';
-            });
-            content += '</optgroup>';
-        });
-        ktEnvironmentSelect.append(content);
+        var ktEnvOption, ktCvOption, ktOrgLabel, ktEnvLabel, ktCvLabel;
+        if(selectedOption.hasClass('kt-cv')) {
+            ktCvOption = selectedOption;
+            ktEnvOption = ktCvOption.prevAll('option.kt-env').first();
+        } else if(selectedOption.hasClass('kt-env')) {
+            ktEnvOption = selectedOption;
+        }
 
-    }
+        if(ktEnvOption) {
+            ktEnvLabel = ktEnvOption.text();
+            ktOrgLabel = ktEnvOption.parent().attr('label');
+        }
 
-    function ktSelectedOrgAndEnv() {
-        var selectedEnvId = $("#kt_environment_id").val();
-        var orgCheckbox = $("#organizations label.organization input[ type = 'checkbox' ][ value = '" + selectedEnvId + "' ]");
-        if(orgCheckbox) {
-            return ktParseOrgName(orgCheckbox.parent().text().trim());
+        if(ktCvOption) {
+            ktCvLabel = ktCvOption.text();
         }
+        return [ktOrgLabel, ktEnvLabel, ktCvLabel];
     }
 
     function ktSetParam(name, value) {
@@ -130,19 +110,25 @@ $(function() {
     }
 
     function ktEnvToParam() {
-        var orgAndEnv = ktSelectedOrgAndEnv() || [];
-        ktSetParam('kt_org', orgAndEnv[1]);
-        ktSetParam('kt_env', orgAndEnv[2]);
+        var orgEnvCv = ktSelectedOrgEnvCv() || [];
+        ktSetParam('kt_org', orgEnvCv[0]);
+        ktSetParam('kt_env', orgEnvCv[1]);
+        ktSetParam('kt_cv',  orgEnvCv[2]);
     }
 
     function ktEnvToFrOrganizations() {
-        var selectedEnvId = $("#kt_environment_id").val();
-        $.each(ktOrganizations(), function (i, label) {
-            var input = $(label).find("input[ type = 'checkbox' ]");
-            if(selectedEnvId == input.val()) {
-                input.prop("checked", true);
+        var orgEnvCv = ktSelectedOrgEnvCv() || [];
+
+        var orgName = "";
+        if(orgEnvCv[0]) {
+            orgName = 'KT-[' + orgEnvCv[0] + ']';
+        }
+
+        $.each(ktOrganizations(), function (i, option) {
+            if(orgName == $(option).text().trim()) {
+                $("#hostgroup_organization_ids").multiSelect('select', $(option).val());
             } else {
-                input.prop("checked", false);
+                $("#hostgroup_organization_ids").multiSelect('deselect', $(option).val());
             }
         });
     }
@@ -181,10 +167,13 @@ $(function() {
         $("#ak-subscriptions-spinner").hide();
     }
 
+    function ktAkTab() {
+        return $('li#activation_keys_tab');
+    }
+
     function ktOnLoad() {
         ktHideParams();
         ktParamToAkInput();
-        ktOrganizationsToKtEnv();
         ktLoadActivationKeys();
     };
 
@@ -232,7 +221,7 @@ $(function() {
 	    $(this).autocomplete( "search" );
         }});
 
-    $("#kt_environment_id").change(ktLoadActivationKeys);
+    $("#hostgroup_environment_id").change(ktLoadActivationKeys);
 
     $("#ak_refresh_subscriptions").click(function () {
         ktLoadActivationKeys();
@@ -242,11 +231,8 @@ $(function() {
 });
 
 <% end %>
-<div class="tab-pane" id="katello">
-  <%= field(nil, "Katello Environment", :help_inline => "the names of Katello organization and environment will be available in templates as @host.params['kt_org'] and @host.params['kt_env']") do
-    select_tag(:kt_environment_id, [])
-  end %>
-  <%= field(nil, "Activation Keys", :help_inline => "comma separated values. The value will be available in templates as @host.params['#{kt_ak_label}']") do
+<div class="tab-pane" id="activation_keys">
+  <%= field(f, "Activation Keys", :help_inline => "comma separated values. The value will be available in templates as @host.params['#{kt_ak_label}']") do
     text_field_tag("kt_activation_keys", "", :style => 'width: 98%')
   end %>
   <div class="alert alert-info">

data/config/routes.rb

@@ -1,3 +1,9 @@
 Rails.application.routes.draw do
-  resources :activation_keys, :only => [:index]
+
+  namespace :foreman_katello_engine do
+    resources :activation_keys, :only => [:index]
+    namespace :api do
+      resources :environments, :only => [:show, :create]
+    end
+  end
 end

data/db/migrate/20130419110332_update_environments_add_katello_id.rb

@@ -0,0 +1,10 @@
+class UpdateEnvironmentsAddKatelloId < ActiveRecord::Migration
+  def up
+    add_column :environments, :katello_id, :string
+    add_index :environments, :katello_id
+  end
+
+  def down
+    remote_column :environment, :katello_id
+  end
+end

data/foreman-katello-engine.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "foreman-katello-engine"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.authors = ["Katello"]
   s.date = "2013-03-04"

data/lib/foreman_katello_engine/bindings.rb

@@ -20,14 +20,29 @@ module ForemanKatelloEngine
         KatelloApi::Resources::Environment.new(client_config)
       end
 
+      def content_view
+        KatelloApi::Resources::ContentView.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)
+      def activation_keys_to_subscriptions(org_label, env_label, content_view_label = nil)
+        ak_query = {}
+        if content_view_label
+          content_views, _ = self.content_view.index('organization_id' => org_label,
+                                                     'label' => content_view_label)
+          if content_view = content_views.first
+            ak_query['content_view_id'] = content_view['id']
+          end
+        end
+        environments, _ = self.environment.index('organization_id' => org_label, 'name' => env_label)
         if environment = environments.first
-          activation_keys, _ = self.activation_key.index('environment_id' => environment['id'])
+          ak_query['environment_id'] = environment['id']
+        end
+        if ak_query.any?
+          activation_keys, _ = self.activation_key.index(ak_query)
           return activation_keys.reduce({}) do |h, ak|
             h.update(ak['name'] => ak['pools'].map { |pool| pool['productName'] })
           end

data/lib/foreman_katello_engine/engine.rb

@@ -7,10 +7,11 @@ module ForemanKatelloEngine
     end
 
     config.after_initialize do
+      if (Setting::Katello.table_exists? rescue false)
+        Setting::Katello.load_defaults
+      end
       require 'foreman_katello_engine/bindings'
-      require 'foreman_katello_engine/settings'
       require 'foreman_katello_engine/renderer'
-      ForemanKatelloEngine::Settings.initialize_settings
     end
 
     initializer 'foreman_katello_engine.helper' do |app|

data/lib/foreman_katello_engine/settings.rb

@@ -1,13 +0,0 @@
-module ForemanKatelloEngine
-  class Settings
-
-    def self.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
-
-  end
-end

data/test/functional/activation_keys_controller_test.rb

@@ -1,17 +1,35 @@
 require 'test_helper'
 require 'mocha/setup'
 
-class ActivationKeysControllerTest < ActionController::TestCase
+module ForemanKatelloEngine
+  class ActivationKeysControllerTest < ActionController::TestCase
 
-  def aks_to_subscriptions_data
-    {"ak1" => ["prod1", "prod2"], "ak2" => ["prod3", "prod4"]}
-  end
+    before do
+      setup_users
+    end
 
-  def test_index
-    ForemanKatelloEngine::Bindings.stubs(:activation_keys_to_subscriptions).returns(aks_to_subscriptions_data)
-    get :index, {}, set_session_user
-    assert_response :success
-    assert_equal aks_to_subscriptions_data, JSON.parse(response.body)
-  end
+    let :environment do
+      ::Environment.create! do |env|
+        env.name  = 'DevEnv'
+        env.katello_id = 'ACME/Dev/CV1'
+      end
+    end
+
+    let :aks_to_subscriptions_data do
+      {"ak1" => ["prod1", "prod2"], "ak2" => ["prod3", "prod4"]}
+    end
+
+    describe "#index" do
 
+      it "loads activation keys from Katello" do
+        ForemanKatelloEngine::Bindings.expects(:activation_keys_to_subscriptions).
+          with('ACME', 'Dev', 'CV1').returns(aks_to_subscriptions_data)
+        get :index, { :environment_id => environment.id }, set_session_user
+        assert_response :success
+        assert_equal aks_to_subscriptions_data, JSON.parse(response.body)
+      end
+
+    end
+
+  end
 end

data/test/functional/api/environments_controller_test.rb

@@ -0,0 +1,96 @@
+require 'test_helper'
+require 'mocha/setup'
+
+module ForemanKatelloEngine
+  module Api
+    class EnvironmentsControllerTest < ActionController::TestCase
+
+      before do
+        setup_users
+        environment
+      end
+
+      let :environment do
+        ::Environment.create! do |env|
+          env.name  = 'DevEnv'
+          env.katello_id = 'ACME/Dev/CV1'
+        end
+      end
+
+      let :organization do
+        Organization.create! do |org|
+          org.name  = 'ACME'
+        end
+      end
+
+      describe "#show" do
+
+        it "show an environment based on Katello org, env and CV label" do
+          # id => show means id is not really used
+          get :show, { :id => "show", :org => 'ACME', :env => 'Dev', :content_view => 'CV1' }, set_session_user
+          assert_response :success
+          response_env = JSON.parse(response.body)["environment"]
+          response_env["id"].must_equal environment.id
+        end
+
+      end
+
+
+      describe "#create" do
+
+        it "creates an environment based on Katello org and env" do
+          # id => show means id is not really used
+          post :create, { :org => 'ACME', :env => 'Dev', :content_view_id => 'env'}, set_session_user
+          assert_response :success
+          response_env = JSON.parse(response.body)["environment"]
+          env = ::Environment.find(response_env["id"])
+          env.name.must_equal "KT_ACME_Dev_env"
+          env.katello_id.must_equal "ACME/Dev"
+        end
+
+        it "assigns the environment to org when org_id provided" do
+          # id => show means id is not really used
+          create_params = {
+            :org => 'ACME',
+            :env => 'Dev',
+            :content_view_id => 'env',
+            :org_id => organization.id
+          }
+          post :create, create_params, set_session_user
+          assert_response :success
+          response_env = JSON.parse(response.body)["environment"]
+          env = ::Environment.find(response_env["id"])
+          env.name.must_equal "KT_ACME_Dev_env"
+          env.katello_id.must_equal "ACME/Dev"
+          env.organizations.must_include organization
+        end
+
+        it "creates an environment based on Katello org, env and CV label" do
+          post :create, { :org => 'ACME', :env => 'Dev', :content_view => 'CV2', :content_view_id => 2 }, set_session_user
+          assert_response :success
+          response_env = JSON.parse(response.body)["environment"]
+          env = ::Environment.find(response_env["id"])
+          env.name.must_equal "KT_ACME_Dev_CV2_2"
+          env.katello_id.must_equal "ACME/Dev/CV2"
+        end
+
+        it "requires env to be set" do
+          post :create, { :org => 'ACME'}, set_session_user
+          assert_response 422
+        end
+
+        it "requires org to be set" do
+          post :create, {}, set_session_user
+          assert_response 422
+        end
+
+        it "refused to create the same env twice" do
+          post :create, { :org => 'ACME', :env => 'Dev', :content_view => 'CV1', :content_view_id => 2 }, set_session_user
+          assert_response 409
+        end
+
+      end
+
+    end
+  end
+end

data/test/lib/bindings_test.rb

@@ -4,14 +4,14 @@ require 'mocha/setup'
 class BindingsTest < ActiveSupport::TestCase
 
   def setup
-    Foreman::DefaultSettings::Loader.load
-    ForemanKatelloEngine::Settings.initialize_settings
+    Setting::Auth.load_defaults
+    Setting::Katello.load_defaults
   end
 
   test 'client lib setting' do
-    Setting['katello_url'] = 'https://example.com/katello'
-    Setting['oauth_consumer_key'] = 'key'
-    Setting['oauth_consumer_secret'] = 'secret'
+    Setting::Katello['katello_url'] = 'https://example.com/katello'
+    Setting::Auth['oauth_consumer_key'] = 'key'
+    Setting::Auth['oauth_consumer_secret'] = 'secret'
     config = ForemanKatelloEngine::Bindings.environment.config
     assert_equal 'https://example.com/katello', config[:base_url]
     assert_equal 'key', config[:oauth][:consumer_key]

data/test/lib/settings_test.rb

@@ -2,12 +2,9 @@ require 'test_helper'
 
 class SettingsTest < ActiveSupport::TestCase
 
-  def setup
-    #Setting.where(:name => 'katello_url').delete_all
-  end
-
   test "katello specific settings" do
-    ForemanKatelloEngine::Settings.initialize_settings
-    assert_equal 'https://localhost/katello', Setting['katello_url']
+    Setting::Katello.load_defaults
+    assert_equal 'https://localhost/katello', Setting::Katello['katello_url']
   end
+
 end

data/test/test_helper.rb

@@ -5,6 +5,7 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.join("foreman_app/config/environment.rb")
 
 require 'test/unit'
+require 'minitest/spec'
 require 'foreman-katello-engine'
 require 'rails/test_help'
 
@@ -26,3 +27,12 @@ end
 def set_session_user
   SETTINGS[:login] ? {:user => User.admin.id, :expires_at => 5.minutes.from_now} : {}
 end
+
+def setup_users
+  User.current = users :admin
+  user = User.find_by_login("one")
+  @request.session[:user] = user.id
+  @request.session[:expires_at] = 5.minutes.from_now
+  user.roles = [Role.find_by_name('Anonymous'), Role.find_by_name('Viewer')]
+  user.save!
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-katello-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -55,18 +55,22 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/activation_keys_controller.rb
+- app/controllers/foreman_katello_engine/activation_keys_controller.rb
+- app/controllers/foreman_katello_engine/api/environments_controller.rb
 - app/helpers/foreman_katello_engine/hosts_and_hostgroups_helper.rb
 - app/helpers/foreman_katello_engine/katello_urls_helper.rb
-- app/models/activation_key.rb
+- app/models/foreman_katello_engine/environment.rb
+- app/models/setting/katello.rb
 - app/overrides/add_activation_keys_input.rb
-- app/views/activation_keys/_host_tab.html.erb
-- app/views/activation_keys/_host_tab_pane.html.erb
+- app/views/foreman_katello_engine/activation_keys/_host_environment_select.html.erb
+- app/views/foreman_katello_engine/activation_keys/_host_tab.html.erb
+- app/views/foreman_katello_engine/activation_keys/_host_tab_pane.html.erb
 - app/views/unattended/kickstart-katello.erb
 - app/views/unattended/snippets/_katello_registration.erb
 - config/routes.rb
 - db/migrate/20130416152224_add_katello_templates.rb
 - db/migrate/20130418105901_add_katello_ptables.rb
+- db/migrate/20130419110332_update_environments_add_katello_id.rb
 - foreman-katello-engine.gemspec
 - lib/foreman-katello-engine.rb
 - lib/foreman_katello_engine.rb
@@ -76,6 +80,7 @@ files:
 - lib/foreman_katello_engine/settings.rb
 - script/rails
 - test/functional/activation_keys_controller_test.rb
+- test/functional/api/environments_controller_test.rb
 - test/lib/bindings_test.rb
 - test/lib/settings_test.rb
 - test/test_helper.rb

data/app/controllers/activation_keys_controller.rb

@@ -1,12 +0,0 @@
-class ActivationKeysController < ApplicationController
-  def index
-    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/models/activation_key.rb

@@ -1,5 +0,0 @@
-class ActivationKey
-  def self.complete_for(params)
-    ["key_one", "key_two", "key_three"]
-  end
-end

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

@@ -1,3 +0,0 @@
-<li>
-  <a href="#katello" data-toggle="tab">Katello</a>
-</li>