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

Proposed by Shiv Prasad Rao
Status: Merged
Merged at revision: 165
Proposed branch: lp://qastaging/~springfield-team/charm-helpers/trunk
Merge into: lp://qastaging/charm-helpers
Diff against target: 157 lines (+74/-7)
4 files modified
charmhelpers/contrib/openstack/context.py (+22/-0)
charmhelpers/contrib/openstack/neutron.py (+14/-0)
tests/contrib/openstack/test_neutron_utils.py (+10/-4)
tests/contrib/openstack/test_os_contexts.py (+28/-3)
To merge this branch: bzr merge lp://qastaging/~springfield-team/charm-helpers/trunk
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Approve
OpenStack Charmers Pending
Review via email: mp+223667@code.qastaging.launchpad.net

Description of the change

Changes made to support Cisco N1kv for nova-cloud-controller

charmhelpers/contrib/openstack/context.py
Context for cisco_plugins.ini

charmhelpers/contrib/openstack/neutron.py
neutron_plugin details for Cisco N1kv

To post a comment you must log in.
163. By Liam Young

[jamespage, r=gnuoy] Fixup problem with fstab parsing if tabs are used instead of spaces

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Hello Shiv,

I added a couple of unit tests to provide coverage for the added lines of code. Other than that, the change LGTM +1.

review: Approve
164. By James Page

[corey.bryant,r=james-page] Add helper classes for writing amulet tests in Charms.

NOTE: needs unit tests but deferring for now - Corey will follow up with these.

165. By James Page

[shivrao,r=james-page,r=niedbalski] Add support for n1kv neutron plugin.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches