Merge lp:~gnuoy/charms/trusty/neutron-openvswitch/1421215 into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

[Liam Young]

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

charm_lint_check #1954 neutron-openvswitch-next for gnuoy mp249535
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_ovs_context.py:43:80: E501 line too long (88 > 79 characters)
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10190756/
Build: http://10.245.162.77:8080/job/charm_lint_check/1954/

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

charm_unit_test #1744 neutron-openvswitch-next for gnuoy mp249535
    UNIT OK: passed

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

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

charm_amulet_test #1895 neutron-openvswitch-next for gnuoy mp249535
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

[lp:~gnuoy/charms/trusty/neutron-openvswitch/1421215]

45. By Liam Young on 2015-02-12

Fix lint

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

charm_lint_check #1957 neutron-openvswitch-next for gnuoy mp249535
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_ovs_context.py:45:21: E126 continuation line over-indented for hanging indent
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10194014/
Build: http://10.245.162.77:8080/job/charm_lint_check/1957/

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

charm_unit_test #1747 neutron-openvswitch-next for gnuoy mp249535
    UNIT OK: passed

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

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

charm_amulet_test #1898 neutron-openvswitch-next for gnuoy mp249535
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

[lp:~gnuoy/charms/trusty/neutron-openvswitch/1421215]

46. By Liam Young on 2015-02-13

Try to fix lint error that osci is seeing although I cannot reproduce locally

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

charm_lint_check #1970 neutron-openvswitch-next for gnuoy mp249535
    LINT OK: passed

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

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

charm_unit_test #1760 neutron-openvswitch-next for gnuoy mp249535
    UNIT OK: passed

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

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

charm_amulet_test #1909 neutron-openvswitch-next for gnuoy mp249535
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

[Edward Hope-Morley (hopem)]

Lets start using common code for tasks like this -https://code.launchpad.net/~hopem/charm-helpers/add-core-strutils/+merge/249798

[Edward Hope-Morley (hopem)]

review: Needs Fixing

[lp:~gnuoy/charms/trusty/neutron-openvswitch/1421215]

47. By Liam Young on 2015-02-16

Use charmhelper bool_from_string rather than local to_boolean

[Edward Hope-Morley (hopem)]

LGTM +1

review: Approve

=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-01-26 09:42:44 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-02-16 11:16:24 +0000
@@ -71,16 +71,19 @@
         services.append(this_service)
         use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
                       'ceph-osd', 'ceph-radosgw']
+        # Openstack subordinate charms do not expose an origin option as that
+        # is controlled by the principle
+        ignore = ['neutron-openvswitch']
 
         if self.openstack:
             for svc in services:
-                if svc['name'] not in use_source:
+                if svc['name'] not in use_source + ignore:
                     config = {'openstack-origin': self.openstack}
                     self.d.configure(svc['name'], config)
 
         if self.source:
             for svc in services:
-                if svc['name'] in use_source:
+                if svc['name'] in use_source and svc['name'] not in ignore:
                     config = {'source': self.source}
                     self.d.configure(svc['name'], config)
 
 
=== modified file 'hooks/charmhelpers/contrib/python/packages.py'
--- hooks/charmhelpers/contrib/python/packages.py	2015-01-26 09:42:44 +0000
+++ hooks/charmhelpers/contrib/python/packages.py	2015-02-16 11:16:24 +0000
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
-__author__ = "Jorge Niedbalski <[e-mail]>"
-
 from charmhelpers.fetch import apt_install, apt_update
 from charmhelpers.core.hookenv import log
 
@@ -29,6 +27,8 @@
     apt_install('python-pip')
     from pip import main as pip_execute
 
+__author__ = "Jorge Niedbalski <[e-mail]>"
+
 
 def parse_options(given, available):
     """Given a set of options, check if available"""
 
=== modified file 'hooks/charmhelpers/core/fstab.py'
--- hooks/charmhelpers/core/fstab.py	2015-01-26 09:42:44 +0000
+++ hooks/charmhelpers/core/fstab.py	2015-02-16 11:16:24 +0000
@@ -17,11 +17,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
-__author__ = 'Jorge Niedbalski R. <[e-mail]>'
-
 import io
 import os
 
+__author__ = 'Jorge Niedbalski R. <[e-mail]>'
+
 
 class Fstab(io.FileIO):
     """This class extends file in order to implement a file reader/writer
 
=== added file 'hooks/charmhelpers/core/strutils.py'
--- hooks/charmhelpers/core/strutils.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/core/strutils.py	2015-02-16 11:16:24 +0000
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright 2014-2015 Canonical Limited.
+#
+# This file is part of charm-helpers.
+#
+# charm-helpers is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# charm-helpers is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
+
+
+def bool_from_string(value):
+    """Interpret string value as boolean.
+
+    Returns True if value translates to True otherwise False.
+    """
+    if isinstance(value, str):
+        value = value.lower()
+    else:
+        msg = "Unable to interpret non-string value '%s' as boolean" % (value)
+        raise ValueError(msg)
+
+    if value in ['y', 'yes', 'true', 't']:
+        return True
+    elif value in ['n', 'no', 'false', 'f']:
+        return False
+
+    msg = "Unable to interpret string value '%s' as boolean" % (value)
+    raise ValueError(msg)
 
=== modified file 'hooks/charmhelpers/core/sysctl.py'
--- hooks/charmhelpers/core/sysctl.py	2015-02-11 12:37:28 +0000
+++ hooks/charmhelpers/core/sysctl.py	2015-02-16 11:16:24 +0000
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
-__author__ = 'Jorge Niedbalski R. <[e-mail]>'
-
 import yaml
 
 from subprocess import check_call
@@ -29,6 +27,8 @@
     ERROR,
 )
 
+__author__ = 'Jorge Niedbalski R. <[e-mail]>'
+
 
 def create(sysctl_dict, sysctl_file):
     """Creates a sysctl.conf file from a YAML associative array
 
