Merge lp:~tvansteenburgh/charms/precise/quantum-gateway/fix-tests into lp:charms/quantum-gateway

[Tim Van Steenburgh]

Fix tests, proof.

[Corey Bryant (corey.bryant)]

Hey Tim,

The venv updates look good to me.

Can we look into fixing charm proof instead of having to add empty config options to appease the tool? Or is it already fixed in the tool (charm proof actually doesn't complain for me about 'default')?

Note that active development is going on in our dev branches for the openstack charms, so I'd recommend proposing against lp:~openstack-charmers/charms/trusty/quantum-gateway/next instead. (more info on that: https://wiki.ubuntu.com/ServerTeam/OpenStackCharms).

Thanks
Corey

[James Page (james-page)]

defaults fixed in next; postponing virtualenv use until we have a broader team discussion.

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-05-21 10:07:03 +0000
+++ Makefile	2014-09-11 21:19:20 +0000
@@ -6,9 +6,14 @@
 	@flake8 --exclude hooks/charmhelpers unit_tests
 	@charm proof
 
-test:
+test: .venv
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests
+	.venv/bin/nosetests --nologcapture unit_tests
+
+.venv:
+	sudo apt-get install python-virtualenv python-apt -y
+	virtualenv .venv --system-site-packages
+	.venv/bin/pip install -I nose mock pyyaml
 
 sync:
 	@charm-helper-sync -c charm-helpers-sync.yaml
@@ -16,3 +21,6 @@
 publish: lint test
 	bzr push lp:charms/quantum-gateway
 	bzr push lp:charms/trusty/quantum-gateway
+
+clean:
+	rm -rf .venv

=== modified file 'config.yaml'
--- config.yaml	2014-06-17 09:55:40 +0000
+++ config.yaml	2014-09-11 21:19:20 +0000
@@ -9,6 +9,7 @@
         ovs - OpenVSwitch
         nvp|nsx - Nicira NVP/VMware NSX
   ext-port:
+    default:
     type: string
     description: |
       External port to use for routing of instance
@@ -38,6 +39,7 @@
       Use leader and none when configuring multiple floating pools
   external-network-id:
     type: string
+    default:
     description: |
       Optional configuration to set the external-network-id. Only needed when
       configuring multiple external networks and should be used in conjunction
@@ -65,6 +67,7 @@
       If set to True, supporting services will log to syslog.
   instance-mtu:
     type: int
+    default:
     description: |
       Configure DHCP services to provide MTU configuration to instances
       within the cloud.  This is useful in deployments where its not