Merge lp:~james-page/charms/trusty/neutron-openvswitch/mitaka-neutron-changes into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

[James Page]

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

charm_lint_check #1295 neutron-openvswitch-next for james-page mp286910
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1295/

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

charm_unit_test #1072 neutron-openvswitch-next for james-page mp286910
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1072/

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

charm_amulet_test #472 neutron-openvswitch-next for james-page mp286910
    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/15181051/
Build: http://10.245.162.36:8080/job/charm_amulet_test/472/

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

charm_amulet_test #477 neutron-openvswitch-next for james-page mp286910
    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/15181950/
Build: http://10.245.162.36:8080/job/charm_amulet_test/477/

[Ryan Beisner (1chb1n)]

#recheck

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

charm_unit_test #1077 neutron-openvswitch-next for james-page mp286910
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1077/

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

charm_lint_check #1310 neutron-openvswitch-next for james-page mp286910
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1310/

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

charm_unit_test #1078 neutron-openvswitch-next for james-page mp286910
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1078/

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

charm_lint_check #1311 neutron-openvswitch-next for james-page mp286910
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1311/

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

charm_amulet_test #481 neutron-openvswitch-next for james-page mp286910
    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/15183170/
Build: http://10.245.162.36:8080/job/charm_amulet_test/481/

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

charm_lint_check #1368 neutron-openvswitch-next for james-page mp286910
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1368/

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

charm_unit_test #1131 neutron-openvswitch-next for james-page mp286910
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1131/

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

charm_amulet_test #483 neutron-openvswitch-next for james-page mp286910
    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/15185404/
Build: http://10.245.162.36:8080/job/charm_amulet_test/483/

[James Page (james-page)]

This won't pas just yet
On Tue, 23 Feb 2016 at 19:01, Ryan Beisner <email address hidden>
wrote:

> #recheck
> --
>
> https://code.launchpad.net/~james-page/charms/trusty/neutron-openvswitch/mitaka-neutron-changes/+merge/286910
> You are the owner of
> lp:~james-page/charms/trusty/neutron-openvswitch/mitaka-neutron-changes.
>

[James Page (james-page)]

#recheck

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

charm_lint_check #1480 neutron-openvswitch-next for james-page mp286910
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1480/

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

charm_unit_test #1235 neutron-openvswitch-next for james-page mp286910
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1235/

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

charm_amulet_test #535 neutron-openvswitch-next for james-page mp286910
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/535/

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'hooks/neutron_ovs_utils.py'
--- hooks/neutron_ovs_utils.py	2015-11-12 09:33:27 +0000
+++ hooks/neutron_ovs_utils.py	2016-02-23 14:51:17 +0000
@@ -84,6 +84,7 @@
     'neutron-server',
     'neutron-plugin-openvswitch',
     'neutron-plugin-openvswitch-agent',
+    'neutron-openvswitch-agent',
 ]
 
 NOVA_CONF_DIR = "/etc/nova"
@@ -94,6 +95,7 @@
 NEUTRON_L3_AGENT_CONF = "/etc/neutron/l3_agent.ini"
 NEUTRON_FWAAS_CONF = "/etc/neutron/fwaas_driver.ini"
 ML2_CONF = '%s/plugins/ml2/ml2_conf.ini' % NEUTRON_CONF_DIR
+OVS_CONF = '%s/plugins/ml2/openvswitch_agent.ini' % NEUTRON_CONF_DIR
 EXT_PORT_CONF = '/etc/init/ext-port.conf'
 NEUTRON_METADATA_AGENT_CONF = "/etc/neutron/metadata_agent.ini"
 DVR_PACKAGES = ['neutron-l3-agent']
@@ -114,6 +116,10 @@
         'services': ['neutron-plugin-openvswitch-agent'],
         'contexts': [neutron_ovs_context.OVSPluginContext()],
     }),
