Merge branch 'treydock-fix-pool'

lib/puppet/provider/rhsm_pool/subscription_manager.rb

@@ -90,9 +90,9 @@ def self.consumed_pools
         subscription.store(:active, value)
         next
       end
-      m = %r{^\s*System Type:\s*([^:]+)$}.match(line)
+      m = %r{^\s*(System|Entitlement) Type:\s*([^:]+)$}.match(line)
       unless m.nil?
-        value = m[1].strip.to_sym
+        value = m[2].strip.to_sym
         subscription.store(:system_type, value)
         # this is the last item output
         subscription.store(:provider, :subscription_manager)

spec/unit/provider/rhsm_pool/subscription_manager_spec.rb

@@ -36,6 +36,8 @@
 System Type:       Physical
 EOD
 
+entitlement_data = raw_data.sub('System Type','Entitlement Type')
+
 title1 = '1a2b3c4d5e6f1234567890abcdef12345'
 title2 = '1234abc'
 
@@ -60,6 +62,7 @@
   provider: :subscription_manager,
 }
 
+
 provider_class = Puppet::Type.type(:rhsm_pool).provider(:subscrption_manager)
 
 describe provider_class, '#rhsm_pool.provider' do
@@ -173,6 +176,18 @@
     end
   end
 
+  describe 'system_type on RHEL 7.8 as entitlement_type' do
+    it 'prefetches the data' do
+      expect(provider.class).to respond_to(:prefetch)
+    end
+    it 'but returns system_type instead for consistency with legacy' do
+      expect(provider.class).to receive(:subscription_manager).with(
+        'list', '--consumed'
+      ).and_return(entitlement_data)
+      provider.class.prefetch(properties)
+    end
+  end
+
   context 'ensure' do
     it 'exists? should return false when the resource is absent' do
       provider.set(ensure: :absent)