Merge lp:~thedac/charm-helpers/dnsha into lp:charm-helpers

[David Ames]

Make OS Apparmor context keys usable in templates

Change '-' to '_' to allow Apparmor context keys to be usable in templates.

Make OS Apparmor context keys usable in templates

Change '-' to '_' to allow Apparmor context keys to be usable in templates.

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2016-05-25 12:22:42 +0000
+++ charmhelpers/contrib/openstack/context.py	2016-06-30 22:32:33 +0000
@@ -1438,7 +1438,7 @@
         :return ctxt: Dictionary of the apparmor profile or None
         """
         if config('aa-profile-mode') in ['disable', 'enforce', 'complain']:
-            ctxt = {'aa-profile-mode': config('aa-profile-mode')}
+            ctxt = {'aa_profile_mode': config('aa-profile-mode')}
         else:
             ctxt = None
         return ctxt
@@ -1482,10 +1482,10 @@
             log("Not enabling apparmor Profile")
             return
         self.install_aa_utils()
-        cmd = ['aa-{}'.format(self.ctxt['aa-profile-mode'])]
-        cmd.append(self.ctxt['aa-profile'])
+        cmd = ['aa-{}'.format(self.ctxt['aa_profile_mode'])]
+        cmd.append(self.ctxt['aa_profile'])
         log("Setting up the apparmor profile for {} in {} mode."
-            "".format(self.ctxt['aa-profile'], self.ctxt['aa-profile-mode']))
+            "".format(self.ctxt['aa_profile'], self.ctxt['aa_profile_mode']))
         try:
             check_call(cmd)
         except CalledProcessError as e:
@@ -1494,12 +1494,12 @@
             # apparmor is yet unaware of the profile and aa-disable aa-profile
             # fails. If aa-disable learns to read profile files first this can
             # be removed.
-            if self.ctxt['aa-profile-mode'] == 'disable':
+            if self.ctxt['aa_profile_mode'] == 'disable':
                 log("Manually disabling the apparmor profile for {}."
-                    "".format(self.ctxt['aa-profile']))
+                    "".format(self.ctxt['aa_profile']))
                 self.manually_disable_aa_profile()
                 return
             status_set('blocked', "Apparmor profile {} failed to be set to {}."
-                                  "".format(self.ctxt['aa-profile'],
-                                            self.ctxt['aa-profile-mode']))
+                                  "".format(self.ctxt['aa_profile'],
+                                            self.ctxt['aa_profile_mode']))
             raise e
 
=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2016-04-04 18:06:59 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2016-06-30 22:32:33 +0000
@@ -95,7 +95,7 @@
         super(FakeAppArmorContext, self).__call__()
         if not self.ctxt:
             return self.ctxt
-        self._ctxt.update({'aa-profile': self.aa_profile})
+        self._ctxt.update({'aa_profile': self.aa_profile})
         return self.ctxt
 
 
@@ -2921,7 +2921,7 @@
         # Test complain mode
         self.config.return_value = 'complain'
         self.assertEquals(mock_aa_object.__call__(),
-                          {'aa-profile-mode': 'complain'})
+                          {'aa_profile_mode': 'complain'})
 
     def test_apparmor_context_call_enforce(self):
         ''' Tests for the apparmor context'''
@@ -2929,7 +2929,7 @@
         # Test enforce mode
         self.config.return_value = 'enforce'
         self.assertEquals(mock_aa_object.__call__(),
-                          {'aa-profile-mode': 'enforce'})
+                          {'aa_profile_mode': 'enforce'})
 
     def test_apparmor_context_call_disable(self):
         ''' Tests for the apparmor context'''
@@ -2937,7 +2937,7 @@
         # Test complain mode
         self.config.return_value = 'disable'
         self.assertEquals(mock_aa_object.__call__(),
-                          {'aa-profile-mode': 'disable'})
+                          {'aa_profile_mode': 'disable'})
 
     def test_apparmor_setup_complain(self):
         ''' Tests for the apparmor setup'''