Merge lp:~freyes/charms/trusty/memcached/lp1525026 into lp:charms/trusty/memcached

[Felipe Reyes]

Open firewall to allow non-related machines to connect

memcached charm by default secures their units with ufw, this is intended to
avoid non-related units connect to memcached, because it's a security risk.

This patch makes sure that unit testing scripts have the ability to connect
to memcached, after it's verified that the testing script couldn't connect
the memcached port is open running (ufw insert 1 allow PORT)

make functional_test -> http://paste.ubuntu.com/14143642/

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

charm_lint_check #15824 memcached for freyes mp281254
    LINT OK: passed

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

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

charm_unit_test #14769 memcached for freyes mp281254
    UNIT OK: passed

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

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

charm_amulet_test #8386 memcached for freyes mp281254
    AMULET OK: passed

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

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1921/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1901/

review: Needs Fixing (automated testing)

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

charm_lint_check #16581 memcached for freyes mp281254
    LINT OK: passed

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

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

charm_unit_test #15483 memcached for freyes mp281254
    UNIT OK: passed

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

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

charm_amulet_test #8507 memcached for freyes mp281254
    AMULET OK: passed

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

[Felipe Reyes (freyes)]

On Sat, 26 Dec 2015 14:39:31 -0000
Review Queue <email address hidden> wrote:

> Review: Needs Fixing automated testing
>
> This item has failed automated testing! Results available here
> http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1921/

Sadly the logs aren't available anymore, but running locally I got no
errors for LXC

$ bundletester -e lxc
memcached
    charm-proof PASS
    make lint PASS
    make test PASS
    00_setup.sh PASS
    10_deploy_test.py PASS
INFO:deployer.env: Waiting for machine termination
    20_deploy_replication_test.py PASS

PASS: 6 Total: 6 (549.816231 sec)

--
Felipe Reyes
Software Sustaining Engineer @ Canonical
STS Engineering Team
# Email: <email address hidden> (GPG:0x9B1FFF39)
# Phone: [phone]
# Launchpad: ~freyes | IRC: freyes

[Marco Ceppi (marcoceppi)]

I've requeued the tests

On Tue, Jan 5, 2016 at 2:27 PM Felipe Reyes <email address hidden>
wrote:

> On Sat, 26 Dec 2015 14:39:31 -0000
> Review Queue <email address hidden> wrote:
>
> > Review: Needs Fixing automated testing
> >
> > This item has failed automated testing! Results available here
> > http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1921/
>
> Sadly the logs aren't available anymore, but running locally I got no
> errors for LXC
>
> $ bundletester -e lxc
> memcached
> charm-proof
> PASS
> make lint
> PASS
> make test
> PASS
> 00_setup.sh
> PASS
> 10_deploy_test.py
> PASS
> INFO:deployer.env: Waiting for machine termination
> 20_deploy_replication_test.py
> PASS
>
> PASS: 6 Total: 6 (549.816231 sec)
>
>
> --
> Felipe Reyes
> Software Sustaining Engineer @ Canonical
> STS Engineering Team
> # Email: <email address hidden> (GPG:0x9B1FFF39)
> # Phone: [phone]
> # Launchpad: ~freyes | IRC: freyes
>
>
> https://code.launchpad.net/~freyes/charms/trusty/memcached/lp1525026/+merge/281254
> You are reviewing the proposed merge of
> lp:~freyes/charms/trusty/memcached/lp1525026 into
> lp:charms/trusty/memcached.
>

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/2079/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/2059/

review: Needs Fixing (automated testing)

[Adam Israel (aisrael)]

I ran fresh tests on LXC and Amazon yesterday, and both failed.

I think I fixed the tests on LXC (it works locally for me now), by setting allow-ufw-ip6-softfail = True and removing what looked like a duplicate line calling d.sentry['memcached/0']

https://code.launchpad.net/~aisrael/charms/trusty/memcached/charm-review-fixes

Tests are still failing on Amazon, unfortunately. Here's the bundletester output; I added some extra output in the failure to illustrate what's happening:

http://pastebin.ubuntu.com/14688975/

It looks like it's comparing a private against a public address.

Please let me know if you need any other information or you'd like me to retest.

review: Needs Fixing

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/2208/

review: Approve (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/2188/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/2363/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/2341/

review: Needs Fixing (automated testing)

[lp:~freyes/charms/trusty/memcached/lp1525026]

72. By Felipe Reyes on 2016-02-25

Get private-address using 'juju run'

UnitSentry doesn't populate the 'info' dict with the private-address, so
to check if the replication was properly configured in clouds where
private-address is different from the public-address, the former is retrieved
with 'juju run ... unit-get private-address'

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/2450/

review: Needs Fixing (automated testing)

Unmerged revisions

=== modified file 'tests/10_deploy_test.py'
--- tests/10_deploy_test.py	2015-02-12 22:13:27 +0000
+++ tests/10_deploy_test.py	2016-02-25 18:46:04 +0000
@@ -37,7 +37,7 @@
     raise
 
 # Get the sentry for memcached.
-memcached_unit = d.sentry.unit['memcached/0']
+memcached_unit = d.sentry['memcached'][0]
 
 # Test if the memcached service is running.
 
@@ -70,7 +70,7 @@
     pass  # this is good
 
 # open memcache to be able to connect from this machine
-memcached_unit.run('ufw allow {}'.format(memcached_port))
+memcached_unit.run('ufw insert 1 allow {}'.format(memcached_port))
 
 try:
     # Connect to memcached via telnet.
@@ -109,7 +109,10 @@
                '{0}:{1} {2}').format(memcached_address, memcached_port, str(e))
     amulet.raise_status(amulet.FAIL, msg=message)
 finally:
-    tn.close()
+    try:
+        tn.close()
+    except NameError:
+        pass
 
 # Test if the memcached service is configured properly.
 

=== modified file 'tests/20_deploy_replication_test.py'
--- tests/20_deploy_replication_test.py	2015-02-13 15:20:14 +0000
+++ tests/20_deploy_replication_test.py	2016-02-25 18:46:04 +0000
@@ -14,8 +14,12 @@
             o = line.split()[1]
             break
 
-    if o != b.info['public-address']:
-        amulet.raise_status(amulet.FAIL, msg='Incorrect replica address')
+    priv_addr_b, code = b.run('unit-get private-address')
+    assert code == 0, "unit-get private-address failed, code %s" % code
+    if o != priv_addr_b:
+        print('(%s != %s)' % (o, priv_addr_b))
+        amulet.raise_status(amulet.FAIL, msg=('Incorrect replica address '
+                                              '(%s != %s)') % (o, priv_addr_b))
 
 
 def check_replication(a, b, port):
@@ -48,7 +52,10 @@
         message = 'An error occurred communicating with memcached over telnet'
         amulet.raise_status(amulet.FAIL, msg=message)
     finally:
-        tn.close()
+        try:
+            tn.close()
+        except NameError:
+            pass
 
 
 seconds = 1200
@@ -76,7 +83,7 @@
 except:
     raise
 
-units = (d.sentry['memcached/0'], d.sentry['memcached/1'])
+units = (d.sentry['memcached'][0], d.sentry['memcached'][1])
 memcached_port = configuration.get('tcp-port')
 
 for memcached_unit in units:
@@ -84,7 +91,7 @@
     output, code = memcached_unit.run(command)
 
     # open memcache to be able to connect from this machine
-    memcached_unit.run('ufw allow {}'.format(memcached_port))
+    memcached_unit.run('ufw insert 1 allow {}'.format(memcached_port))
 
     if code != 0:
         message = 'The ' + command + ' returned %d.' % code