Merge lp:~jamesbeedy/charms/trusty/fiche/next into lp:~jamesbeedy/charms/trusty/fiche/trunk

[james beedy]

Merge next.

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2016-02-29 23:22:49 +0000
@@ -0,0 +1,60 @@
+#### joe made this: http://goel.io/joe
+
+#####=== Python ===#####
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+deps
+trusty
 
=== modified file 'Makefile'
--- Makefile	2016-01-12 22:40:14 +0000
+++ Makefile	2016-02-29 23:22:49 +0000
@@ -8,7 +8,7 @@
 	juju-compose -o ~/charms .
 
 lint:
-	@flake8 --exclude hooks/charmhelpers hooks unit_tests tests
+	@flake8 $(wildcard hooks unit_tests tests)
 	@charm proof
 
 unit_test:
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2016-01-12 22:40:14 +0000
+++ hooks/config-changed	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/hook.template'
--- hooks/hook.template	2016-01-12 22:40:14 +0000
+++ hooks/hook.template	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/install'
--- hooks/install	2016-01-12 22:40:14 +0000
+++ hooks/install	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/leader-elected'
--- hooks/leader-elected	2016-01-12 22:40:14 +0000
+++ hooks/leader-elected	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/leader-settings-changed'
--- hooks/leader-settings-changed	2016-01-12 22:40:14 +0000
+++ hooks/leader-settings-changed	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/start'
--- hooks/start	2016-01-12 22:40:14 +0000
+++ hooks/start	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/stop'
--- hooks/stop	2016-01-12 22:40:14 +0000
+++ hooks/stop	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/update-status'
--- hooks/update-status	2016-01-12 22:40:14 +0000
+++ hooks/update-status	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2016-01-12 22:40:14 +0000
+++ hooks/upgrade-charm	2016-02-29 23:22:49 +0000
@@ -6,17 +6,23 @@
 sys.path.append('lib')
 
 # This is an upgrade-charm context, make sure we install latest deps
-os.unlink('wheelhouse/.bootstrapped')
+if not os.path.exists('wheelhouse/.upgrade'):
+    open('wheelhouse/.upgrade', 'w').close()
+    if os.path.exists('wheelhouse/.bootstrapped'):
+        os.unlink('wheelhouse/.bootstrapped')
+else:
+    os.unlink('wheelhouse/.upgrade')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/website-relation-broken'
--- hooks/website-relation-broken	2016-01-12 22:40:14 +0000
+++ hooks/website-relation-broken	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/website-relation-changed'
--- hooks/website-relation-changed	2016-01-12 22:40:14 +0000
+++ hooks/website-relation-changed	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/website-relation-departed'
--- hooks/website-relation-departed	2016-01-12 22:40:14 +0000
+++ hooks/website-relation-departed	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'hooks/website-relation-joined'
--- hooks/website-relation-joined	2016-01-12 22:40:14 +0000
+++ hooks/website-relation-joined	2016-02-29 23:22:49 +0000
@@ -4,15 +4,16 @@
 import sys
 sys.path.append('lib')
 
-from charms.bootstrap import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
 
 
 # This will load and run the appropriate @hook and other decorated
 # handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
 # and $CHARM_DIR/hooks/relations.
 #
-# See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
+# See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
 main()
 
=== modified file 'layer.yaml'
--- layer.yaml	2016-01-12 22:40:14 +0000
+++ layer.yaml	2016-02-29 23:22:49 +0000
@@ -11,6 +11,8 @@
     - gcc
     - supervisor
     - git
+    use_venv: false
+    include_system_packages: false
   nginx: {}
   fiche: {}
 is: fiche
 
=== added directory 'lib/charms/layer'
=== added file 'lib/charms/layer/__init__.py'
--- lib/charms/layer/__init__.py	1970-01-01 00:00:00 +0000
+++ lib/charms/layer/__init__.py	2016-02-29 23:22:49 +0000
@@ -0,0 +1,21 @@
+import os
+
+
+class LayerOptions(dict):
+    def __init__(self, layer_file, section=None):
+        import yaml  # defer, might not be available until bootstrap
+        with open(layer_file) as f:
+            layer = yaml.safe_load(f.read())
+        opts = layer.get('options', {})
+        if section and section in opts:
+            super(LayerOptions, self).__init__(opts.get(section))
+        else:
+            super(LayerOptions, self).__init__(opts)
+
+
+def options(section=None, layer_file=None):
+    if not layer_file:
+        base_dir = os.environ.get('CHARM_DIR', os.getcwd())
+        layer_file = os.path.join(base_dir, 'layer.yaml')
+
+    return LayerOptions(layer_file, section)
 
