foreman_content 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76fd79ca9fac589c6e62a1a0ec2ba6c9df2ac608
-  data.tar.gz: 34734b08623ad025a96fa107974143e5678c80e2
+  metadata.gz: 81d2b11da956bb0d25160db53a69e130cd4d6d93
+  data.tar.gz: b7ea75653438011efd63b158822f68f6769f6965
 SHA512:
-  metadata.gz: 1bb2945c7a124cc7ebd769ff32f2181f9f617f44efc283b5536b8e409feb738afe3defc05ae2a4d8de6aedbf778695ee5dd71707c6b00914b173f0206db1bb44
-  data.tar.gz: 86d1ef1b4b71b460f5af210bac3523e6d61323ab7b3a41a34263abc1de637081c020866386e39c4cc15681bf46451654bc1627a8965325fab680931ba21cf96d
+  metadata.gz: 651ee332a371f5aab119b72c3d684372e028815fc91ed6fc407e39eda537a525771ec8b84e82b8ffd49ac8d3eb67d256b44d9070f8c80f5b8d1e3c988c8ee4a6
+  data.tar.gz: dce982b68ab1038d275a3ded98acca1763611805999aecff410a8f9312a6f4879802520ab99e44c8c565600791374cfc02583e2f55bb32fa42eab79adee01f3c

data/README.md

@@ -68,7 +68,28 @@ of an Installation media.
 * Product - the product from above.
 * GPG key - not implemented
 
-Once created, the repo would automatically be synced and published.
+Once created, the repo would automatically be synced but not yet visible for
+end users, for that you would need to create a Content View.
+
+## Creating Content Views
+
+Content Views, are a collection of immutibal repositories, these repositories
+are cloned from the synced repository and allow you to have multiple
+repositories definitions per Operation Systems, Custom yum repos, and
+Hostgroups.
+
+You would first need to create a content view per Product / Operation system.
+
+## Configuring Hostgroups (and hosts) to consume content views
+
+In your hostgroup definiton, you can select the operation system and the custom
+products you are interested in.
+
+next under the content view, you can create a new hostgroup content view, and
+select the releavnt content view you would like to consume within your hostgroup.
+
+You could also define the puppet environment(s) in which the content view is
+used.
 
 ## Consuming Repos within your Kickstart
 
@@ -111,3 +132,21 @@ pulp-admin event listener http create --event-type '*' --url https://foreman.exa
 
 * https://trello.com/b/NtzVcPkD/foreman-backlog
 filter engine spike
+
+# License
+
+foreman_content plugin
+Copyright (c) 2013 Red Hat Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/app/controllers/content/api/repositories_controller.rb

@@ -7,11 +7,9 @@ module Content
 
       # callback event from pulp upon tasks/events finished up
       def events
-        if (repo_id = params['payload'] && params['payload']['repo_id'])
-          repo = Content::Repository.where(:pulp_id => repo_id).first
-        end
-        render_error 'not_found', :status => :not_found and return false if repo.nil?
-        PulpEventHandler.new(repo_id, params)
+        repo_id = params['payload']['repo_id'] if params['payload']
+        render_error 'not_found', :status => :not_found and return false if repo_id.blank?
+        Content::Pulp::EventHandler.new(repo_id, params)
         head :status => 202
       end
 

data/app/controllers/content/content_views_controller.rb

