Re-number amulet test file names; add missing combos as not-executable for now.

tests/018-basic-trusty-liberty

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

tests/019-basic-trusty-mitaka

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

tests/020-basic-wily-liberty

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

tests/021-basic-xenial-mitaka

@@ -0,0 +1,8 @@
+#!/usr/bin/python
+"""Amulet tests on a basic cisco-vpp deployment on xenial-mitaka."""
+
+from basic_deployment import OVSODLBasicDeployment
+
+if __name__ == '__main__':
+    deployment = OVSODLBasicDeployment(series='xenial')
+    deployment.run_tests()