Juju Charms Collection
quantum-gateway package

Merge lp://qastaging/~springfield-team/charms/trusty/quantum-gateway/n1kv into lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next

Trusty Tahr (14.04)
n1kv
Merge into next

Proposed by Shiv Prasad Rao on 2014-08-21

Status:	Merged
Merged at revision:	74
Proposed branch:	lp://qastaging/~springfield-team/charms/trusty/quantum-gateway/n1kv
Merge into:	lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next
Diff against target:	278 lines (+92/-8) 7 files modified config.yaml (+7/-0) hooks/quantum_contexts.py (+8/-1) hooks/quantum_hooks.py (+16/-0) hooks/quantum_utils.py (+36/-2) templates/havana/dhcp_agent.ini (+11/-1) templates/havana/l3_agent.ini (+8/-1) unit_tests/test_quantum_contexts.py (+6/-3)
To merge this branch:	bzr merge lp://qastaging/~springfield-team/charms/trusty/quantum-gateway/n1kv
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
James Page	2014-08-27	Approve on 2014-11-19
Shiv Prasad Rao (community)		Needs Resubmitting on 2014-10-08
Hua Zhang (community)		Approve on 2014-09-24
Jorge Niedbalski (community)	2014-08-21	Approve on 2014-08-26
Edward Hope-Morley		Pending
OpenStack Charmers	2014-11-05	Pending
Review via email: mp+231648@code.qastaging.launchpad.net

Description of the change

config.yaml
plugin: new value 'n1kv' to facilitate n1kv specific logic in the charm code
l3-agent: use Linux router for L3 routing service on gateway for N1KV deployment networking.
hooks/quantum_contexts.py
- N1KV python plugin code location and corresponding look-up strings

hooks/quantum_hooks.py:
- N1KV related logic for start/stop neutron-l3-agent
- Error handling like the rest of L2 switch does

hooks/quantum_utils.py
- N1KV context in par with NVP and OVS
- software packages for Quantum gateway with N1KV plugin

templates/havana/cisco_plugins.ini
- Cisco N1KV plugin related parameters. We use generic one across nova-compute and quantum-gateway

templates/havana/dhcp_agent.ini
- Cisco N1KV plugin dnsmasq specific parameters

templates/havana/l3_agent.ini
- Cisco N1KV router specific parameters

Please have a look at the old merge proposal for context:
https://code.launchpad.net/~springfield-team/charms/precise/quantum-gateway/trunk/+merge/227723

Revision history for this message

Jorge Niedbalski (niedbalski) wrote on 2014-08-26:

I reviewed this changes, and looks good to me. All the tests are passing and no lint
errors have been found.

LGTM +1

review: Approve

Revision history for this message

Jorge Niedbalski (niedbalski) wrote on 2014-08-27:

Subscribing openstack-charmers for review.

Revision history for this message

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

looks good to me

review: Approve

Revision history for this message

James Page (james-page) on 2014-10-06:

review: Needs Fixing

Revision history for this message

Shiv Prasad Rao (shivrao) wrote on 2014-10-08:

Addressed review comments

review: Needs Resubmitting

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2014-10-17:

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#460 quantum-gateway-next for shivrao mp231648
charm_unit_test

This build:
http://10.98.191.181:8080/job/charm_unit_test/460/

MP URL:
https://code.launchpad.net/~springfield-team/charms/trusty/quantum-gateway/next/+merge/231648

Proposed branch:
lp:~springfield-team/charms/trusty/quantum-gateway/next

Results summary:
UNIT OK: believed to pass, but you should confirm results

UNIT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.460:
Starting unit tests...
............................................................................
Name Stmts Miss Cover Missing
------------------------------------------------------
hooks/quantum_contexts 114 3 97% 191-193
hooks/quantum_hooks 107 8 93% 99-105, 201-203
hooks/quantum_utils 201 1 99% 385
------------------------------------------------------
TOTAL 422 12 97%
----------------------------------------------------------------------
Ran 76 tests in 2.912s

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2014-10-17:

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#654 quantum-gateway-next for shivrao mp231648
charm_lint_check

This build:
http://10.98.191.181:8080/job/charm_lint_check/654/

MP URL:
https://code.launchpad.net/~springfield-team/charms/trusty/quantum-gateway/next/+merge/231648

Proposed branch:
lp:~springfield-team/charms/trusty/quantum-gateway/next

Results summary:
LINT FAIL: lint-check failed

LINT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.654:
hooks/quantum_hooks.py:21:1: F401 'service_stop' imported but unused
make: *** [lint] Error 1