@@ -0,0 +1,48 @@
+module Content
+  class ContentViewsController < ::ApplicationController
+    include Foreman::Controller::AutoCompleteSearch
+    before_filter :find_by_name, :only => %w{show edit update destroy}
+
+    def index
+      @content_views = ContentView.search_for(params[:search], :order => params[:order]).
+          paginate(:page => params[:page])
+      @counter = RepositoryClone.joins(:content_view_repository_clones).group(:content_view_id).count
+
+    end
+
+    def new
+      @hostgroup = Hostgroup.find_by_id(params[:hostgroup]) if params[:hostgroup]
+      @content_view = ContentViewFactory.create_product_content_view(params[:product]) if params[:product]
+      @content_view ||= ContentViewFactory.create_os_content_view(params[:operatingsystem]) if params[:operatingsystem]
+      @content_view ||= ContentViewFactory.create_composite_content_view(params[:content_content_view_factory]) if params[:content_content_view_factory]
+    end
+
+    def create
+      @content_view = ContentView.new(params[:content_content_view])
+      if @content_view.save
+        process_success
+      else
+        process_error
+      end
+    end
+
+    def edit
+    end
+
+    def update
+      if @content_view.update_attributes(params[:content_content_view])
+        process_success
+      else
+        process_error
+      end
+    end
+
+    def destroy
+      if @content_view.destroy
+        process_success
+      else
+        process_error
+      end
+    end
+  end
+end

data/app/controllers/content/products_controller.rb

@@ -6,7 +6,7 @@ module Content
     def index
       @products = Product.search_for(params[:search], :order => params[:order]).
           paginate(:page => params[:page])
-      @counter = Repository.group(:product_id).where(:product_id => @products.map(&:id)).count
+      @counter = Repository::Product.group(:product_id).where(:product_id => @products.map(&:id)).count
     end
 
     def new

data/app/controllers/content/repositories_controller.rb

@@ -5,11 +5,18 @@ module Content
 
     def index
       @repositories = Repository.search_for(params[:search], :order => params[:order]).
-        paginate(:page => params[:page]).includes(:product, :operatingsystems)
+        paginate(:page => params[:page]).includes(:product, :operatingsystem)
     end
 
     def new
-      @repository = Repository.new(:unprotected => true)
+      @repository = case params[:type]
+                    when "operatingsystem"
+                      Repository::OperatingSystem.new(:unprotected => true)
+                    when "product"
+                      Repository::Product.new(:product_id => params[:product_id])
+                    else
+                      not_found
+                    end
     end
 
     def create
@@ -33,10 +40,6 @@ module Content
     end
 
     def show
-      @details = @repository.retrieve_with_details
-      @sync_history = @repository.sync_history
-    rescue
-      redirect_back_or_to(edit_repository_path)
     end
 
     def destroy

data/app/helpers/content/content_views_helper.rb

@@ -0,0 +1,21 @@
+module Content
+  module ContentViewsHelper
+
+    def repositories(view)
+      if view.new_record?
+        view.source_repositories + view.repository_clones
+      else
+        view.repository_clones
+      end
+    end
+
+    def next_or_cancel path, args={}
+      args[:cancel_path] ||= send("#{controller_name}_path")
+      content_tag(:div, :class => "form-actions") do
+        link_to(_("Cancel"), args[:cancel_path], :class => "btn") + " " +
+        submit_tag( _("Next"), :class => "btn btn-primary")
+      end
+    end
+
+  end
+end

data/app/helpers/content/products_helper.rb

@@ -0,0 +1,9 @@
+module Content
+  module ProductsHelper
+
+    def visible? product_id
+      @counter[product_id].to_i == 0
+    end
+
+  end
+end

data/app/helpers/content/repositories_helper.rb

@@ -1,55 +1,9 @@
 module Content
   module RepositoriesHelper
 
