Juju Charms Collection
neutron-api package

Merge lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/vpp into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. vpp
  3. Merge into next
Proposed by Liam Young
Status: Merged
Merged at revision: 132
Proposed branch: lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/vpp
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 499 lines (+305/-25)
10 files modified
config.yaml (+6/-0)
hooks/neutron_api_context.py (+60/-0)
hooks/neutron_api_hooks.py (+2/-1)
hooks/neutron_api_utils.py (+34/-22)
metadata.yaml (+3/-0)
templates/icehouse/neutron.conf (+10/-0)
templates/juno/neutron.conf (+6/-0)
templates/kilo/neutron.conf (+10/-0)
unit_tests/test_neutron_api_context.py (+133/-0)
unit_tests/test_neutron_api_utils.py (+41/-2)
To merge this branch: bzr merge lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/vpp
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+263224@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) :
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7923 neutron-api-next for gnuoy mp263224
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12060702/
Build: http://10.245.162.77:8080/job/charm_lint_check/7923/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #7341 neutron-api-next for gnuoy mp263224
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/7341/

Revision history for this message
James Page (james-page) :
review: Needs Fixing
lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/vpp updated
134. By Liam Young

Fix kilo template ordering

135. By Liam Young

Fix lint and remove pointless comment from template

Revision history for this message
James Page (james-page) :
review: Approve
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5764 neutron-api-next for gnuoy mp263224
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12060783/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5764/

lp://qastaging/~openstack-charmers/charms/trusty/neutron-api/vpp updated
136. By Liam Young

Fix unit test

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7924 neutron-api-next for gnuoy mp263224
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7924/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #7342 neutron-api-next for gnuoy mp263224
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/7342/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5765 neutron-api-next for gnuoy mp263224
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12060903/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5765/

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