Merge lp:~springfield-team/charm-helpers/trunk into lp:charm-helpers

[Shiv Prasad Rao]

Additional changes for n1kv

[Hua Zhang (zhhuabj)]

looks good, ship it.

review: Approve

[Jorge Niedbalski (niedbalski)]

Looks good to me.

review: Approve

[lp:~springfield-team/charm-helpers/trunk]

205. By Shiv Prasad Rao on 2014-09-17

bug fix

[Jorge Niedbalski (niedbalski)]

OK, i slightly modified the source to complain a failing test.

======================================================================
FAIL: test_neutron_n1kv_plugin_context (tests.contrib.openstack.test_os_contexts.ContextTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1210, in patched
    return func(*args, **keywargs)
  File "/home/niedbalski/src/juju/charms/charm-helpers/tests/contrib/openstack/test_os_contexts.py", line 1506, in test_neutron_n1kv_plugin_context
    }, neutron.n1kv_ctxt())
AssertionError: {'vsm_username': 'n1kv', 'neutron_security_groups': True, 'vsm_ip': 'n1kv', 'res [truncated]... != {'vsm_username': 'n1kv', 'neutron_security_groups': True, 'user_config_flags': { [truncated]...
  {'config': 'some.quantum.driver.class',
   'core_plugin': 'some.quantum.driver.class',
   'local_ip': '10.0.0.1',
   'neutron_plugin': 'n1kv',
   'neutron_security_groups': True,
   'restrict_policy_profiles': 'n1kv',
+ 'user_config_flags': {},
   'vsm_ip': 'n1kv',
   'vsm_password': 'n1kv',
   'vsm_username': 'n1kv'}

Other than that, looks good to me.

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2014-08-06 03:02:27 +0000
+++ charmhelpers/contrib/openstack/context.py	2014-09-17 16:21:39 +0000
@@ -597,6 +597,7 @@
                                           self.network_manager)
         n1kv_config = neutron_plugin_attribute(self.plugin, 'config',
                                                self.network_manager)
+        n1kv_user_config_flags = config('n1kv-config-flags')
         n1kv_ctxt = {
             'core_plugin': driver,
             'neutron_plugin': 'n1kv',
@@ -607,8 +608,11 @@
             'vsm_username': config('n1kv-vsm-username'),
             'vsm_password': config('n1kv-vsm-password'),
             'restrict_policy_profiles': config(
-                'n1kv_restrict_policy_profiles'),
+                'n1kv-restrict-policy-profiles'),
         }
+        if n1kv_user_config_flags:
+            flags = config_flags_parser(n1kv_user_config_flags)
+            n1kv_ctxt['user_config_flags'] = flags
 
         return n1kv_ctxt
 

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2014-06-19 17:10:40 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2014-09-17 16:21:39 +0000
@@ -138,7 +138,8 @@
                                         relation_prefix='neutron',
                                         ssl_dir=NEUTRON_CONF_DIR)],
             'services': [],
-            'packages': [['neutron-plugin-cisco']],
+            'packages': [[headers_package()] + determine_dkms_package(),
+                         ['neutron-plugin-cisco']],
             'server_packages': ['neutron-server',
                                 'neutron-plugin-cisco'],
             'server_services': ['neutron-server']