Merge lp:~ivoks/charms/precise/quantum-gateway/cert-decode into lp:~charmers/charms/precise/quantum-gateway/trunk

[Ante Karamatić]

Quantum gateway doesn't decode certificate from relation. This branch fixes that problem.

[James Page (james-page)]

Change looks OK

Please can you update the units tests as well:

jamespage@armstrong[ubuntu]:~/src/charms/landing/quantum-gateway$ make test
Starting tests...
...................................F...........................
======================================================================
FAIL: test_nm_changed (unit_tests.test_quantum_hooks.TestQuantumHooks)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/jamespage/src/charms/landing/quantum-gateway/unit_tests/test_quantum_hooks.py", line 143, in test_nm_changed
    self.install_ca_cert.assert_called_with('cert')
  File "/usr/lib/python2.7/dist-packages/mock.py", line 835, in assert_called_with
    raise AssertionError(msg)
AssertionError: Expected call: install_ca_cert('cert')
Actual call: install_ca_cert('q\xea\xed')

Name Stmts Miss Cover Missing
------------------------------------------------------
hooks/quantum_contexts 92 3 97% 168-170
hooks/quantum_hooks 64 0 100%
hooks/quantum_utils 160 0 100%
------------------------------------------------------
TOTAL 316 3 99%
----------------------------------------------------------------------
Ran 63 tests in 0.856s

FAILED (failures=1)
make: *** [test] Error 1

I'd use the passthrough approach used in the dashboard change to cover this.

review: Needs Fixing

[lp:~ivoks/charms/precise/quantum-gateway/cert-decode]

43. By Ante Karamatić on 2014-02-04

Fix tests for cert

44. By Ante Karamatić on 2014-02-04

Add missing newline

[Ante Karamatić (ivoks)]

review: Needs Resubmitting

[James Page (james-page)]

review: Approve

=== modified file 'hooks/quantum_hooks.py'
--- hooks/quantum_hooks.py	2013-11-28 13:12:39 +0000
+++ hooks/quantum_hooks.py	2014-02-04 11:54:39 +0000
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 
+from base64 import b64decode
+
 from charmhelpers.core.hookenv import (
     log, ERROR, WARNING,
     config,
@@ -125,7 +127,8 @@
 def nm_changed():
     CONFIGS.write_all()
     if relation_get('ca_cert'):
-        install_ca_cert(relation_get('ca_cert'))
+        ca_crt = b64decode(relation_get('ca_cert'))
+        install_ca_cert(ca_crt)
 
 
 @hooks.hook("cluster-relation-departed")

=== modified file 'revision'
--- revision	2013-11-28 13:12:39 +0000
+++ revision	2014-02-04 11:54:39 +0000
@@ -1,1 +1,1 @@
-59
+60

=== modified file 'unit_tests/test_quantum_hooks.py'
--- unit_tests/test_quantum_hooks.py	2013-11-28 13:12:39 +0000
+++ unit_tests/test_quantum_hooks.py	2014-02-04 11:54:39 +0000
@@ -36,9 +36,14 @@
     'execd_preinstall',
     'lsb_release',
     'stop_services',
+    'b64decode',
 ]
 
 
+def passthrough(value):
+    return value
+
+
 class TestQuantumHooks(CharmTestCase):
 
     def setUp(self):
@@ -47,6 +52,7 @@
         self.test_config.set('openstack-origin', 'cloud:precise-havana')
         self.test_config.set('plugin', 'ovs')
         self.lsb_release.return_value = {'DISTRIB_CODENAME': 'precise'}
+        self.b64decode.side_effect = passthrough
 
     def _call_hook(self, hookname):
         hooks.hooks.execute([