Enable Zesty-Ocata Amulet Tests

- Turn on Zesty-Ocata Amulet test definitions.
- Standardize test-requirements.txt
- Sync charm helpers for various fixes

Change-Id: I393c5daa9d3d3d5526016321cd81b599af2891d5

src/test-requirements.txt

@@ -1,5 +1,12 @@
-# charm-proof
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+coverage>=3.6
+mock>=1.2
+flake8>=2.2.4,<=2.4.1
+os-testr>=0.4.1
 charm-tools>=2.0.0
+requests==2.6.0
 # amulet deployment helpers
 bzr+lp:charm-helpers#egg=charmhelpers
 # BEGIN: Amulet OpenStack Charm Helper Requirements
@@ -7,15 +14,17 @@ bzr+lp:charm-helpers#egg=charmhelpers
 amulet>=1.14.3,<2.0
 bundletester>=0.6.1,<1.0
 aodhclient>=0.1.0
-python-ceilometerclient>=1.5.0,<2.0
-python-cinderclient>=1.4.0,<2.0
-python-glanceclient>=1.1.0,<2.0
-python-heatclient>=0.8.0,<1.0
-python-keystoneclient>=1.7.1,<2.0
-python-neutronclient>=3.1.0,<4.0
-python-novaclient>=2.30.1,<3.0
-python-openstackclient>=1.7.0,<2.0
-python-swiftclient>=2.6.0,<3.0
+python-barbicanclient>=4.0.1
+python-ceilometerclient>=1.5.0
+python-cinderclient>=1.4.0
+python-designateclient>=1.5
+python-glanceclient>=1.1.0
+python-heatclient>=0.8.0
+python-keystoneclient>=1.7.1
+python-neutronclient>=3.1.0
+python-novaclient>=2.30.1
+python-openstackclient>=1.7.0
+python-swiftclient>=2.6.0
 pika>=0.10.0,<1.0
 distro-info
 # END: Amulet OpenStack Charm Helper Requirements

src/tests/basic_deployment.py

@@ -51,7 +51,8 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
             {'name': 'percona-cluster'},
             {'name': 'rabbitmq-server'},
             {'name': 'keystone'},
-            {'name': 'mongodb'},
+            {'name': 'mongodb',
+             'location': 'cs:~1chb1n/{}/mongodb'.format(self.series)},
             {'name': 'ceilometer'}
         ]
         super(AodhBasicDeployment, self)._add_services(this_service,