+    (OVS_CONF, {
+        'services': ['neutron-openvswitch-agent'],
+        'contexts': [neutron_ovs_context.OVSPluginContext()],
+    }),
     (PHY_NIC_MTU_CONF, {
         'services': ['os-charm-phy-nic-mtu'],
         'contexts': [context.PhyNICMTUContext()],
@@ -193,6 +199,11 @@
             if p in pkgs:
                 pkgs.remove(p)
 
+    release = os_release('neutron-common', base='icehouse')
+    if release >= 'mitaka' and 'neutron-plugin-openvswitch-agent' in pkgs:
+        pkgs.remove('neutron-plugin-openvswitch-agent')
+        pkgs.append('neutron-openvswitch-agent')
+
     return pkgs
 
 
@@ -221,6 +232,19 @@
         resource_map.update(DHCP_RESOURCE_MAP)
         metadata_services = ['neutron-metadata-agent', 'neutron-dhcp-agent']
         resource_map[NEUTRON_CONF]['services'] += metadata_services
+    # Remap any service names as required
+    if os_release('neutron-common', base='icehouse') >= 'mitaka':
+        # ml2_conf.ini -> openvswitch_agent.ini
+        del resource_map[ML2_CONF]
+        # drop of -plugin from service name
+        resource_map[NEUTRON_CONF]['services'].remove(
+            'neutron-plugin-openvswitch-agent'
+        )
+        resource_map[NEUTRON_CONF]['services'].append(
+            'neutron-openvswitch-agent'
+        )
+    else:
+        del resource_map[OVS_CONF]
     return resource_map
 
 
 
=== added directory 'templates/mitaka'
=== added file 'templates/mitaka/openvswitch_agent.ini'
--- templates/mitaka/openvswitch_agent.ini	1970-01-01 00:00:00 +0000
+++ templates/mitaka/openvswitch_agent.ini	2016-02-23 14:51:17 +0000
@@ -0,0 +1,27 @@
+# mitaka
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+# Config managed by neutron-openvswitch charm
+###############################################################################
+[ovs]
+enable_tunneling = True
+local_ip = {{ local_ip }}
+bridge_mappings = {{ bridge_mappings }}
+
+[agent]
+tunnel_types = {{ overlay_network_type }}
+l2_population = {{ l2_population }}
+enable_distributed_routing = {{ distributed_routing }}
+prevent_arp_spoofing = {{ prevent_arp_spoofing }}
+{% if veth_mtu -%}
+veth_mtu = {{ veth_mtu }}
+{% endif -%}
+
+[securitygroup]
+{% if neutron_security_groups -%}
+enable_security_group = True
+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+{% else -%}
+enable_security_group = False
+{% endif -%}
 
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2016-01-20 20:56:33 +0000
+++ tests/basic_deployment.py	2016-02-23 14:51:17 +0000
@@ -9,7 +9,7 @@
     OpenStackAmuletDeployment
 )
 
-# This file needs de-linted.  The (mis)use of n-o q-a below causes all lint 
+# This file needs de-linted.  The (mis)use of n-o q-a below causes all lint
 # to go undetected.  Remove that & fixme.
 from charmhelpers.contrib.openstack.amulet.utils import (
     OpenStackAmuletUtils,
@@ -67,7 +67,7 @@
     def _add_relations(self):
         """Add all of the relations for the services."""
         relations = {
-            'neutron-openvswitch:amqp': 'rabbitmq-server:amqp',  
+            'neutron-openvswitch:amqp': 'rabbitmq-server:amqp',
             'neutron-openvswitch:neutron-plugin':
             'nova-compute:neutron-plugin',
             'neutron-openvswitch:neutron-plugin-api':
@@ -160,6 +160,12 @@
             self.neutron_api_sentry: ['neutron-server'],
         }
 
+        if self._get_openstack_release() >= self.trusty_mitaka:
+            services[self.compute_sentry] = [
+                'nova-compute',
+                'neutron-openvswitch-agent'
+            ]
+
         ret = u.validate_services_by_name(services)
         if ret:
             amulet.raise_status(amulet.FAIL, msg=ret)
@@ -218,7 +224,10 @@
 
         # Needs love - test actions not clear in log
         unit = self.compute_sentry
-        conf = "/etc/neutron/plugins/ml2/ml2_conf.ini"
+        if self._get_openstack_release() >= self.trusty_mitaka:
+            conf = "/etc/neutron/plugins/ml2/openvswitch_agent.ini"
+        else:
+            conf = "/etc/neutron/plugins/ml2/ml2_conf.ini"
         for value in vpair:
             self.d.configure(service, {charm_key: value})
             time.sleep(60)
@@ -253,7 +262,10 @@
 
         # Needs love - not idempotent
         unit = self.compute_sentry
-        conf = "/etc/neutron/plugins/ml2/ml2_conf.ini"
+        if self._get_openstack_release() >= self.trusty_mitaka:
+            conf = "/etc/neutron/plugins/ml2/openvswitch_agent.ini"
+        else:
+            conf = "/etc/neutron/plugins/ml2/ml2_conf.ini"
         self.d.configure('neutron-api', {'neutron-security-groups': 'True'})
         self.d.configure('neutron-openvswitch',
                          {'disable-security-groups': 'True'})
 
=== modified file 'unit_tests/test_neutron_ovs_utils.py'
--- unit_tests/test_neutron_ovs_utils.py	2015-10-07 10:41:12 +0000
+++ unit_tests/test_neutron_ovs_utils.py	2016-02-23 14:51:17 +0000
@@ -111,7 +111,8 @@
         self.test_config.set('enable-local-dhcp-and-metadata', False)
         _git_requested.return_value = False
         _use_dvr.return_value = False
-        _os_rel.return_value = 'trusty'
+        _os_rel.return_value = 'icehouse'
+        self.os_release.return_value = 'icehouse'
         _head_pkgs.return_value = head_pkg
         pkg_list = nutils.determine_packages()
         expect = ['neutron-plugin-openvswitch-agent', head_pkg]
@@ -121,12 +122,29 @@
     @patch.object(nutils, 'git_install_requested')
     @patch.object(charmhelpers.contrib.openstack.neutron, 'os_release')
     @patch.object(charmhelpers.contrib.openstack.neutron, 'headers_package')
+    def test_determine_packages_mitaka(self, _head_pkgs, _os_rel,
+                                       _git_requested, _use_dvr):
+        self.test_config.set('enable-local-dhcp-and-metadata', False)
+        _git_requested.return_value = False
+        _use_dvr.return_value = False
+        _os_rel.return_value = 'mitaka'
+        self.os_release.return_value = 'mitaka'
+        _head_pkgs.return_value = head_pkg
+        pkg_list = nutils.determine_packages()
+        expect = ['neutron-openvswitch-agent', head_pkg]
+        self.assertItemsEqual(pkg_list, expect)
+
+    @patch.object(nutils, 'use_dvr')
+    @patch.object(nutils, 'git_install_requested')
+    @patch.object(charmhelpers.contrib.openstack.neutron, 'os_release')
+    @patch.object(charmhelpers.contrib.openstack.neutron, 'headers_package')
     def test_determine_packages_metadata(self, _head_pkgs, _os_rel,
                                          _git_requested, _use_dvr):
         self.test_config.set('enable-local-dhcp-and-metadata', True)
         _git_requested.return_value = False
         _use_dvr.return_value = False
-        _os_rel.return_value = 'trusty'
+        _os_rel.return_value = 'icehouse'
+        self.os_release.return_value = 'icehouse'
         _head_pkgs.return_value = head_pkg
         pkg_list = nutils.determine_packages()
         expect = ['neutron-plugin-openvswitch-agent', head_pkg,
@@ -142,7 +160,8 @@
         self.test_config.set('enable-local-dhcp-and-metadata', False)
         _git_requested.return_value = True
         _use_dvr.return_value = True
-        _os_rel.return_value = 'trusty'
+        _os_rel.return_value = 'icehouse'
+        self.os_release.return_value = 'icehouse'
         _head_pkgs.return_value = head_pkg
         pkg_list = nutils.determine_packages()
         self.assertFalse('neutron-l3-agent' in pkg_list)
@@ -159,7 +178,7 @@
                 self.ctxts.append(ctxt)
 
         _use_dvr.return_value = False
-        self.os_release.return_value = 'trusty'
+        self.os_release.return_value = 'icehouse'
         templating.OSConfigRenderer.side_effect = _mock_OSConfigRenderer
         _regconfs = nutils.register_configs()
         confs = ['/etc/neutron/neutron.conf',
@@ -168,8 +187,29 @@
         self.assertItemsEqual(_regconfs.configs, confs)
 
     @patch.object(nutils, 'use_dvr')
+    def test_register_configs_mitaka(self, _use_dvr):
+        class _mock_OSConfigRenderer():
+            def __init__(self, templates_dir=None, openstack_release=None):
+                self.configs = []
+                self.ctxts = []
+
+            def register(self, config, ctxt):
+                self.configs.append(config)
+                self.ctxts.append(ctxt)
+
+        _use_dvr.return_value = False
+        self.os_release.return_value = 'mitaka'
+        templating.OSConfigRenderer.side_effect = _mock_OSConfigRenderer
+        _regconfs = nutils.register_configs()
+        confs = ['/etc/neutron/neutron.conf',
+                 '/etc/neutron/plugins/ml2/openvswitch_agent.ini',
+                 '/etc/init/os-charm-phy-nic-mtu.conf']
+        self.assertItemsEqual(_regconfs.configs, confs)
+
+    @patch.object(nutils, 'use_dvr')
     def test_resource_map(self, _use_dvr):
         _use_dvr.return_value = False
+        self.os_release.return_value = 'icehouse'
         _map = nutils.resource_map()
         svcs = ['neutron-plugin-openvswitch-agent']
         confs = [nutils.NEUTRON_CONF]
@@ -177,8 +217,19 @@
         self.assertEqual(_map[nutils.NEUTRON_CONF]['services'], svcs)
 
     @patch.object(nutils, 'use_dvr')
+    def test_resource_map_mitaka(self, _use_dvr):
+        _use_dvr.return_value = False
+        self.os_release.return_value = 'mitaka'
+        _map = nutils.resource_map()
+        svcs = ['neutron-openvswitch-agent']
+        confs = [nutils.NEUTRON_CONF]
+        [self.assertIn(q_conf, _map.keys()) for q_conf in confs]
+        self.assertEqual(_map[nutils.NEUTRON_CONF]['services'], svcs)
+
+    @patch.object(nutils, 'use_dvr')
     def test_resource_map_dvr(self, _use_dvr):
         _use_dvr.return_value = True
+        self.os_release.return_value = 'icehouse'
         _map = nutils.resource_map()
         svcs = ['neutron-plugin-openvswitch-agent', 'neutron-metadata-agent',
                 'neutron-l3-agent']