=== added file 'lib/charms/layer/basic.py'
--- lib/charms/layer/basic.py	1970-01-01 00:00:00 +0000
+++ lib/charms/layer/basic.py	2016-02-29 23:22:49 +0000
@@ -0,0 +1,114 @@
+import os
+import sys
+import shutil
+from glob import glob
+from subprocess import check_call
+
+
+def bootstrap_charm_deps():
+    """
+    Set up the base charm dependencies so that the reactive system can run.
+    """
+    venv = os.path.abspath('../.venv')
+    vbin = os.path.join(venv, 'bin')
+    vpip = os.path.join(vbin, 'pip')
+    vpy = os.path.join(vbin, 'python')
+    if os.path.exists('wheelhouse/.bootstrapped'):
+        from charms import layer
+        cfg = layer.options('basic')
+        if cfg.get('use_venv') and '.venv' not in sys.executable:
+            # activate the venv
+            os.environ['PATH'] = ':'.join([vbin, os.environ['PATH']])
+            reload_interpreter(vpy)
+        return
+    # bootstrap wheelhouse
+    if os.path.exists('wheelhouse'):
+        apt_install(['python3-pip', 'python3-yaml'])
+        from charms import layer
+        cfg = layer.options('basic')
+        # include packages defined in layer.yaml
+        apt_install(cfg.get('packages', []))
+        # if we're using a venv, set it up
+        if cfg.get('use_venv'):
+            if not os.path.exists(venv):
+                apt_install(['python-virtualenv'])
+                cmd = ['virtualenv', '--python=python3', venv]
+                if cfg.get('include_system_packages'):
+                    cmd.append('--system-site-packages')
+                check_call(cmd)
+            os.environ['PATH'] = ':'.join([vbin, os.environ['PATH']])
+            pip = vpip
+        else:
+            pip = 'pip3'
+            # save a copy of system pip to prevent `pip3 install -U pip` from changing it
+            if os.path.exists('/usr/bin/pip'):
+                shutil.copy2('/usr/bin/pip', '/usr/bin/pip.save')
+        # need newer pip, to fix spurious Double Requirement error https://github.com/pypa/pip/issues/56
+        check_call([pip, 'install', '-U', '--no-index', '-f', 'wheelhouse', 'pip'])
+        # install the rest of the wheelhouse deps
+        check_call([pip, 'install', '-U', '--no-index', '-f', 'wheelhouse'] + glob('wheelhouse/*'))
+        if not cfg.get('use_venv'):
+            # restore system pip to prevent `pip3 install -U pip` from changing it
+            if os.path.exists('/usr/bin/pip.save'):
+                shutil.copy2('/usr/bin/pip.save', '/usr/bin/pip')
+                os.remove('/usr/bin/pip.save')
+        # flag us as having already bootstrapped so we don't do it again
+        open('wheelhouse/.bootstrapped', 'w').close()
+        # Ensure that the newly bootstrapped libs are available.
+        # Note: this only seems to be an issue with namespace packages.
+        # Non-namespace-package libs (e.g., charmhelpers) are available
+        # without having to reload the interpreter. :/
+        reload_interpreter(vpy if cfg.get('use_venv') else sys.argv[0])
+
+
+def reload_interpreter(python):
+    """
+    Reload the python interpreter to ensure that all deps are available.
+
+    Newly installed modules in namespace packages sometimes seemt to
+    not be picked up by Python 3.
+    """
+    os.execle(python, python, sys.argv[0], os.environ)
+
+
+def apt_install(packages):
+    """
+    Install apt packages.
+
+    This ensures a consistent set of options that are often missed but
+    should really be set.
+    """
+    if isinstance(packages, (str, bytes)):
+        packages = [packages]
+
+    env = os.environ.copy()
+
+    if 'DEBIAN_FRONTEND' not in env:
+        env['DEBIAN_FRONTEND'] = 'noninteractive'
+
+    cmd = ['apt-get',
+           '--option=Dpkg::Options::=--force-confold',
+           '--assume-yes',
+           'install']
+    check_call(cmd + packages, env=env)
+
+
+def init_config_states():
+    from charmhelpers.core import hookenv
+    from charms.reactive import set_state
+    config = hookenv.config()
+    for opt in config.keys():
+        if config.changed(opt):
+            set_state('config.changed')
+            set_state('config.changed.{}'.format(opt))
+    hookenv.atexit(clear_config_states)
+
+
+def clear_config_states():
+    from charmhelpers.core import hookenv, unitdata
+    from charms.reactive import remove_state
+    config = hookenv.config()
+    remove_state('config.changed')
+    for opt in config.keys():
+        remove_state('config.changed.{}'.format(opt))
+    unitdata.kv().flush()
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2016-01-12 22:40:14 +0000
+++ metadata.yaml	2016-02-29 23:22:49 +0000
@@ -1,6 +1,6 @@
 name: fiche
 summary: Fiche is an open source command line pastebin server.
