Merge pull request #3697 from AlexanderZagaynov/BZ-1493041

Azure labeling and tagging support (cherry picked from commit 9945ede) https://bugzilla.redhat.com/show_bug.cgi?id=1493041
ManageIQ · Apr 23, 2018 · c8855c0 · c8855c0
1 parent 6354747
commit c8855c0
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/app/controllers/ops_controller/settings/label_tag_mapping.rb b/app/controllers/ops_controller/settings/label_tag_mapping.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OpsController::Settings::LabelTagMapping
   extend ActiveSupport::Concern
 
@@ -13,6 +15,7 @@ module OpsController::Settings::LabelTagMapping
   MAPPABLE_ENTITIES = {
     nil                   => nil, # map all entities
     "Vm"                  => "Amazon",
+    "VmAzure"             => "Azure",
     "Image"               => "Amazon",
     "ContainerProject"    => "Kubernetes",
     "ContainerRoute"      => "Kubernetes",
@@ -81,7 +84,7 @@ def entity_ui_name_or_all(entity)
     if entity
       provider = MAPPABLE_ENTITIES[entity]
       model = case entity
-              when 'Vm'
+              when 'Vm', 'VmAzure'
                 "ManageIQ::Providers::#{provider}::CloudManager::Vm"
               when 'Image'
                 "ManageIQ::Providers::#{provider}::CloudManager::Template"
@@ -174,8 +177,8 @@ def label_tag_mapping_add(entity, label_name, cat_description)
       provider = ALL_PREFIX
       entity_str = ''
     else
-      provider = MAPPABLE_ENTITIES[entity].downcase
-      entity_str = entity.underscore
+      provider = MAPPABLE_ENTITIES[entity].downcase.inquiry
+      entity_str = (provider.azure? && entity.sub(/Azure$/, '') || entity).underscore
     end
 
     cat_name = "#{provider}:#{entity_str}:" + Classification.sanitize_name(label_name.tr("/", ":"))
@@ -194,8 +197,9 @@ def label_tag_mapping_add(entity, label_name, cat_description)
                                                    :description  => cat_description,
                                                    :single_value => true,
                                                    :read_only    => true)
-        ContainerLabelTagMapping.create!(:labeled_resource_type => entity, :label_name => label_name,
-                                         :tag => category.tag)
+        ContainerLabelTagMapping.create!(:labeled_resource_type => entity,
+                                         :label_name            => label_name,
+                                         :tag                   => category.tag)
       end
     rescue StandardError => bang
       add_flash(_("Error during 'add': %{message}") % {:message => bang.message}, :error)