Merge pull request #16704 from imtayadeway/bug/miq-expression-model-n…

…amespaces Parse models of > 3 namespaces
ManageIQ · Dec 20, 2017 · faeac8b · faeac8b
2 parents 2b27e62 + e0fa9a8
commit faeac8b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/lib/miq_expression/tag.rb b/lib/miq_expression/tag.rb
@@ -1,6 +1,6 @@
 class MiqExpression::Tag < MiqExpression::Target
   REGEX = /
-(?<model_name>([[:alnum:]]*(::)?){4})
+(?<model_name>(?:[[:upper:]][[:alnum:]]*(?:::[[:upper:]][[:alnum:]]*)*)?)
 \.?(?<associations>([a-z_]+\.)*)
 (?<namespace>\bmanaged|user_tag\b)
 -(?<column>[a-z]+[_[:alnum:]]+)

diff --git a/spec/lib/miq_expression/tag_spec.rb b/spec/lib/miq_expression/tag_spec.rb
@@ -36,21 +36,21 @@
     end
 
     it "with model.associations.managed-in_tag" do
-      tag = "service.user.managed-service_level"
+      tag = "Service.user.managed-service_level"
       expect(described_class.parse(tag)).to have_attributes(:model        => Service,
                                                             :associations => ['user'],
                                                             :namespace    => "/managed/service_level")
     end
 
     it "with model.associations.user_tag-in_tag" do
-      tag = "service.user.user_tag-service_level"
+      tag = "Service.user.user_tag-service_level"
       expect(described_class.parse(tag)).to have_attributes(:model        => Service,
                                                             :associations => ['user'],
                                                             :namespace    => "/user/service_level")
     end
 
     it "with invalid case model.associations.managed-in_tag" do
-      tag = "service.user.mXaXnXaXged-service_level"
+      tag = "Service.user.mXaXnXaXged-service_level"
       expect(described_class.parse(tag)).to be_nil
     end
 
@@ -72,9 +72,18 @@
     end
 
     it "returns nil with invalid case parent-model::model::somethingmanaged-se" do
-      tag = "ManageIQ::Providers::CloudManagermanaged-se'"
+      tag = "ManageIQ::Providers::CloudManagermanaged-se"
       expect(described_class.parse(tag)).to be_nil
     end
+
+    it "can parse models in deeply nested namespaces" do
+      tag = "ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem.managed-cc"
+
+      expected = {
+        :model => ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem
+      }
+      expect(described_class.parse(tag)).to have_attributes(expected)
+    end
   end
 
   describe "#to_s" do