Merge lp:~jose/charms/precise/nyancat/port-changing+amulet-tests into lp:charms/nyancat

[José Antonio Rey]

* Added support for port changing
* Added amulet test (test passes with charm test)
* Changed package source: it now clones from git instead of using a package in the charm

[Tim Van Steenburgh (tvansteenburgh)]

Hey José,

Thanks for this! The git clone and config-changed updates look great, but I don't see any amulet tests...perhaps you forgot to `bzr add` them?

Tim

[Tim Van Steenburgh (tvansteenburgh)]

review: Needs Information

[José Antonio Rey (jose)]

Sorry, forgot to add them. Did and everything's working fine now. Thanks for reminding me! :)

[Ryan Finnie (fo0bar)]

Please do not switch the default source to pulling from github HEAD, as it's 1) a remote dependency which can be a problem for private clouds, and 2) pulling from HEAD is unpredictable what you actually get.

I'd recommend leaving the default method as local tarball copy (maybe updating the tarball to current 1.4.4 at the same time), and adding a config option to instead pull from a git repo (default https://github.com/klange/nyancat.git), optionally with a specific tag.

review: Needs Fixing

[Matt Bruzek (mbruzek)]

José,

Thanks for your work here I am very happy to see amulet tests! It seems that the change to pull from head is controversial. I would suggest breaking out the amulet tests in a separate merge proposal.

# charm proof

I ran charm proof and there is some warnings that are unrelated to this merge proposal. If you could make an icon for nyancat that would be great.

$ charm proof
W: No icon.svg file.
I: all charms should provide at least one thing

# review

The issue with pulling from head has some merit and I would suggest keeping the old binary in there, and making the source a configuration option.

00-setup:
The file needs some non-interactive flags on the commands. The 00-setup command hangs waiting for input, but I see no ouput.
sudo add-apt-repository -y ppa:juju/stable
sudo apt-get update -qq
sudo apt-get install -y amulet

100-deploy:
This test did not pass.

review: Needs Fixing

Unmerged revisions

8. By José Antonio Rey on 2014-05-01

Added forgotten config-changed symlink

7. By José Antonio Rey on 2014-05-01

Forgot to bzr add tests, added now

6. By José Antonio Rey on 2014-04-25

Changed charm for it to grab source from git

5. By José Antonio Rey on 2014-04-17

Added support for port changing and amulet tests

=== removed directory 'dist'
=== removed file 'dist/nyancat-1.2.tar.gz'
Binary files dist/nyancat-1.2.tar.gz	2013-05-27 14:07:12 +0000 and dist/nyancat-1.2.tar.gz	1970-01-01 00:00:00 +0000 differ
=== added symlink 'hooks/config-changed'
=== target is u'nyancat-relations'
=== modified file 'hooks/nyancat-relations'
--- hooks/nyancat-relations	2013-05-27 14:04:04 +0000
+++ hooks/nyancat-relations	2014-05-01 19:00:07 +0000
@@ -14,12 +14,11 @@
 
 function install_hook() {
   juju-log "nyancat: Installing packages"
-  apt-get -y --force-yes install build-essential openbsd-inetd update-inetd tcpd
+  apt-get -y --force-yes install build-essential openbsd-inetd update-inetd tcpd git
 
   BUILD_DIR="$(mktemp -d)"
-  TARBALL="dist/nyancat-1.2.tar.gz"
-  juju-log "nyancat: Extracting $TARBALL to $BUILD_DIR"
-  tar -zx --strip-components=1 -C "$BUILD_DIR" -f "$TARBALL"
+  juju-log "nyancat: Cloning source from git"
+  git clone https://github.com/klange/nyancat.git $BUILD_DIR
 
   juju-log "nyancat: Building nyancat"
   make -C "$BUILD_DIR"
@@ -37,14 +36,26 @@
 function start_hook() {
   juju-log "nyancat: Restarting inetd"
   service openbsd-inetd restart
+}
 
-  juju-log "nyancat: Opening port $OPEN_PORT"
-  open-port "$OPEN_PORT"
+function config_hook() {
+  if [ ! -f .port ]; then
+      juju-log "nyancat: Opening port $OPEN_PORT"
+      open-port "$OPEN_PORT"
+      echo "$OPEN_PORT" > .port
+  elif [ -f .port ] && [ `cat .port` != "$OPEN_PORT" ]; then
+      PORT=`cat .port`
+      juju-log "Changing port to $OPEN_PORT"
+      close-port "$PORT"
+      open-port "$OPEN_PORT"
+      echo "$OPEN_PORT" > .port
+  fi
 }
 
 juju-log "nyancat: Firing hook $ARG0"
 case $ARG0 in
   "install") install_hook ;;
   "start") start_hook ;;
+  "config-changed") config_hook ;;
   "stop") exit 0 ;;
 esac

=== added directory 'tests'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2014-05-01 19:00:07 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo add-apt-repository ppa:juju/stable
+sudo apt-get update
+sudo apt-get install amulet

=== added file 'tests/100-deploy'
--- tests/100-deploy	1970-01-01 00:00:00 +0000
+++ tests/100-deploy	2014-05-01 19:00:07 +0000
@@ -0,0 +1,28 @@
+#!/usr/bin/python3
+
+import amulet
+import telnetlib
+
+d = amulet.Deployment()
+
+d.add('nyancat')
+d.configure('nyancat', {'inetd-service': 'http'})
+d.configure('nyancat', {'inetd-service': 'telnet'})
+d.expose ('nyancat')
+
+try:
+    d.setup(timeout=900)
+    d.sentry.wait()
+except amulet.helpers.TimeoutError:
+    amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+except:
+    raise
+
+def ping_server():
+    tn = telnetlib.Telnet("%s" %
+                          d.sentry.unit['nyancat/0'].info['public-address'])
+    tel = tn.read_until("nyaned".encode(), 30)
+    if "nyaned".encode() not in tel:
+        amulet.raise_status(amulet.FAIL, message="Server is not up!")
+
+ping_server()