Juju Charms Collection
neutron-api package

Merge lp:~ddellav/charms/trusty/neutron-api/ml2-port-security into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. ml2-port-security
  3. Merge into next
Proposed by David Della Vecchia
Status: Merged
Merged at revision: 156
Proposed branch: lp:~ddellav/charms/trusty/neutron-api/ml2-port-security
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 75 lines (+14/-0)
4 files modified
config.yaml (+4/-0)
hooks/neutron_api_context.py (+2/-0)
templates/kilo/ml2_conf.ini (+4/-0)
unit_tests/test_neutron_api_context.py (+4/-0)
To merge this branch: bzr merge lp:~ddellav/charms/trusty/neutron-api/ml2-port-security
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+276764@code.launchpad.net

Description of the change

Adding ML2 Port Security config option and corresponding template changes.

To post a comment you must log in.
lp:~ddellav/charms/trusty/neutron-api/ml2-port-security updated
161. By David Della Vecchia

emty commit to kick off USCI

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

charm_lint_check #13368 neutron-api-next for ddellav mp276764
    LINT OK: passed

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

lp:~ddellav/charms/trusty/neutron-api/ml2-port-security updated
162. By David Della Vecchia

Fixing config description and dropping icehouse template changes

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

charm_unit_test #12505 neutron-api-next for ddellav mp276764
    UNIT OK: passed

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

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

charm_lint_check #13369 neutron-api-next for ddellav mp276764
    LINT OK: passed

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

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

charm_unit_test #12506 neutron-api-next for ddellav mp276764
    UNIT OK: passed

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

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

charm_amulet_test #7823 neutron-api-next for ddellav mp276764
    AMULET FAIL: amulet-test failed

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

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

FYI, amulet test #7823 failed due to undercloud or tooling issue. Rerunning.

http://paste.ubuntu.com/13209244/

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

charm_amulet_test #7825 neutron-api-next for ddellav mp276764
    AMULET FAIL: amulet-test failed

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

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

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

charm_amulet_test #7822 neutron-api-next for ddellav mp276764
    AMULET OK: passed

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

Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2015-10-27 14:50:30 +0000
3+++ config.yaml 2015-11-09 14:07:04 +0000
4@@ -453,3 +453,7 @@
5 wait for you to execute the openstack-upgrade action for this charm on
6 each unit. If False it will revert to existing behavior of upgrading
7 all units on config change.
8+ enable-ml2-port-security:
9+ type: boolean
10+ default: False
11+ description: Enable port security extension for ML2 plugin (>= kilo).
12
13=== modified file 'hooks/neutron_api_context.py'
14--- hooks/neutron_api_context.py 2015-10-27 14:50:30 +0000
15+++ hooks/neutron_api_context.py 2015-11-09 14:07:04 +0000
16@@ -221,6 +221,8 @@
17 if vlan_ranges:
18 ctxt['vlan_ranges'] = ','.join(vlan_ranges.split())
19
20+ ctxt['enable_ml2_port_security'] = config('enable-ml2-port-security')
21+
22 return ctxt
23
24
25
26=== modified file 'templates/kilo/ml2_conf.ini'
27--- templates/kilo/ml2_conf.ini 2015-09-09 08:37:26 +0000
28+++ templates/kilo/ml2_conf.ini 2015-11-09 14:07:04 +0000
29@@ -4,6 +4,10 @@
30 # Configuration file maintained by Juju. Local changes may be overwritten.
31 ###############################################################################
32 [ml2]
33+{% if enable_ml2_port_security -%}
34+extension_drivers=port_security
35+{% endif -%}
36+
37 {% if neutron_plugin == 'Calico' -%}
38 type_drivers = local,flat
39 mechanism_drivers = calico
40
41=== modified file 'unit_tests/test_neutron_api_context.py'
42--- unit_tests/test_neutron_api_context.py 2015-11-04 18:02:37 +0000
43+++ unit_tests/test_neutron_api_context.py 2015-11-09 14:07:04 +0000
44@@ -280,6 +280,7 @@
45 self.test_config.set('plumgrid-username', 'plumgrid')
46 self.test_config.set('plumgrid-password', 'plumgrid')
47 self.test_config.set('plumgrid-virtual-ip', '192.168.100.250')
48+ self.test_config.set('enable-ml2-port-security', True)
49
50 def tearDown(self):
51 super(NeutronCCContextTest, self).tearDown()
52@@ -310,6 +311,7 @@
53 'quota_subnet': 10,
54 'quota_vip': 10,
55 'vlan_ranges': 'physnet1:1000:2000',
56+ 'enable_ml2_port_security': True
57 }
58 napi_ctxt = context.NeutronCCContext()
59 with patch.object(napi_ctxt, '_ensure_packages'):
60@@ -344,6 +346,7 @@
61 'quota_vip': 10,
62 'vlan_ranges': 'physnet1:1000:2000',
63 'network_providers': 'physnet2,physnet3',
64+ 'enable_ml2_port_security': True
65 }
66 napi_ctxt = context.NeutronCCContext()
67 with patch.object(napi_ctxt, '_ensure_packages'):
68@@ -382,6 +385,7 @@
69 'quota_subnet': 10,
70 'quota_vip': 10,
71 'vlan_ranges': 'physnet1:1000:2000',
72+ 'enable_ml2_port_security': True
73 }
74 napi_ctxt = context.NeutronCCContext()
75 with patch.object(napi_ctxt, '_ensure_packages'):

Subscribers

People subscribed via source and target branches