Merge pull request #16638 from lpichler/consider_cloud_volumes_as_dat…

…astorages

Consider cloud volumes as data storages in chargeback

app/models/chargeback_rate.rb

@@ -28,6 +28,12 @@ class ChargebackRate < ApplicationRecord
   scope :with_rate_type, ->(rate_type) { where(:rate_type => rate_type) }
 
   VALID_CB_RATE_TYPES = ["Compute", "Storage"]
+  DATASTORE_MAPPING   = {'CloudVolume' => 'Storage'}.freeze
+
+  def self.tag_class(klass)
+    klass = ChargebackRate::DATASTORE_MAPPING[klass] || klass
+    super(klass)
+  end
 
   def rate_details_relevant_to(report_cols)
     # we can memoize, as we get the same report_cols thrrough the life of the object

app/models/metric/chargeback_helper.rb

@@ -32,10 +32,9 @@ def tag_list_with_prefix
   def resource_parents
     [parent_host || resource.try(:host),
      parent_ems_cluster || resource.try(:ems_cluster),
-     parent_storage || resource.try(:storage),
+     parent_storage || resource.try(:storage) || resource.try(:cloud_volumes),
      parent_ems || resource.try(:ext_management_system),
-     resource.try(:tenant)
-    ].compact
+     resource.try(:tenant)].flatten.compact
   end
 
   def parents_determining_rate

app/models/mixins/assignment_mixin.rb

@@ -173,6 +173,10 @@ def assignments
         end
     end
 
+    def tag_class(klass)
+      klass == "VmOrTemplate" ? "vm" : klass.underscore
+    end
+
     # @param target
     # @option options :parents
     # @option options :tag_list
@@ -196,9 +200,7 @@ def get_assigned_for_target(target, options = {})
       tlist = Tagging.where("tags.name like '/managed/%'")
                      .where(:taggable => parents)
                      .references(:tag).includes(:tag).map do |t|
-        klass = t.taggable_type
-        lower_klass = klass == "VmOrTemplate" ? "vm" : klass.underscore
-        "#{lower_klass}/tag#{t.tag.name}"
+        "#{tag_class(t.taggable_type)}/tag#{t.tag.name}"
       end
       tagged_resources = tlist.flat_map { |t| assignments_cached[t] }.uniq
       (individually_assigned_resources + tagged_resources).uniq

spec/models/mixins/assignment_mixin_spec.rb

@@ -2,6 +2,27 @@
   # too ingrained in AR - has many, acts_as_miq_taggable, ...
   let(:test_class) { MiqAlertSet }
 
+  describe '#get_assigned_for_target' do
+    context 'searching for ChargebackRate' do
+      let(:test_class) { ChargebackRate }
+      let(:vm)              { FactoryGirl.create(:vm_openstack) }
+      let(:hardware)        { FactoryGirl.create(:hardware, :vm_or_template_id => vm.id) }
+      let(:cloud_volume)    { FactoryGirl.create(:cloud_volume, :hardwares => [hardware]) }
+      let(:chargeback_rate) { FactoryGirl.create(:chargeback_rate, :rate_type => 'Storage') }
+
+      before do
+        ct1 = ctag("environment", "test1")
+        chargeback_rate.assign_to_tags([ct1], "storage")
+        cloud_volume.tag_add('environment/test1', :ns => '/managed')
+      end
+
+      it 'returns rates based on tagged cloud volume' do
+        result = test_class.get_assigned_for_target(vm, :parents => [cloud_volume])
+        expect(result).to match_array([chargeback_rate])
+      end
+    end
+  end
+
   describe '#assignments' do
     it "finds no assignments" do
       expect(test_class.assignments).to eq({})