-    def sync_status repo
-      status = repo.sync_status
-      status = if status && status.first
-        status.first[:state]
-      else
-        details = repo.retrieve_with_details
-        details[:importers][0][:last_sync] if details && details[:importers] && details[:importers][0]
-      end
-      "#{time_ago_in_words(status)} ago" rescue status
-    rescue
-      '-'
-    end
-
-    def last_publish details
-      return '' unless details[:distributors] && details[:distributors].first && published = details[:distributors].first[:last_publish]
-      "#{time_ago_in_words published} ago" rescue ''
-    end
-
-    def last_sync details
-      return '' unless details[:importers] && details[:importers].first && synced = details[:importers].first[:last_sync]
-      "#{time_ago_in_words synced} ago" rescue ''
-    end
-
-    def sync_history_times history
-      return {} unless history && history.first && summary = history.first['summary']
-      return {} unless summary[:comps]
-      {
-        :comps => summary[:comps][:time_total_sec],
-        :errata => summary[:errata][:errata_time_total_sec],
-        :packages   => summary[:packages][:time_total_sec]
-      }
-    end
-
-    def sync_history_metrics history
-      return {} unless history && last = history.first
-      {
-        :updated => last[:updated_count],
-        :removed => last[:removed_count],
-        :added   => last[:added_count]
-      }
-    end
-
-    def sync_history_status history
-      return {} unless history && last = history.first
-      {
-        'result'    => last[:result],
-        'message'   => last[:error_message] || last['summary']['error'],
-        'completed' => ("#{time_ago_in_words(last[:completed])} ago" rescue '')
-      }
+    def last_time(time)
+      return if time.blank?
+      time_ago_in_words(time) + ' ago'
     end
 
   end

data/app/models/concerns/content/environment_extensions.rb

@@ -2,8 +2,8 @@ module Content::EnvironmentExtensions
   extend ActiveSupport::Concern
 
   included do
-    has_many :environment_products, :dependent => :destroy, :uniq => true, :class_name => 'Content::EnvironmentProduct'
-    has_many :products, :through => :environment_products, :class_name => 'Content::Product'
+    has_many :available_content_views, :dependent => :destroy, :class_name => 'Content::AvailableContentView'
+    has_many :content_views, :through => :available_content_views, :class_name => 'Content::ContentView'
   end
 
 end

data/app/models/concerns/content/home_helper.rb

@@ -11,6 +11,7 @@ module Content::HomeHelper
       [
         [_('Products'), :"content/products"],
         [_('Repositories'), :"content/repositories"],
+        [_('Content Views'), :"content/content_views"],
         [_('Gpg keys'), :"content/gpg_keys"]
     ]
     choices.insert(3, [:divider], [:group, _("Content"), content_group])

data/app/models/concerns/content/host_extensions.rb

@@ -5,6 +5,9 @@ module Content::HostExtensions
     has_many :host_products, :dependent => :destroy, :uniq => true, :foreign_key => :host_id, :class_name => 'Content::HostProduct'
     has_many :products, :through => :host_products, :class_name => 'Content::Product'
 
+    has_many :content_view_hosts, :dependent => :destroy, :uniq => true, :foreign_key => :host_id, :class_name => 'Content::ContentViewHost'
+    has_many :content_views, :through => :content_view_hosts, :class_name => 'Content::ContentView'
+
     scoped_search :in => :products, :on => :name, :complete_value => true, :rename => :product
 
     alias_method_chain :params, :repositories
@@ -30,8 +33,21 @@ module Content::HostExtensions
     (inherited_product_ids + product_ids).uniq
   end
 
+  def inherited_content_view_ids
+    return [] if hostgroup_id.nil? or environment_id.nil?
+
+    Content::ContentView.joins(:available_content_views).
+      where(:content_available_content_views => {:environment_id => environment_id}).
+      where(:originator_type => 'Hostgroup', :originator_id => hostgroup_id).pluck(:id)
+  end
+
+  def all_content_view_ids
+    (inherited_content_view_ids + content_view_ids).uniq
+  end
+
   def attached_repositories
-    Content::Repository.attached_to_host(self)
+    return [] if all_content_view_ids.empty?
+    Content::RepositoryClone.for_content_views(all_content_view_ids)
   end
 
   private

data/app/models/concerns/content/hostgroup_extensions.rb

@@ -4,15 +4,29 @@ module Content::HostgroupExtensions
   included do
     has_many :hostgroup_products, :dependent => :destroy, :uniq => true, :class_name => 'Content::HostgroupProduct'
     has_many :products, :through => :hostgroup_products, :class_name => 'Content::Product'
+    has_many :content_views, :as => :originator, :class_name => 'Content::ContentView'
+
+    scope :has_content_views, joins(:content_views)
 
     scoped_search :in => :products, :on => :name, :complete_value => true, :rename => :product