-maintainer: James Beedy <[e-mail]>
+maintainer: James Beedy <[e-mail]>
 description: |
   Fiche is an open source command line pastebin server. It can be found here:
   https://github.com/solusipse/fiche
 
=== modified file 'reactive/fiche.py'
--- reactive/fiche.py	2016-01-12 22:40:14 +0000
+++ reactive/fiche.py	2016-02-29 23:22:49 +0000
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright (c) 2015, James Beedy <[e-mail]>
+#!/usr/bin/python3
+# Copyright (c) 2016, James Beedy <[e-mail]>
 
 import os
 import sys
@@ -7,9 +7,10 @@
 import shutil
 import subprocess
 
-from charms.reactive import hook
 from charms.reactive import when
+from charms.reactive import when_not
 from charms.reactive import only_once
+from charms.reactive import set_state
 from charmhelpers.core.templating import render
 from charmhelpers.core import hookenv
 from charmhelpers.core import host
@@ -25,7 +26,7 @@
 config = hookenv.config()
 
 FICHE_SUPERVISOR_CTXT = {
-    'fiche_server_address': hookenv.unit_get('private-address'),
+    'fiche_server_address': hookenv.unit_public_ip(),
     'fiche_server_port': config['fiche-server-port'],
     'slug_size': config['slug-size'],
     'buffer_size': config['buffer-size']
@@ -68,6 +69,7 @@
 
 
 @when('nginx.available')
+@when_not('fiche.available')
 @only_once
 def install_fiche():
 
@@ -76,9 +78,6 @@
 
     hookenv.status_set('maintenance', 'Installing and configuring Fiche.')
 
-    # Configure nginx vhost
-    configure_site('fiche', 'fiche.vhost', app_path=FICHE_CODE_DIR)
-
     # Clone fiche repo
     hookenv.status_set('maintenance', 
                        'Installing and building fiche from github.')
@@ -94,26 +93,70 @@
     # Ensure base dir exists
     _ensure_basedir()
 
+    # Configure nginx vhost
+    configure_site('fiche', 'fiche.vhost', app_path=FICHE_CODE_DIR)
+
     # Render fiche supervisor conf
     _render_fiche_supervisor_conf(FICHE_SUPERVISOR_CTXT)
-    hookenv.status_set('active', 'Fiche is active and ready!')
-
+    
+    # Open fiche server port
+    hookenv.open_port(config['fiche-server-port'])
+
+    # Open fiche front-end port
+    hookenv.open_port(config['port'])
+
+    # Set status
+    hookenv.status_set('active', 'Fiche is active on port %s' % \
+                       config['fiche-server-port'])
+    # Set state
+    set_state('fiche.available')
+    
 
 @when('nginx.available', 'website.available')
 def configure_website(website):
     website.configure(port=config['port'])
 
 
-@hook('config-changed')
-def fiche_config_changed():
-
-    """ React to fiche config-changed
-    """
-    hookenv.status_set('maintenance', 'Reconfiguring fiche.')
-
-    if config.changed('fiche-server-port') or \
-       config.changed('slug-size') or \
-       config.changed('buffer-size'):
-        _render_fiche_supervisor_conf(FICHE_SUPERVISOR_CTXT)
-
-    hookenv.status_set('active', 'Fiche is active and ready!')
+@when('config.changed.fiche-server-port')
+def fiche_port_changed():
+
+    """ React to fiche-server-port changed
+    """
+    hookenv.status_set('maintenance', 'Reconfiguring fiche-server-port')
+
+    # Check and change open port, close prev port
+    if config.previous('fiche-server-port') and \
+       config.previous('fiche-server-port') != config['fiche-server-port']:
+        hookenv.close_port(config.previous('fiche-server-port'))
+        hookenv.open_port(config['fiche-server-port'])
+
+    _render_fiche_supervisor_conf(FICHE_SUPERVISOR_CTXT)
+    hookenv.status_set('active', 'Fiche is active on port %s' % \
+                       config['fiche-server-port'])
+
+
+@when('config.changed.slug-size')
+def fiche_slug_size_changed():
+
+    """ React to slug-size changed
+    """
+    hookenv.status_set('maintenance', 'Reconfiguring slug-size')
+
+    # Rerender supervisord conf
+    _render_fiche_supervisor_conf(FICHE_SUPERVISOR_CTXT)
+
+    hookenv.status_set('active', 'Fiche is active on port %s' % \
+                       config['fiche-server-port'])
+
+@when('config.changed.buffer-size')
+def fiche_buffer_size_changed():
+
+    """ React to buffer-size changed
+    """
+    hookenv.status_set('maintenance', 'Reconfiguring buffer-size')
+
+    # Rerender supervisord conf
+    _render_fiche_supervisor_conf(FICHE_SUPERVISOR_CTXT)
+
+    hookenv.status_set('active', 'Fiche is active on port %s' % \
+                       config['fiche-server-port'])
 
=== modified file 'tests/10-deploy'
--- tests/10-deploy	2016-01-12 22:40:14 +0000
+++ tests/10-deploy	2016-02-29 23:22:49 +0000
@@ -4,13 +4,30 @@
 import requests
 import unittest
 
+import socket
+
+
+def netcat(host, port, content):
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s.connect((host, int(port)))
+    s.sendall(content.encode())
+    s.shutdown(socket.SHUT_WR)
+    while True:
+        data = s.recv(4096)
+        if not data:
+            break
+        dat = data
+    s.close()
+    return dat
+
 
 class TestDeployment(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.deployment = amulet.Deployment()
+        cls.deployment = amulet.Deployment(series='trusty')
 
         cls.deployment.add('fiche')
+        cls.deployment.configure('fiche', {'fiche-server-port': 9999})
         cls.deployment.expose('fiche')
 
         try:
@@ -20,32 +37,14 @@
             amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
         except:
             raise
-        cls.unit = cls.deployment.sentry.unit['fiche/0']
-
-    def test_case(self):
-        # Now you can use self.deployment.sentry.unit[UNIT] to address each of
-        # the units and perform more in-depth steps.  You can also reference
-        # the first unit as self.unit.
-        # There are three test statuses that can be triggered with
-        # amulet.raise_status():
-        #   - amulet.PASS
-        #   - amulet.FAIL
-        #   - amulet.SKIP
-        # Each unit has the following methods:
-        #   - .info - An array of the information of that unit from Juju
-        #   - .file(PATH) - Get the details of a file on that unit
-        #   - .file_contents(PATH) - Get plain text output of PATH file from that unit
-        #   - .directory(PATH) - Get details of directory
-        #   - .directory_contents(PATH) - List files and folders in PATH on that unit
-        #   - .relation(relation, service:rel) - Get relation data from return service
-        #          add tests here to confirm service is up and working properly
-        # For example, to confirm that it has a functioning HTTP server:
-        #     page = requests.get('http://{}'.format(self.unit.info['public-address']))
-        #     page.raise_for_status()
-        # More information on writing Amulet tests can be found at:
-        #     https://jujucharms.com/docs/stable/tools-amulet
-        pass
-
+        cls.unit = cls.deployment.sentry.unit['fiche'][1]
+        cls.ipaddr = cls.unit.info['public-address']
+        cls.base_url = 'http://%s/' % cls.ipaddr
+
+
+    def test_1_verify_base_url(self):
+        response = requests.get(self.base_url)
+        response.raise_for_status()
 
 if __name__ == '__main__':
     unittest.main()
 
=== removed directory 'unit_tests'
=== removed file 'unit_tests/test_actions.py'
--- unit_tests/test_actions.py	2016-01-12 22:40:14 +0000
+++ unit_tests/test_actions.py	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import mock
-import unittest
-from pkg_resources import resource_filename
-
-# allow importing actions from the hooks directory
-sys.path.append(resource_filename(__name__, '../hooks'))
-import actions
-
-
-class TestActions(unittest.TestCase):
-    @mock.patch('charmhelpers.core.hookenv.log')
-    def test_log_start(self, log):
-        actions.log_start('test-service')
-        log.assert_called_once_with('fiche starting')
-
-
-if __name__ == '__main__':
-    unittest.main()
 
=== removed file 'wheelhouse/charmhelpers-0.6.1.tar.gz'
 Binary files wheelhouse/charmhelpers-0.6.1.tar.gz	2016-01-12 22:40:14 +0000 and wheelhouse/charmhelpers-0.6.1.tar.gz	1970-01-01 00:00:00 +0000 differ
=== added file 'wheelhouse/charmhelpers-0.6.2.tar.gz'
 Binary files wheelhouse/charmhelpers-0.6.2.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/charmhelpers-0.6.2.tar.gz	2016-02-29 23:22:49 +0000 differ
=== removed file 'wheelhouse/charms.reactive-0.3.7.tar.gz'
 Binary files wheelhouse/charms.reactive-0.3.7.tar.gz	2016-01-12 22:40:14 +0000 and wheelhouse/charms.reactive-0.3.7.tar.gz	1970-01-01 00:00:00 +0000 differ
=== added file 'wheelhouse/charms.reactive-0.3.8.tar.gz'
 Binary files wheelhouse/charms.reactive-0.3.8.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/charms.reactive-0.3.8.tar.gz	2016-02-29 23:22:49 +0000 differ