Charm Helpers

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

trunk
Merge into devel

Proposed by Shiv Prasad Rao on 2014-09-11

Status:	Merged
Merge reported by:	Jorge Niedbalski
Merged at revision:	not available
Proposed branch:	lp://qastaging/~springfield-team/charm-helpers/trunk
Merge into:	lp://qastaging/charm-helpers
Diff against target:	38 lines (+7/-2) 2 files modified charmhelpers/contrib/openstack/context.py (+5/-1) charmhelpers/contrib/openstack/neutron.py (+2/-1)
To merge this branch:	bzr merge lp://qastaging/~springfield-team/charm-helpers/trunk
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Jorge Niedbalski (community)	2014-09-11	Approve on 2014-11-05
Hua Zhang (community)		Approve on 2014-09-17
charmers	2014-11-05	Pending
Review via email: mp+234402@code.qastaging.launchpad.net

Description of the change

Additional changes for n1kv

Revision history for this message

Hua Zhang (zhhuabj) wrote on 2014-09-17:

looks good, ship it.

review: Approve

Revision history for this message

Jorge Niedbalski (niedbalski) wrote on 2014-09-17:

Looks good to me.

review: Approve

lp://qastaging/~springfield-team/charm-helpers/trunk updated on 2014-09-17

205. By Shiv Prasad Rao on 2014-09-17: bug fix

Revision history for this message

Jorge Niedbalski (niedbalski) wrote on 2014-11-05:

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'}