+    scoped_search :in => :content_views, :on => :name, :complete_value => true, :rename => :content_view
   end
 
   def inherited_product_ids
+    return [] if hostgroup.ancestor_ids.empty?
     Content::HostgroupProduct.where(:hostgroup_id => hostgroup.ancestor_ids).pluck(:product_id)
   end
 
   def all_product_ids
     (inherited_product_ids + product_ids).uniq
   end
+
+  def inherited_content_view_ids
+    return [] if hostgroup.ancestor_ids.empty?
+    Content::ContentView.where(:originator_id => hostgroup.ancestor_ids, :originator_type => 'Hostgroup').pluck(:id)
+  end
+
+  def all_content_views_ids
+    (inherited_content_view_ids + content_view_ids).uniq
+  end
 end

data/app/models/concerns/content/operatingsystem_extensions.rb

@@ -2,11 +2,12 @@ module Content::OperatingsystemExtensions
   extend ActiveSupport::Concern
 
   included do
-    has_many :operatingsystem_repositories, :dependent => :destroy, :uniq => true, :class_name => 'Content::OperatingsystemRepository'
-    has_many :repositories, :through => :operatingsystem_repositories, :class_name => 'Content::Repository'
-    has_many :product_operatingsystems, :dependent => :destroy, :uniq => true, :class_name => 'Content::ProductOperatingsystem'
-    has_many :products, :through => :product_operatingsystems, :class_name => 'Content::Product'
-    has_many :default_repositories, :through => :products, :source => :repositories, :class_name => 'Content::Repository'
+    has_many :repositories, :class_name => 'Content::Repository'
+
+    has_many :available_content_views, :dependent => :destroy, :class_name => 'Content::AvailableContentView'
+    has_many :content_views, :as => :originator, :class_name => 'Content::ContentView'
+
+    scope :has_repos, joins(:repositories).uniq
   end
 
 end

data/app/models/concerns/content/orchestration/pulp/clone.rb

@@ -0,0 +1,77 @@
+module Content::Orchestration::Pulp::Clone
+  extend ActiveSupport::Concern
+  include Content::Orchestration::Pulp
+
+  included do
+    after_validation :repository_clone_save unless Rails.env.test?
+    before_destroy :repository_clone_destroy unless Rails.env.test?
+  end
+
+  def last_published
+    read_attribute(:last_published) || repo.last_publish
+  end
+
+  private
+
+  def repository_clone_save
+    return unless (pulp? and errors.empty? and new_record?)
+    queue_pulp_create
+  end
+
+  def queue_pulp_create
+    logger.debug "Scheduling new Pulp Repository"
+    queue.create(:name   => _("Create Pulp Repository for %s") % self, :priority => 10,
+                 :action => [self, :set_pulp_repo])
+    queue.create(:name   => _("Copy Pulp Repository %s") % self, :priority => 20,
+                 :action => [self, :set_copy_pulp_repo])
+    queue.create(:name   => _("Create Event Notifier") % self, :priority => 30,
+                 :action => [self, :set_create_event_notifier])
+    queue.create(:name   => _("Publish Pulp Repository %s") % self, :priority => 40,
+                 :action => [self, :set_publish_pulp_repo])
+  end
+
+  def repository_clone_destroy
+    return unless pulp? and errors.empty?
+    logger.debug _("Scheduling removal of Pulp Repository %s") % name
+    queue.create(:name   => _("Delete Pulp repository for %s") % name, :priority => 50,
+                 :action => [self, :del_pulp_repo])
+  end
+
+  def set_pulp_repo
+    repo.create_with_distributor
+  end
+
+  def set_copy_pulp_repo
+    repo.copy_from(repository.pulp_id)
+  end
+
+  def set_publish_pulp_repo
+    repo.publish
+  end
+
+  def set_create_event_notifier
+    repo.create_event_notifier
+  end
+
+  def del_create_event_notifier; end
+
+  def del_copy_pulp_repo; end
+
+  def del_pulp_repo
+    repo.delete
+  end
+
+  def repo_options
+    {
+      :pulp_id       => pulp_repo_id,
+      :name          => "#{to_label}_clone",
+      :relative_path => relative_path,
+      :content_type  => content_type,
+      :protected     => false,
+    }
+  end
+
+  def repo
+    @repo ||= Content::Pulp::RepositoryClone.new(repo_options)
+  end
+end

