Merge lp:~niedbalski/charms/trusty/quantum-gateway/charm-helpers-sync into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

[Jorge Niedbalski]

- Sync charm-helpers for fixing for support the fix for LP: #1382050

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#640 quantum-gateway-next for niedbalski mp238603
charm_lint_check

This build:
http://10.98.191.181:8080/job/charm_lint_check/640/

MP URL:
https://code.launchpad.net/~niedbalski/charms/trusty/quantum-gateway/charm-helpers-sync/+merge/238603

Proposed branch:
lp:~niedbalski/charms/trusty/quantum-gateway/charm-helpers-sync

Results summary:
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.640:
I: config.yaml: option ext-port has no default value
I: config.yaml: option os-data-network has no default value
I: config.yaml: option instance-mtu has no default value
I: config.yaml: option external-network-id has no default value

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#457 quantum-gateway-next for niedbalski mp238603
charm_unit_test

This build:
http://10.98.191.181:8080/job/charm_unit_test/457/

MP URL:
https://code.launchpad.net/~niedbalski/charms/trusty/quantum-gateway/charm-helpers-sync/+merge/238603

Proposed branch:
lp:~niedbalski/charms/trusty/quantum-gateway/charm-helpers-sync

Results summary:
    UNIT OK: believed to pass, but you should confirm results

UNIT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.457:
Starting unit tests...
..................................................................................
Name Stmts Miss Cover Missing
------------------------------------------------------
hooks/quantum_contexts 127 5 96% 117, 192, 229-231
hooks/quantum_hooks 97 0 100%
hooks/quantum_utils 199 1 99% 354
------------------------------------------------------
TOTAL 423 6 99%
----------------------------------------------------------------------
Ran 82 tests in 3.700s

OK

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#651 quantum-gateway-next for niedbalski mp238603
charm_lint_check

This build:
http://10.98.191.181:8080/job/charm_lint_check/651/

MP URL:
https://code.launchpad.net/~niedbalski/charms/trusty/quantum-gateway/charm-helpers-sync/+merge/238603

Proposed branch:
lp:~niedbalski/charms/trusty/quantum-gateway/charm-helpers-sync

Results summary:
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.651:
I: config.yaml: option ext-port has no default value
I: config.yaml: option os-data-network has no default value
I: config.yaml: option instance-mtu has no default value
I: config.yaml: option external-network-id has no default value

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#230 quantum-gateway-next for niedbalski mp238603
charm_amulet_test

This build:
http://10.98.191.181:8080/job/charm_amulet_test/230/

MP URL:
https://code.launchpad.net/~niedbalski/charms/trusty/quantum-gateway/charm-helpers-sync/+merge/238603

Proposed branch:
lp:~niedbalski/charms/trusty/quantum-gateway/charm-helpers-sync

Results summary:
    AMULET FAIL: amulet-test failed

AMULET Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_amulet_test/make-test.230:
    'Endpoints': [endpoint_a, endpoint_b]
  File "/usr/lib/python2.7/dist-packages/jujuclient.py", line 148, in _rpc
    raise EnvError(result)
jujuclient.EnvError: <Env Error - Details:
 { u'Error': u'service "rabbitmq-server-sentry" not found',
    u'ErrorCode': u'not found',
    u'RequestId': 1,
    u'Response': { }}
 >
Traceback (most recent call last):
  File "tests/15-basic-trusty-icehouse", line 8, in <module>
    deployment = QuantumGatewayBasicDeployment(series='trusty')
  File "/var/lib/jenkins/checkout/quantum-gateway/tests/basic_deployment.py", line 34, in __init__
    self._deploy()
  File "/var/lib/jenkins/checkout/quantum-gateway/tests/charmhelpers/contrib/amulet/deployment.py", line 66, in _deploy
    self.d.setup(timeout=900)
  File "/usr/lib/python2.7/dist-packages/amulet/deployer.py", line 266, in setup
    self.juju_env], cwd=self.deployer_dir)
  File "/usr/lib/python2.7/subprocess.py", line 540, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['juju-deployer', '-W', '-L', '-c', '/tmp/amulet-juju-deployer-y7TmYg.json', '-e', 'osci-sv07', 'osci-sv07']' returned non-zero exit status 1
WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
juju-test INFO : Results: 1 passed, 2 failed, 0 errored
ERROR subprocess encountered error code 2
make: *** [test] Error 2

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Xiang Hui (xianghui)]

review: Approve

=== modified file 'hooks/charmhelpers/contrib/network/ip.py'
--- hooks/charmhelpers/contrib/network/ip.py	2014-10-07 21:03:47 +0000
+++ hooks/charmhelpers/contrib/network/ip.py	2014-10-16 17:44:36 +0000
@@ -140,7 +140,8 @@
         if address.version == 4 and netifaces.AF_INET in addresses:
             addr = addresses[netifaces.AF_INET][0]['addr']
             netmask = addresses[netifaces.AF_INET][0]['netmask']
-            cidr = netaddr.IPNetwork("%s/%s" % (addr, netmask))
+            network = netaddr.IPNetwork("%s/%s" % (addr, netmask))
+            cidr = network.cidr
             if address in cidr:
                 if key == 'iface':
                     return iface
@@ -149,11 +150,14 @@
         if address.version == 6 and netifaces.AF_INET6 in addresses:
             for addr in addresses[netifaces.AF_INET6]:
                 if not addr['addr'].startswith('fe80'):
-                    cidr = netaddr.IPNetwork("%s/%s" % (addr['addr'],
-                                                        addr['netmask']))
+                    network = netaddr.IPNetwork("%s/%s" % (addr['addr'],
+                                                           addr['netmask']))
+                    cidr = network.cidr
                     if address in cidr:
                         if key == 'iface':
                             return iface
+                        elif key == 'netmask' and cidr:
+                            return str(cidr).split('/')[1]
                         else:
                             return addr[key]
     return None

=== modified file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2014-09-25 15:37:05 +0000
+++ hooks/charmhelpers/core/host.py	2014-10-16 17:44:36 +0000
@@ -6,6 +6,7 @@
 #  Matthew Wedgwood <[e-mail]>
 
 import os
+import re
 import pwd
 import grp
 import random
@@ -317,7 +318,13 @@
         ip_output = (line for line in ip_output if line)
         for line in ip_output:
             if line.split()[1].startswith(int_type):
-                interfaces.append(line.split()[1].replace(":", ""))
+                matched = re.search('.*: (bond[0-9]+\.[0-9]+)@.*', line)
+                if matched:
+                    interface = matched.groups()[0]
+                else:
+                    interface = line.split()[1].replace(":", "")
+                interfaces.append(interface)
+
     return interfaces