Juju Charms Collection
neutron-api package

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

Trusty Tahr (14.04)
next
Merge into next

Proposed by Gabriel Samfira on 2015-09-03

Status:	Needs review
Proposed branch:	lp://qastaging/~gabriel-samfira/charms/trusty/neutron-api/next
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target:	61 lines (+15/-0) (has conflicts) 3 files modified hooks/neutron_api_utils.py (+1/-0) templates/kilo/ml2_conf.ini (+6/-0) tests/basic_deployment.py (+8/-0) Text conflict in templates/kilo/ml2_conf.ini Text conflict in tests/basic_deployment.py
To merge this branch:	bzr merge lp://qastaging/~gabriel-samfira/charms/trusty/neutron-api/next
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Ryan Beisner (community)		Needs Fixing on 2015-09-04
OpenStack Charmers	2015-09-03	Pending
Review via email: mp+270036@code.qastaging.launchpad.net

Description of the change

This adds the decomposed Hyper-V mechanism driver for Kilo. This will allow us to deploy the nova-hyperv charm with kilo.

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-03:

charm_lint_check #9320 neutron-api-next for gabriel-samfira mp270036
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-03:

charm_unit_test #8618 neutron-api-next for gabriel-samfira mp270036
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-04:

charm_amulet_test #6233 neutron-api-next for gabriel-samfira mp270036
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/12270133/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6233/

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2015-09-04:

Thank you for your work in this proposal. While I'll defer to a colleague for a review of the proposed content changes, I can help advise from the test perspective.

The amulet test will need to be updated in your branch to also expect the hyperv mechanism_driver in the ml2 config file for Trusty-Kilo and later.

Here is the specific failure point:
test_301_ml2_config DEBUG: Checking ml2 config file data...
...
section [ml2] mechanism_drivers:openvswitch,l2population,hyperv != expected mechanism_drivers:openvswitch,l2population
...
juju-test.conductor.017-basic-trusty-kilo DEBUG : Got exit code: 1

Here is an example from another charm test, solving a similar need:
http://bazaar.launchpad.net/~1chb1n/charms/trusty/keystone/amulet-svc-check-race-fix/view/head:/tests/basic_deployment.py#L402

review: Needs Fixing

lp://qastaging/~gabriel-samfira/charms/trusty/neutron-api/next updated on 2015-09-14

138. By Gabriel Samfira on 2015-09-14

fix amulet test

This patch adds hyper-v to kilo, basically mirroring featureset of previous versions. Removed exception for kilo when checking mechanism drivers.

Revision history for this message

Gabriel Samfira (gabriel-samfira) wrote on 2015-09-14:

Hi Ryan,

Sorry for the late reply. This PR adds hyper-v to kilo, basically mirroring the previous versions feature-set. I modified the test and removed the condition that sets a different mechanism driver set for kilo.

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-14:

charm_lint_check #9934 neutron-api-next for gabriel-samfira mp270036
LINT OK: passed

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