data/app/models/concerns/content/orchestration/pulp/sync.rb

@@ -0,0 +1,70 @@
+module Content::Orchestration::Pulp::Sync
+  extend ActiveSupport::Concern
+  include Content::Orchestration::Pulp
+
+  included do
+    after_validation :queue_pulp
+    before_destroy :queue_pulp_destroy unless Rails.env.test?
+  end
+
+  def last_sync
+    read_attribute(:last_sync) || repo.last_sync
+  end
+
+  private
+
+  def queue_pulp
+    return unless pulp? and errors.empty?
+    new_record? ? queue_pulp_create : queue_pulp_update
+  end
+
+  def queue_pulp_create
+    logger.debug "Scheduling new Pulp Repository"
+    queue.create(:name   => _("Create Pulp Repository for %s") % self, :priority => 10,
+                 :action => [self, :set_pulp_repo])
+    queue.create(:name   => _("Sync Pulp Repository %s") % self, :priority => 20,
+                 :action => [self, :set_sync_pulp_repo])
+  end
+
+  def queue_pulp_update
+    # TODO: handle repo updates.
+  end
+
+  def queue_pulp_destroy
+    return unless pulp? and errors.empty?
+    logger.debug _("Scheduling removal of Pulp Repository %s") % name
+    queue.create(:name   => _("Delete Pulp repository for %s") % name, :priority => 50,
+                 :action => [self, :del_pulp_repo])
+  end
+
+  def set_pulp_repo
+    repo.create
+  end
+
+  def del_pulp_repo
+    repo.delete
+  end
+
+  def set_sync_pulp_repo
+    repo.sync
+  end
+
+  def del_sync_pulp_repo
+    repo.cancel_running_sync!
+  end
+
+  def repo_options
+    {
+      :pulp_id       => pulp_repo_id,
+      :name          => to_label,
+      :description   => description,
+      :feed          => feed,
+      :content_type  => content_type,
+      :protected     => unprotected,
+    }
+  end
+
+  def repo
+    @repo ||= Content::Pulp::Repository.new(repo_options)
+  end
+end

data/app/models/concerns/content/orchestration/pulp.rb

@@ -0,0 +1,25 @@
+module Content::Orchestration::Pulp
+  extend ActiveSupport::Concern
+  include ::Orchestration
+
+  included do
+    delegate :sync_status, :sync, :counters, :sync_history, :state, :to => :repo
+  end
+
+  def orchestration_errors?
+    errors.empty?
+  end
+
+  def pulp?
+    @use_pulp ||= Setting.use_pulp
+  end
+
+  def update_cache; nil; end
+  def progress_report_id
+    @progress_report_id ||= Foreman.uuid
+  end
+
+  def pulp_repo_id
+   self.pulp_id ||= Foreman.uuid.gsub("-", '')
+  end
+end

data/app/models/content/available_content_view.rb

@@ -0,0 +1,12 @@
+module Content
+  class AvailableContentView < ActiveRecord::Base
+    belongs_to :environment
+    belongs_to :operatingsystem
+    belongs_to :content_view
+
+    validates_presence_of :content_view_id, :environment_id
+
+    #todo needs to validate that default can't be archived and vice-versa
+
+  end
+end

data/app/models/content/content_view.rb

