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

[David Della Vecchia]

Adding ML2 Port Security config option and corresponding template changes.

[lp:~ddellav/charms/trusty/neutron-api/ml2-port-security]

161. By David Della Vecchia on 2015-11-09

emty commit to kick off USCI

[James Page (james-page)]

review: Needs Fixing

[uosci-testing-bot (uosci-testing-bot)]

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]

162. By David Della Vecchia on 2015-11-09

Fixing config description and dropping icehouse template changes

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[Ryan Beisner (1chb1n)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[James Page (james-page)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-10-27 14:50:30 +0000
+++ config.yaml	2015-11-09 14:07:04 +0000
@@ -453,3 +453,7 @@
       wait for you to execute the openstack-upgrade action for this charm on
       each unit. If False it will revert to existing behavior of upgrading
       all units on config change.
+  enable-ml2-port-security:
+    type: boolean
+    default: False
+    description: Enable port security extension for ML2 plugin (>= kilo).

=== modified file 'hooks/neutron_api_context.py'
--- hooks/neutron_api_context.py	2015-10-27 14:50:30 +0000
+++ hooks/neutron_api_context.py	2015-11-09 14:07:04 +0000
@@ -221,6 +221,8 @@
         if vlan_ranges:
             ctxt['vlan_ranges'] = ','.join(vlan_ranges.split())
 
+        ctxt['enable_ml2_port_security'] = config('enable-ml2-port-security')
+
         return ctxt
 
 

=== modified file 'templates/kilo/ml2_conf.ini'
--- templates/kilo/ml2_conf.ini	2015-09-09 08:37:26 +0000
+++ templates/kilo/ml2_conf.ini	2015-11-09 14:07:04 +0000
@@ -4,6 +4,10 @@
 # Configuration file maintained by Juju. Local changes may be overwritten.  
 ###############################################################################
 [ml2]
+{% if enable_ml2_port_security -%}
+extension_drivers=port_security
+{% endif -%}
+
 {% if neutron_plugin == 'Calico' -%}
 type_drivers = local,flat
 mechanism_drivers = calico

=== modified file 'unit_tests/test_neutron_api_context.py'
--- unit_tests/test_neutron_api_context.py	2015-11-04 18:02:37 +0000
+++ unit_tests/test_neutron_api_context.py	2015-11-09 14:07:04 +0000
@@ -280,6 +280,7 @@
         self.test_config.set('plumgrid-username', 'plumgrid')
         self.test_config.set('plumgrid-password', 'plumgrid')
         self.test_config.set('plumgrid-virtual-ip', '192.168.100.250')
+        self.test_config.set('enable-ml2-port-security', True)
 
     def tearDown(self):
         super(NeutronCCContextTest, self).tearDown()
@@ -310,6 +311,7 @@
             'quota_subnet': 10,
             'quota_vip': 10,
             'vlan_ranges': 'physnet1:1000:2000',
+            'enable_ml2_port_security': True
         }
         napi_ctxt = context.NeutronCCContext()
         with patch.object(napi_ctxt, '_ensure_packages'):
@@ -344,6 +346,7 @@
             'quota_vip': 10,
             'vlan_ranges': 'physnet1:1000:2000',
             'network_providers': 'physnet2,physnet3',
+            'enable_ml2_port_security': True
         }
         napi_ctxt = context.NeutronCCContext()
         with patch.object(napi_ctxt, '_ensure_packages'):
@@ -382,6 +385,7 @@
             'quota_subnet': 10,
             'quota_vip': 10,
             'vlan_ranges': 'physnet1:1000:2000',
+            'enable_ml2_port_security': True
         }
         napi_ctxt = context.NeutronCCContext()
         with patch.object(napi_ctxt, '_ensure_packages'):