Possible layering for subscription rules

katello-attach-subscription

@@ -1093,11 +1093,15 @@ def vdcupdate()
         puts " DEBUG: System '#{system['name']}' in scope, proceeding with assignment of variables"
       end
       # set the desidered subscription to be associated
+      sub_layer = sub['sub_layer'] || "stop_parsing"
+      if @options[:debug]
+        puts " DEBUG: Sub Layer of this sub entry: #{sub_layer}"
+      end
       if sub.has_key?('sub_parsed')
         if has_derived_sub
-          desired_sub_hash = derived_sub
+          desired_sub_hash = KatelloAttachSubscription::Utils.merge_subs(desired_sub_hash, derived_sub, sub_layer)
         else
-          desired_sub_hash = sub['sub_parsed']
+          desired_sub_hash = KatelloAttachSubscription::Utils.merge_subs(desired_sub_hash, sub['sub_parsed'], sub_layer)
         end
       end
       # if "remove_other" has been set, set the flag
@@ -1121,8 +1125,10 @@ def vdcupdate()
         keep_virt_only = sub['keep_virt_only']
       end
 
-      # if the system is found, stop cyclyng over yaml,
-      break
+      # if the system is found and sub_layer is "stop_parsing", stop cyclyng over yaml
+      if sub_layer == "stop_parsing"
+        break
+      end
 
     end
     if skip_host

lib/katello_attach_subscription/utils.rb

@@ -14,6 +14,19 @@ def self.search_args(search)
         search
       end
     end
+
+    def self.merge_subs(current_sub, sub_to_merge, command)
+      case command
+      when "override"
+        merged_sub = sub_to_merge.dup
+      else
+        if current_sub.nil?
+          merged_sub = sub_to_merge.dup
+        else
+          merged_sub = current_sub.merge(sub_to_merge)
+        end
+      end
+      return merged_sub
+    end
   end
 end
-

test/fixtures/merge_sub_file.yaml

@@ -0,0 +1,109 @@
+subs:
+-
+  hostname: .*
+  type: Hypervisor
+  facts:
+    -
+      name: hypervisor::cluster
+      value: example_cluster
+      matcher: regexp
+  sub:
+    rhel:
+      - name: "Red Hat Enterprise Linux for Virtual Datacenters, Premium"
+      - name: "Red Hat Enterprise Linux for Virtual Datacenters, Standard"
+    els:
+      - name: "Red Hat Enterprise Linux Extended Life Cycle Support (Unlimited Guests)"
+    smartmanagement:
+      - name: "Smart Management for Unlimited Guests"
+  sub_parsed:
+    rhel:
+      - d2e16e6ef52a45b7468f1da56bba1953
+      - e78f5438b48b39bcbdea61b73679449d
+      - a98931d104a7fb8f30450547d97e7ca5
+    els:
+      - 7f9a983a540e00931a69382161bdd265
+    smartmanagement:
+      - 439a7d9b0548adbedcce838e37e84ba1
+-
+  hostname: .*
+  type: Hypervisor
+  sub:
+    rhel:
+      - name: "Red Hat Enterprise Linux for Virtual Datacenters, Premium"
+      - name: "Red Hat Enterprise Linux for Virtual Datacenters, Standard"
+    els:
+      - name: "Red Hat Enterprise Linux Extended Life Cycle Support (Unlimited Guests)"
+    smartmanagement:
+      - name: "Smart Management for Unlimited Guests"
+  sub_parsed:
+    rhel:
+      - d2e16e6ef52a45b7468f1da56bba1953
+      - e78f5438b48b39bcbdea61b73679449d
+      - a98931d104a7fb8f30450547d97e7ca5
+    els:
+      - 7f9a983a540e00931a69382161bdd265
+    smartmanagement:
+      - 439a7d9b0548adbedcce838e37e84ba1
+-
+  hostname: .*
+  type: Physical
+  sub_layer: keep_parsing
+  facts:
+    -
+      name: distribution::name
+      value: Server
+      matcher: regexp
+  sub:
+    rhel:
+      - name: "Red Hat Enterprise Linux Server, Standard (Physical or Virtual Nodes)"
+      - name: "Red Hat Enterprise Linux Server, Premium (Physical or Virtual Nodes)"
+    smartmanagement:
+      - name: "Smart Management"
+  sub_parsed:
+    rhel:
+      - b1a5d251fa4fe598cb947ffc42b9cbed
+      - 1337d38747e659ed836548ae6cda7cc2
+    smartmanagement:
+      - f180623caa42379bc4518d06c9c9be05
+-
+  hostname: .*
+  type: Physical
+  sub_layer: keep_parsing
+  facts:
+    -
+      name: distribution::name
+      value: Server
+      matcher: regexp
+    -
+      name: distribution::version
+      value: <6.0
+      matcher: version
+  sub:
+    els:
+      - name: "Red Hat Enterprise Linux Extended Life Cycle Support (Physical or Virtual Nodes)"
+  sub_parsed:
+    els:
+      - 523af537946b79c4f8369ed39ba78605
+-
+  hostname: .*
+  type: Physical
+  sub_layer: override
+  facts:
+    -
+      name: distribution::name
+      value: Client|Workstation
+      matcher: regexp
+  sub:
+    rhel:
+      - name: "Red Hat Enterprise Linux Server for HPC Compute Node, Self-support (1-2 sockets) (Up to 1 guest)"
+    smartmanagement:
+      - name: "Smart Management for Red Hat Enterprise Linux Server for HPC Compute Node (Up to 1 guest)"
+  sub_parsed:
+    rhel:
+      - bb98d4e9c281b175ea84c517b59308ea
+    smartmanagement:
+      - af03af10d57b7b17f26a0130562d6b6e
+-
+  hostname: .*
+  type: Guest
+  auto_attach: true