@@ -0,0 +1,66 @@
+module Content
+  class ContentView < ActiveRecord::Base
+    has_ancestry :orphan_strategy => :rootify
+
+    belongs_to :originator, :polymorphic => true
+    has_many :available_content_views, :dependent => :destroy
+    has_many :environments, :through => :available_content_views
+    delegate :operatingsystems, :to => :available_content_views, :allow_nil => true
+
+    has_many :content_view_hosts, :dependent => :destroy, :uniq => true, :foreign_key => :content_view_id, :class_name => 'Content::ContentViewHost'
+    has_many :hosts, :through => :content_view_hosts
+
+    has_many :content_view_repository_clones, :dependent => :destroy
+    has_many :repository_clones, :through => :content_view_repository_clones, :class_name => 'Content::RepositoryClone'
+    has_many :repositories, :through => :repository_clones
+
+    scope :hostgroups, where(:originator_type => 'Hostgroup')
+    scope :products, where(:originator_type => 'Content::Product')
+    scope :operatingsystem, where(:originator_type => 'Operatingsystem')
+
+    after_save :clone_repos
+    before_destroy :clean_unused_clone_repos
+
+    validates_presence_of :name
+
+    # special relationships needed for search with polymorphic associations
+    belongs_to :search_hostgroups, :class_name => 'Hostgroup', :foreign_key => :originator_id,
+               :conditions => '"content_content_views"."originator_type" = "Hostgroup"'
+    belongs_to :search_operatingsystems, :class_name => 'Operatingsystem', :foreign_key => :originator_id,
+               :conditions => '"content_content_views"."originator_type" = "Operatingsystem"'
+    belongs_to :search_products, :class_name => 'Content::Product', :foreign_key => :originator_id,
+               :conditions => '"content_content_views"."originator_type" = "Content::Product"'
+    scoped_search :on => [:name, :created_at], :complete_value => :true
+    scoped_search :in => :search_products, :on => :name, :rename => :product,
+                  :complete_value => :true, :only_explicit => true
+    scoped_search :in => :search_operatingsystems, :on => :name, :rename => :operatingsystem,
+                  :complete_value => :true, :only_explicit => true
+    scoped_search :in => :search_hostgroups, :on => :label, :complete_value => true,
+                  :rename => :hostgroup, :only_explicit => true
+
+    attr_accessor :source_repositories
+
+    def to_label
+      name || "#{originator.to_label} - #{DateTime.now.strftime("%m/%d/%Y")}".parameterize
+    end
+
+    def clone_repos
+      return unless @source_repositories
+      Repository.where(:id => @source_repositories).each do |repository|
+        repository.publish self
+      end
+    end
+
+    private
+
+    def clean_unused_clone_repos
+      current_repos = Content::ContentViewRepositoryClone.where(:content_view_id => id).pluck(:repository_clone_id)
+      used_repos   = Content::ContentViewRepositoryClone.
+        where(:repository_clone_id => current_repos).
+        where(['content_view_id IS NOT ?', id]).pluck(:repository_clone_id)
+
+      repos_to_delete = current_repos - used_repos
+      Content::RepositoryClone.destroy(repos_to_delete) if repos_to_delete.any?
+    end
+  end
+end

data/app/models/content/content_view_host.rb

@@ -0,0 +1,9 @@
+module Content
+  class ContentViewHost < ActiveRecord::Base
+    belongs_to :host
+    belongs_to :content_view
+
+    validates_presence_of :content_view_id, :host_id
+    validates_uniqueness_of :content_view_id, :scope => :host_id
+  end
+end

data/app/models/content/content_view_repository_clone.rb

@@ -0,0 +1,5 @@
+class Content::ContentViewRepositoryClone < ActiveRecord::Base
+  belongs_to :content_view
+  belongs_to :repository_clone
+  validate :content_view_id, :repository_clone_id, :presence => true
+end

data/app/models/content/host_product.rb

@@ -1,14 +1,3 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 module Content
   class HostProduct < ActiveRecord::Base
     belongs_to :product

data/app/models/content/hostgroup_product.rb

@@ -1,14 +1,3 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 module Content
   class HostgroupProduct < ActiveRecord::Base
     belongs_to :product