=== modified file 'hooks/charmhelpers/core/unitdata.py'
--- hooks/charmhelpers/core/unitdata.py	2015-02-11 12:37:28 +0000
+++ hooks/charmhelpers/core/unitdata.py	2015-02-16 11:16:24 +0000
@@ -435,7 +435,7 @@
             os.path.join(charm_dir, 'revision')).read().strip()
         charm_rev = charm_rev or '0'
         revs = self.kv.get('charm_revisions', [])
-        if not charm_rev in revs:
+        if charm_rev not in revs:
             revs.append(charm_rev.strip() or '0')
             self.kv.set('charm_revisions', revs)
 
 
=== modified file 'hooks/charmhelpers/fetch/archiveurl.py'
--- hooks/charmhelpers/fetch/archiveurl.py	2015-01-26 09:42:44 +0000
+++ hooks/charmhelpers/fetch/archiveurl.py	2015-02-16 11:16:24 +0000
@@ -18,6 +18,16 @@
 import hashlib
 import re
 
+from charmhelpers.fetch import (
+    BaseFetchHandler,
+    UnhandledSource
+)
+from charmhelpers.payload.archive import (
+    get_archive_handler,
+    extract,
+)
+from charmhelpers.core.host import mkdir, check_hash
+
 import six
 if six.PY3:
     from urllib.request import (
@@ -35,16 +45,6 @@
     )
     from urlparse import urlparse, urlunparse, parse_qs
 
-from charmhelpers.fetch import (
-    BaseFetchHandler,
-    UnhandledSource
-)
-from charmhelpers.payload.archive import (
-    get_archive_handler,
-    extract,
-)
-from charmhelpers.core.host import mkdir, check_hash
-
 
 def splituser(host):
     '''urllib.splituser(), but six's support of this seems broken'''
 
=== modified file 'hooks/charmhelpers/fetch/giturl.py'
--- hooks/charmhelpers/fetch/giturl.py	2015-01-26 09:42:44 +0000
+++ hooks/charmhelpers/fetch/giturl.py	2015-02-16 11:16:24 +0000
@@ -32,7 +32,7 @@
     apt_install("python-git")
     from git import Repo
 
-from git.exc import GitCommandError
+from git.exc import GitCommandError  # noqa E402
 
 
 class GitUrlFetchHandler(BaseFetchHandler):
 
=== modified file 'hooks/neutron_ovs_context.py'
--- hooks/neutron_ovs_context.py	2014-10-10 09:55:20 +0000
+++ hooks/neutron_ovs_context.py	2015-02-16 11:16:24 +0000
@@ -6,12 +6,12 @@
     unit_get,
 )
 from charmhelpers.core.host import list_nics, get_nic_hwaddr
+from charmhelpers.core.strutils import bool_from_string
 from charmhelpers.contrib.openstack import context
 from charmhelpers.core.host import service_running, service_start
 from charmhelpers.contrib.network.ovs import add_bridge, add_bridge_port
 from charmhelpers.contrib.openstack.utils import get_host_ip
 from charmhelpers.contrib.network.ip import get_address_in_network
-
 import re
 
 OVS_BRIDGE = 'br-int'
@@ -33,9 +33,11 @@
             if 'l2-population' not in rdata:
                 continue
             neutron_settings = {
-                'l2_population': rdata['l2-population'],
-                'neutron_security_groups': rdata['neutron-security-groups'],
+                'l2_population': bool_from_string(rdata['l2-population']),
                 'overlay_network_type': rdata['overlay-network-type'],
+                'neutron_security_groups': bool_from_string(
+                    rdata['neutron-security-groups']
+                ),
             }
             # Override with configuration if set to true
             if config('disable-security-groups'):
 
=== modified file 'unit_tests/test_neutron_ovs_context.py'
--- unit_tests/test_neutron_ovs_context.py	2014-10-10 09:55:20 +0000
+++ unit_tests/test_neutron_ovs_context.py	2015-02-16 11:16:24 +0000
@@ -88,8 +88,8 @@
         _is_clus.return_value = False
         self.related_units.return_value = ['unit1']
         self.relation_ids.return_value = ['rid2']
-        self.test_relation.set({'neutron-security-groups': True,
-                                'l2-population': True,
+        self.test_relation.set({'neutron-security-groups': 'True',
+                                'l2-population': 'True',
                                 'overlay-network-type': 'gre',
                                 })
         self.get_host_ip.return_value = '127.0.0.15'
@@ -141,8 +141,8 @@
         self.test_config.set('disable-security-groups', True)
         self.related_units.return_value = ['unit1']
         self.relation_ids.return_value = ['rid2']
-        self.test_relation.set({'neutron-security-groups': True,
-                                'l2-population': True,
+        self.test_relation.set({'neutron-security-groups': 'True',
+                                'l2-population': 'True',
                                 'overlay-network-type': 'gre',
                                 })
         self.get_host_ip.return_value = '127.0.0.15'