From e381220ae225720ae3eb8577258d1131add85458 Mon Sep 17 00:00:00 2001 From: lphiri Date: Tue, 24 Mar 2015 08:09:08 -0400 Subject: [PATCH] 6.1z db migration prep --- .../concerns/organization_extensions.rb | 10 ++++++++++ .../models/redhat_access/telemetry_configuration.rb | 12 ++++++++++++ ...create_redhat_access_telemetry_configurations.rb | 13 +++++++++++++ redhat-access/lib/redhat_access/engine.rb | 5 +++++ redhat-access/lib/redhat_access/version.rb | 2 +- redhat-access/rubygem-foreman-redhat_access.spec | 5 ++++- 6 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 redhat-access/app/models/redhat_access/concerns/organization_extensions.rb create mode 100644 redhat-access/app/models/redhat_access/telemetry_configuration.rb create mode 100644 redhat-access/db/migrate/20150319153744_create_redhat_access_telemetry_configurations.rb diff --git a/redhat-access/app/models/redhat_access/concerns/organization_extensions.rb b/redhat-access/app/models/redhat_access/concerns/organization_extensions.rb new file mode 100644 index 0000000..c231beb --- /dev/null +++ b/redhat-access/app/models/redhat_access/concerns/organization_extensions.rb @@ -0,0 +1,10 @@ +module RedhatAccess + module Concerns + module OrganizationExtensions + extend ActiveSupport::Concern + included do + has_one :telemetry_configuration, :class_name => "RedhatAccess::TelemetryConfiguration", :dependent => :destroy + end + end + end +end diff --git a/redhat-access/app/models/redhat_access/telemetry_configuration.rb b/redhat-access/app/models/redhat_access/telemetry_configuration.rb new file mode 100644 index 0000000..22a1410 --- /dev/null +++ b/redhat-access/app/models/redhat_access/telemetry_configuration.rb @@ -0,0 +1,12 @@ +module RedhatAccess + class TelemetryConfiguration < ActiveRecord::Base + include Encryptable + belongs_to :organization ,:class_name => "Organization", :inverse_of => :telemetry_configuration + encrypts :portal_password + attr_accessible :enable_telemetry, :portal_password, :portal_user, :organization_id + + def name + return "TelemetryConfiguration" + end + end +end diff --git a/redhat-access/db/migrate/20150319153744_create_redhat_access_telemetry_configurations.rb b/redhat-access/db/migrate/20150319153744_create_redhat_access_telemetry_configurations.rb new file mode 100644 index 0000000..c9a4c24 --- /dev/null +++ b/redhat-access/db/migrate/20150319153744_create_redhat_access_telemetry_configurations.rb @@ -0,0 +1,13 @@ +class CreateRedhatAccessTelemetryConfigurations < ActiveRecord::Migration + def change + create_table :redhat_access_telemetry_configurations do |t| + t.string :portal_user + t.string :portal_password + t.boolean :enable_telemetry + t.integer :organization_id + + t.timestamps + end + add_index :redhat_access_telemetry_configurations, :organization_id + end +end diff --git a/redhat-access/lib/redhat_access/engine.rb b/redhat-access/lib/redhat_access/engine.rb index 91bd493..48127c1 100644 --- a/redhat-access/lib/redhat_access/engine.rb +++ b/redhat-access/lib/redhat_access/engine.rb @@ -110,5 +110,10 @@ class Engine < ::Rails::Engine end end end + + config.to_prepare do + + ::Organization.send :include, RedhatAccess::Concerns::OrganizationExtensions + end end end diff --git a/redhat-access/lib/redhat_access/version.rb b/redhat-access/lib/redhat_access/version.rb index 620ecde..49157ed 100644 --- a/redhat-access/lib/redhat_access/version.rb +++ b/redhat-access/lib/redhat_access/version.rb @@ -1,3 +1,3 @@ module RedhatAccess - VERSION = "0.0.9" + VERSION = "0.1.0" end diff --git a/redhat-access/rubygem-foreman-redhat_access.spec b/redhat-access/rubygem-foreman-redhat_access.spec index 3665b5a..62633f8 100644 --- a/redhat-access/rubygem-foreman-redhat_access.spec +++ b/redhat-access/rubygem-foreman-redhat_access.spec @@ -15,7 +15,7 @@ %endif Name: %{?scl_prefix}rubygem-foreman-%{gem_name} -Version: 0.0.9 +Version: 0.1.0 Release: 1%{?dist} Summary: Foreman engine to access Red Hat knowledge base Group: Development/Languages @@ -112,6 +112,9 @@ cp -pa .%{rubygem_redhat_access_dir}/config/config.yml.example %{buildroot}/etc/ %changelog +* Mon Mar 23 2015 Lindani Phiri - 0.1.0-1 +- Database prep for z stream for RHAI (BZ 1197764) + * Wed Mar 4 2015 Lindani Phiri - 0.0.9-1 - Resolves : bz1197764