Merge ~hopem/ua-reviewkit:layered-tags into ua-reviewkit:master

[Edward Hope-Morley]

Unmerged commits

941c821... by Edward Hope-Morley on 2020-06-08

Search layer tags

diff --git a/juju/ua-bundle-check.py b/juju/ua-bundle-check.py
index b5475d9..0d54a2f 100755
--- a/juju/ua-bundle-check.py
+++ b/juju/ua-bundle-check.py
@@ -363,6 +363,18 @@ class MasterAssertionHelpers(LocalAssertionHelpers):
         ret.reason = ("check disabled - please check this one manually")
         return ret
         master_value = None
+        
+        used_tags = []
+        if self.maas_layer:
+            tags = self.maas_layer['config'].get('tags')
+            for tag in tags:
+                ret = re.compile(".+-{}".format(tag)).match(app_name)
+                if ret:
+                    used_tags.append(tag)
+                    ret = re.compile(value).match(tags[tag]['kernel_opts'])
+                    if ret and application['options'][opt] != ret[0]:
+                        print(ret[0]) 
+                    break
 
         with open(self.master_path) as fd:
             for line in fd.readlines():
@@ -532,6 +544,7 @@ class UABundleChecker(object):
             # substring.
             result = getattr(self.master_assertion_helpers,
                              method)(application, opt, assertion["value"],
+                                     self.app_name,
                                      warn_on_fail=warn_on_fail)
             self.add_result(result)
             return result.passed