[1chb1n, r=gnuoy] Update tests for Vivid-Kilo + Trusty-Liberty enablement.

Really old lint cleanup.

Update makefile, update amulet test targets, update readme.

Sync tests/charmhelpers.

Rebase from next.

Makefile

@@ -24,6 +24,6 @@ sync: bin/charm_helpers_sync.py
 	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
 	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
 
-publish: lint unit_test
+publish: lint test
 	bzr push lp:charms/neutron-gateway
 	bzr push lp:charms/trusty/neutron-gateway

tests/00-setup

@@ -4,9 +4,13 @@ set -ex
 
 sudo add-apt-repository --yes ppa:juju/stable
 sudo apt-get update --yes
-sudo apt-get install --yes python-amulet \
+sudo apt-get install --yes amulet \
+                           python-cinderclient \
                            python-distro-info \
-                           python-neutronclient \
+                           python-glanceclient \
+                           python-heatclient \
                            python-keystoneclient \
+                           python-neutronclient \
                            python-novaclient \
-                           python-glanceclient
+                           python-pika \
+                           python-swiftclient

tests/020-basic-trusty-liberty

@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic quantum-gateway deployment on trusty-liberty."""
+
+from basic_deployment import NeutronGatewayBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NeutronGatewayBasicDeployment(series='trusty',
+                                               openstack='cloud:trusty-liberty',
+                                               source='cloud:trusty-updates/liberty')
+    deployment.run_tests()

tests/021-basic-wily-liberty

@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic quantum-gateway deployment on wily-liberty."""
+
+from basic_deployment import NeutronGatewayBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NeutronGatewayBasicDeployment(series='wily')
+    deployment.run_tests()

tests/README

@@ -1,6 +1,16 @@
 This directory provides Amulet tests that focus on verification of
 quantum-gateway deployments.
 
+test_* methods are called in lexical sort order, although each individual test
+should be idempotent, and expected to pass regardless of run order.
+
+Test name convention to ensure desired test order:
+    1xx service and endpoint checks
+    2xx relation checks
+    3xx config checks
+    4xx functional checks
+    9xx restarts and other final checks
+
 In order to run tests, you'll need charm-tools installed (in addition to
 juju, of course):
     sudo add-apt-repository ppa:juju/stable

tests/tests.yaml

@@ -0,0 +1,20 @@
+bootstrap: true
+reset: true
+virtualenv: true
+makefile:
+    - lint
+    - test
+sources:
+    - ppa:juju/stable
+packages:
+    - amulet
+    - python-amulet
+    - python-cinderclient
+    - python-distro-info
+    - python-glanceclient
+    - python-heatclient
+    - python-keystoneclient
+    - python-neutronclient
+    - python-novaclient
+    - python-pika
+    - python-swiftclient