Merge lp:~hopem/charms/trusty/neutron-openvswitch/lp1485655 into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 84
Proposed branch: lp:~hopem/charms/trusty/neutron-openvswitch/lp1485655
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next
Diff against target: 39 lines (+9/-1)
3 files modified
charm-helpers-hooks.yaml (+1/-1)
config.yaml (+6/-0)
unit_tests/test_neutron_ovs_context.py (+2/-0)
To merge this branch: bzr merge lp:~hopem/charms/trusty/neutron-openvswitch/lp1485655
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+268266@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote :
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #7649 neutron-openvswitch-next for hopem mp268266
    UNIT OK: passed

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

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

charm_lint_check #8250 neutron-openvswitch-next for hopem mp268266
    LINT OK: passed

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

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

charm_amulet_test #5848 neutron-openvswitch-next for hopem mp268266
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5848/

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

charm_unit_test #7651 neutron-openvswitch-next for hopem mp268266
    UNIT OK: passed

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

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

charm_lint_check #8252 neutron-openvswitch-next for hopem mp268266
    LINT OK: passed

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

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

charm_amulet_test #5850 neutron-openvswitch-next for hopem mp268266
    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/12119519/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5850/

82. By Edward Hope-Morley

[hopem,r=]

Ensure all nics are included when resolving mac addresses
and filter out virtual interfaces.

Closes-Bug: 1485655

83. By Edward Hope-Morley

sync

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

charm_lint_check #8283 neutron-openvswitch-next for hopem mp268266
    LINT OK: passed

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

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

charm_unit_test #7683 neutron-openvswitch-next for hopem mp268266
    UNIT OK: passed

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

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

charm_amulet_test #5871 neutron-openvswitch-next for hopem mp268266
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5871/

84. By Edward Hope-Morley

sync /next

Revision history for this message
Liam Young (gnuoy) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-helpers-hooks.yaml'
2--- charm-helpers-hooks.yaml 2015-07-31 13:11:50 +0000
3+++ charm-helpers-hooks.yaml 2015-08-20 09:19:23 +0000
4@@ -1,4 +1,4 @@
5-branch: lp:charm-helpers
6+branch: lp:~hopem/charm-helpers/allow-list-nics-return-all
7 destination: hooks/charmhelpers
8 include:
9 - core
10
11=== modified file 'config.yaml'
12--- config.yaml 2015-07-10 14:14:36 +0000
13+++ config.yaml 2015-08-20 09:19:23 +0000
14@@ -45,6 +45,12 @@
15 their corresponding bridge. The bridges will allow usage of flat or
16 VLAN network types with Neutron and should match this defined in
17 bridge-mappings.
18+ .
19+ Ports provided can be the name or MAC address of the interface to be
20+ added to the bridge. If MAC addresses are used, you may provide multiple
21+ bridge:mac for the same bridge so as to be able to configure multiple
22+ units. In this case the charm will run through the provided MAC addresses
23+ for each bridge until it finds one it can resolve to an interface name.
24 disable-security-groups:
25 type: boolean
26 default: false
27
28=== modified file 'unit_tests/test_neutron_ovs_context.py'
29--- unit_tests/test_neutron_ovs_context.py 2015-04-16 20:02:01 +0000
30+++ unit_tests/test_neutron_ovs_context.py 2015-08-20 09:19:23 +0000
31@@ -45,6 +45,8 @@
32 {'br-data': 'em1'}
33 )
34
35+ @patch('charmhelpers.contrib.openstack.context.is_phy_iface',
36+ lambda port: True)
37 @patch('charmhelpers.contrib.openstack.context.config')
38 @patch('charmhelpers.contrib.openstack.context.get_nic_hwaddr')
39 @patch('charmhelpers.contrib.openstack.context.list_nics')

Subscribers

People subscribed via source and target branches