test/sub_merger_test.rb

@@ -0,0 +1,141 @@
+require "test_helper"
+
+class SubMergerTest < Minitest::Test
+
+  DUMMY_KEEP_PARSE = {
+    "type" => "Physical",
+    "name" => "physical_example",
+    "facts" => {
+      "distribution::name" => "Red Hat Server",
+      "distribution::version" => "6.1"
+    }
+
+  }
+
+  DUMMY_KEEP_PARSE_EXPECTED_SUB = {
+    "rhel"=> [
+      "b1a5d251fa4fe598cb947ffc42b9cbed",
+      "1337d38747e659ed836548ae6cda7cc2"
+    ],
+    "smartmanagement"=> [
+      "f180623caa42379bc4518d06c9c9be05"
+    ]
+  }
+
+
+  DUMMY_MERGE = {
+    "type" => "Physical",
+    "name" => "physical_example",
+    "facts" => {
+      "distribution::name" => "Red Hat Server",
+      "distribution::version" => "5.2"
+    }
+  }
+
+  DUMMY_MERGE_EXPECTED_SUB = {
+    "rhel"=> [
+        "b1a5d251fa4fe598cb947ffc42b9cbed",
+        "1337d38747e659ed836548ae6cda7cc2"
+    ],
+    "smartmanagement"=> [
+      "f180623caa42379bc4518d06c9c9be05"
+    ],
+    "els"=> [
+      "523af537946b79c4f8369ed39ba78605"
+    ]
+  }
+
+
+  DUMMY_OVERRIDE = {
+    "type" => "Physical",
+    "name" => "physical_example",
+    "facts" => {
+      "distribution::name" => "Red Hat Client"
+    }
+  }
+
+  DUMMY_OVERRIDE_EXPECTED_SUB = {
+    "rhel"=> [
+      "bb98d4e9c281b175ea84c517b59308ea"
+    ],
+    "smartmanagement"=> [
+      "af03af10d57b7b17f26a0130562d6b6e"
+    ]
+  }
+
+
+  DUMMY_STOP = {
+    "type" => "Hypervisor",
+    "name" => "physical_example",
+    "facts" => {
+      "hypervisor::cluster" => "example_cluster"
+    }
+  }
+
+  DUMMY_STOP_EXPECTED_SUB = {
+    "rhel"=> [
+      "d2e16e6ef52a45b7468f1da56bba1953",
+      "e78f5438b48b39bcbdea61b73679449d",
+      "a98931d104a7fb8f30450547d97e7ca5"
+    ],
+    "els"=> [
+      "7f9a983a540e00931a69382161bdd265"
+    ],
+    "smartmanagement"=> [
+      "439a7d9b0548adbedcce838e37e84ba1"
+    ]
+  }
+
+
+  DUMMY_NORMAL = {
+    "type" => "Hypervisor",
+    "name" => "physical_example",
+    "facts" => {}
+  }
+
+  DUMMY_NORMAL_EXPECTED_SUB = {
+    "rhel"=> [
+      "d2e16e6ef52a45b7468f1da56bba1953",
+      "e78f5438b48b39bcbdea61b73679449d",
+      "a98931d104a7fb8f30450547d97e7ca5"
+    ],
+    "els"=> [
+      "7f9a983a540e00931a69382161bdd265"
+    ],
+    "smartmanagement"=> [
+      "439a7d9b0548adbedcce838e37e84ba1"
+    ]
+  }
+
+
+  def test_normal_parse
+    yaml = read_yaml_fixture("merge_sub_file")
+    parsed_sub = get_sub_for_host(yaml["subs"], DUMMY_NORMAL)
+    assert_equal DUMMY_NORMAL_EXPECTED_SUB, parsed_sub
+  end
+
+  def test_stop_parse
+    yaml = read_yaml_fixture("merge_sub_file")
+    parsed_sub = get_sub_for_host(yaml["subs"], DUMMY_STOP)
+    assert_equal DUMMY_STOP_EXPECTED_SUB, parsed_sub
+  end
+
+  def test_overdrive_parse
+    yaml = read_yaml_fixture("merge_sub_file")
+    parsed_sub = get_sub_for_host(yaml["subs"], DUMMY_OVERRIDE)
+    assert_equal DUMMY_OVERRIDE_EXPECTED_SUB, parsed_sub
+  end
+
+  def test_merge_parse
+    yaml = read_yaml_fixture("merge_sub_file")
+    parsed_sub = get_sub_for_host(yaml["subs"], DUMMY_MERGE)
+    assert_equal DUMMY_MERGE_EXPECTED_SUB, parsed_sub
+  end
+
+  def test_keep_parse
+    yaml = read_yaml_fixture("merge_sub_file")
+    parsed_sub = get_sub_for_host(yaml["subs"], DUMMY_KEEP_PARSE)
+    assert_equal DUMMY_KEEP_PARSE_EXPECTED_SUB, parsed_sub
+  end
+
+end

test/test_helper.rb

@@ -1,8 +1,29 @@
 require 'json'
+require 'yaml'
 require 'katello_attach_subscription'
 require 'minitest/autorun'
 
 def read_json_fixture(file)
   json = File.expand_path(File.join('..', 'fixtures', "#{file}.json"), __FILE__)
   JSON.parse(File.read(json))
 end
+
+def read_yaml_fixture(file)
+  yaml = File.expand_path(File.join('..', 'fixtures', "#{file}.yaml"), __FILE__)
+  YAML.load_file(yaml)
+end
+
+def get_sub_for_host(subs, host)
+  parsed_final = nil
+  subs.each do |single_sub|
+    parsed = single_sub['sub_parsed']
+    if KatelloAttachSubscription::HostMatcher.match_host(host, single_sub)
+      layer_command = single_sub['sub_layer'] || 'stop_parsing'
+      parsed_final = KatelloAttachSubscription::Utils.merge_subs(parsed_final, parsed, layer_command)
+      if layer_command == 'stop_parsing'
+        break
+      end
+    end
+  end
+  return parsed_final
+end