From ab1a4b8aa17573b410cc5966a89caeeb5fe4fabe Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Fri, 17 Apr 2020 11:43:54 +0200
Subject: [PATCH] Move NeutronNetworkingTest from neutron-api

At present the neutron-api charm executes four gate tests per
release combination to cover ML2, ML2+DVR, ML2+DVR+SNAT and OVN
deployment scenarios.  This adds up to over 12 hours runtime for a
full test run.

With this change we default to deploy the ML2+DVR+SNAT deployment
scenario in the neutron-openvswitch gate test for xenial-queens
and onwards so that we can remove this test from the neutron-api
gate.

Change-Id: I04922b758fccad8545afb28cdb715a413096589d
Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/237
---
 tests/bundles/bionic-queens-dvr-snat.yaml     | 125 ++++++++++
 tests/bundles/bionic-queens.yaml              |  89 -------
 tests/bundles/bionic-rocky-dvr-snat.yaml      | 125 ++++++++++
 tests/bundles/bionic-rocky.yaml               |  98 --------
 tests/bundles/bionic-stein-dvr-snat.yaml      | 125 ++++++++++
 tests/bundles/bionic-stein.yaml               |  98 --------
 tests/bundles/bionic-train-dvr-snat.yaml      | 139 +++++++++++
 tests/bundles/bionic-train.yaml               | 114 ---------
 tests/bundles/bionic-ussuri-dvr-snat.yaml     | 140 +++++++++++
 tests/bundles/bionic-ussuri.yaml              | 115 ---------
 ...ussuri.yaml => focal-ussuri-dvr-snat.yaml} | 228 ++++++++----------
 tests/bundles/trusty-mitaka.yaml              | 197 ++++++++-------
 tests/bundles/xenial-mitaka.yaml              | 194 +++++++++------
 tests/bundles/xenial-ocata.yaml               | 199 ++++++++-------
 tests/bundles/xenial-pike.yaml                | 199 ++++++++-------
 tests/bundles/xenial-queens-dvr-snat.yaml     | 125 ++++++++++
 tests/bundles/xenial-queens.yaml              |  98 --------
 tests/tests.yaml                              |  26 +-
 18 files changed, 1365 insertions(+), 1069 deletions(-)
 create mode 100644 tests/bundles/bionic-queens-dvr-snat.yaml
 delete mode 100644 tests/bundles/bionic-queens.yaml
 create mode 100644 tests/bundles/bionic-rocky-dvr-snat.yaml
 delete mode 100644 tests/bundles/bionic-rocky.yaml
 create mode 100644 tests/bundles/bionic-stein-dvr-snat.yaml
 delete mode 100644 tests/bundles/bionic-stein.yaml
 create mode 100644 tests/bundles/bionic-train-dvr-snat.yaml
 delete mode 100644 tests/bundles/bionic-train.yaml
 create mode 100644 tests/bundles/bionic-ussuri-dvr-snat.yaml
 delete mode 100644 tests/bundles/bionic-ussuri.yaml
 rename tests/bundles/{focal-ussuri.yaml => focal-ussuri-dvr-snat.yaml} (55%)
 create mode 100644 tests/bundles/xenial-queens-dvr-snat.yaml
 delete mode 100644 tests/bundles/xenial-queens.yaml

diff --git a/tests/bundles/bionic-queens-dvr-snat.yaml b/tests/bundles/bionic-queens-dvr-snat.yaml
new file mode 100644
index 00000000..de92d58d
--- /dev/null
+++ b/tests/bundles/bionic-queens-dvr-snat.yaml
@@ -0,0 +1,125 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: &series bionic
+
+machines:
+  0:
+    constraints: "mem=3072M"
+  1: {}
+  2: {}
+  3: {}
+  4: {}
+  5: {}
+  6:
+    constraints: "root-disk=20G mem=4G"
+  7:
+    constraints: "root-disk=20G mem=4G"
+
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '1'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      overlay-network-type: 'vxlan'
+      l2-population: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+      enable-dvr: True
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+    options:
+      use-dvr-snat: True
+      bridge-mappings: physnet1:br-ex
+      enable-local-dhcp-and-metadata: True
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+      - '7'
+relations:
+  - - 'neutron-api:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-openvswitch:neutron-plugin-api'
+  - - 'nova-cloud-controller:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml
deleted file mode 100644
index e095a043..00000000
--- a/tests/bundles/bionic-queens.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-
-applications:
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    to:
-    - '1'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-    to:
-    - '2'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    to:
-    - '4'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-    - '5'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    to:
-    - '6'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
-relations:
-- - 'neutron-openvswitch:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'neutron-openvswitch:neutron-plugin'
-  - 'nova-compute:neutron-plugin'
-- - 'neutron-openvswitch:neutron-plugin-api'
-  - 'neutron-api:neutron-plugin-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'neutron-api:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'neutron-api:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
diff --git a/tests/bundles/bionic-rocky-dvr-snat.yaml b/tests/bundles/bionic-rocky-dvr-snat.yaml
new file mode 100644
index 00000000..87b82183
--- /dev/null
+++ b/tests/bundles/bionic-rocky-dvr-snat.yaml
@@ -0,0 +1,125 @@
+variables:
+  openstack-origin: &openstack-origin cloud:bionic-rocky
+
+series: &series bionic
+
+machines:
+  0:
+    constraints: "mem=3072M"
+  1: {}
+  2: {}
+  3: {}
+  4: {}
+  5: {}
+  6:
+    constraints: "root-disk=20G mem=4G"
+  7:
+    constraints: "root-disk=20G mem=4G"
+
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '1'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      overlay-network-type: 'vxlan'
+      l2-population: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+      enable-dvr: True
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+    options:
+      use-dvr-snat: True
+      bridge-mappings: physnet1:br-ex
+      enable-local-dhcp-and-metadata: True
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+      - '7'
+relations:
+  - - 'neutron-api:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-openvswitch:neutron-plugin-api'
+  - - 'nova-cloud-controller:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml
deleted file mode 100644
index 68dc7c93..00000000
--- a/tests/bundles/bionic-rocky.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-
-applications:
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-    to:
-    - '1'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-rocky
-    to:
-    - '2'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-    to:
-    - '4'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-    to:
-    - '5'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-    to:
-    - '6'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
-relations:
-- - 'neutron-openvswitch:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'neutron-openvswitch:neutron-plugin'
-  - 'nova-compute:neutron-plugin'
-- - 'neutron-openvswitch:neutron-plugin-api'
-  - 'neutron-api:neutron-plugin-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'neutron-api:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'neutron-api:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
diff --git a/tests/bundles/bionic-stein-dvr-snat.yaml b/tests/bundles/bionic-stein-dvr-snat.yaml
new file mode 100644
index 00000000..c042cc8e
--- /dev/null
+++ b/tests/bundles/bionic-stein-dvr-snat.yaml
@@ -0,0 +1,125 @@
+variables:
+  openstack-origin: &openstack-origin cloud:bionic-stein
+
+series: &series bionic
+
+machines:
+  0:
+    constraints: "mem=3072M"
+  1: {}
+  2: {}
+  3: {}
+  4: {}
+  5: {}
+  6:
+    constraints: "root-disk=20G mem=4G"
+  7:
+    constraints: "root-disk=20G mem=4G"
+
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '1'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      overlay-network-type: 'vxlan'
+      l2-population: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+      enable-dvr: True
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+    options:
+      use-dvr-snat: True
+      bridge-mappings: physnet1:br-ex
+      enable-local-dhcp-and-metadata: True
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+      - '7'
+relations:
+  - - 'neutron-api:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-openvswitch:neutron-plugin-api'
+  - - 'nova-cloud-controller:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml
deleted file mode 100644
index 1165a068..00000000
--- a/tests/bundles/bionic-stein.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-
-applications:
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-    to:
-    - '1'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-stein
-    to:
-    - '2'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-    to:
-    - '4'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-    to:
-    - '5'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-    to:
-    - '6'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
-relations:
-- - 'neutron-openvswitch:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'neutron-openvswitch:neutron-plugin'
-  - 'nova-compute:neutron-plugin'
-- - 'neutron-openvswitch:neutron-plugin-api'
-  - 'neutron-api:neutron-plugin-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'neutron-api:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'neutron-api:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
diff --git a/tests/bundles/bionic-train-dvr-snat.yaml b/tests/bundles/bionic-train-dvr-snat.yaml
new file mode 100644
index 00000000..916b9eb7
--- /dev/null
+++ b/tests/bundles/bionic-train-dvr-snat.yaml
@@ -0,0 +1,139 @@
+variables:
+  openstack-origin: &openstack-origin cloud:bionic-train
+
+series: &series bionic
+
+machines:
+  0:
+    constraints: "mem=3072M"
+  1: {}
+  2: {}
+  3: {}
+  4: {}
+  5: {}
+  6:
+    constraints: "root-disk=20G mem=4G"
+  7:
+    constraints: "root-disk=20G mem=4G"
+  8: {}
+
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '1'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      overlay-network-type: 'vxlan'
+      l2-population: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+      enable-dvr: True
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+    options:
+      use-dvr-snat: True
+      bridge-mappings: physnet1:br-ex
+      enable-local-dhcp-and-metadata: True
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+      - '7'
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '8'
+relations:
+  - - 'neutron-api:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-openvswitch:neutron-plugin-api'
+  - - 'nova-cloud-controller:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+  - - 'placement:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'placement:identity-service'
+    - 'keystone:identity-service'
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml
deleted file mode 100644
index 84613d5f..00000000
--- a/tests/bundles/bionic-train.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-
-applications:
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-    to:
-    - '1'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-train
-    to:
-    - '2'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-    to:
-    - '4'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-    to:
-    - '5'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-    to:
-    - '6'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  placement:
-    charm: cs:~openstack-charmers-next/bionic/placement
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-    to:
-    - '7'
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
-relations:
-- - 'neutron-openvswitch:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'neutron-openvswitch:neutron-plugin'
-  - 'nova-compute:neutron-plugin'
-- - 'neutron-openvswitch:neutron-plugin-api'
-  - 'neutron-api:neutron-plugin-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'neutron-api:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'neutron-api:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
-- - 'placement:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'placement:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'placement:placement'
-  - 'nova-cloud-controller:placement'
-- - 'placement:identity-service'
-  - 'keystone:identity-service'
diff --git a/tests/bundles/bionic-ussuri-dvr-snat.yaml b/tests/bundles/bionic-ussuri-dvr-snat.yaml
new file mode 100644
index 00000000..8ad171d4
--- /dev/null
+++ b/tests/bundles/bionic-ussuri-dvr-snat.yaml
@@ -0,0 +1,140 @@
+variables:
+  openstack-origin: &openstack-origin cloud:bionic-ussuri
+
+series: &series bionic
+
+machines:
+  0:
+    constraints: "mem=3072M"
+  1: {}
+  2: {}
+  3: {}
+  4: {}
+  5: {}
+  6:
+    constraints: "root-disk=20G mem=4G"
+  7:
+    constraints: "root-disk=20G mem=4G"
+  8: {}
+
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '1'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      overlay-network-type: 'vxlan'
+      l2-population: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+      enable-dvr: True
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+    options:
+      use-dvr-snat: True
+      bridge-mappings: physnet1:br-ex
+      enable-local-dhcp-and-metadata: True
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+      - '7'
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '8'
+relations:
+  - - 'neutron-api:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-openvswitch:neutron-plugin-api'
+  - - 'nova-cloud-controller:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+  - - 'placement:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'placement:identity-service'
+    - 'keystone:identity-service'
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml
deleted file mode 100644
index 295fb456..00000000
--- a/tests/bundles/bionic-ussuri.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-
-applications:
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-    to:
-    - '1'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-ussuri
-    to:
-    - '2'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-    to:
-    - '4'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-    to:
-    - '5'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      openstack-origin: cloud:bionic-ussuri
-    to:
-    - '6'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  placement:
-    charm: cs:~openstack-charmers-next/bionic/placement
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-    to:
-    - '7'
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
-relations:
-- - 'neutron-openvswitch:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'neutron-openvswitch:neutron-plugin'
-  - 'nova-compute:neutron-plugin'
-- - 'neutron-openvswitch:neutron-plugin-api'
-  - 'neutron-api:neutron-plugin-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'neutron-api:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'neutron-api:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
-- - 'placement:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'placement:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'placement:placement'
-  - 'nova-cloud-controller:placement'
-- - 'placement:identity-service'
-  - 'keystone:identity-service'
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri-dvr-snat.yaml
similarity index 55%
rename from tests/bundles/focal-ussuri.yaml
rename to tests/bundles/focal-ussuri-dvr-snat.yaml
index d7350c49..1e90eb84 100644
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri-dvr-snat.yaml
@@ -1,38 +1,41 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: focal
+series: &series focal
 
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
 machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
+  0:
+    constraints: "mem=3072M"
+  1:
+    constraints: "mem=3072M"
+  2:
+    constraints: "mem=3072M"
+  3: {}
+  4: {}
+  5: {}
+  6: {}
+  7: {}
+  8:
+    constraints: "root-disk=20G mem=4G"
+  9:
+    constraints: "root-disk=20G mem=4G"
+  10: {}
 
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
 applications:
-
-  neutron-api-mysql-router:
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  nova-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
   glance-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
+  neutron-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
   placement-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
-
+  vault-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers-next/mysql-innodb-cluster
     num_units: 3
@@ -42,15 +45,47 @@ applications:
       - '0'
       - '1'
       - '2'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '3'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      overlay-network-type: 'vxlan'
+      l2-population: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+      enable-dvr: True
+    to:
+      - '4'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
-    - '3'
-
+      - '5'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+    options:
+      use-dvr-snat: True
+      bridge-mappings: physnet1:br-ex
+      enable-local-dhcp-and-metadata: True
   nova-cloud-controller:
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
@@ -58,123 +93,66 @@ applications:
       network-manager: Neutron
       openstack-origin: *openstack-origin
     to:
-    - '4'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-    - '5'
-
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
+      - '7'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
     options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
       openstack-origin: *openstack-origin
     to:
-    - '6'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '7'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      openstack-origin: *openstack-origin
-    to:
-    - '8'
-
+      - '8'
+      - '9'
   placement:
-    charm: cs:~openstack-charmers-next/bionic/placement
+    charm: cs:~openstack-charmers-next/placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
-    - '9'
-
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
+      - '10'
 relations:
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:neutron-plugin'
-    - 'nova-compute:neutron-plugin'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
   - - 'neutron-api:amqp'
     - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'glance:identity-service'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:identity-service'
     - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-openvswitch:neutron-plugin-api'
   - - 'nova-cloud-controller:amqp'
     - 'rabbitmq-server:amqp'
-
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
   - - 'nova-cloud-controller:identity-service'
     - 'keystone:identity-service'
-
   - - 'nova-cloud-controller:cloud-compute'
     - 'nova-compute:cloud-compute'
-
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
   - - 'nova-cloud-controller:image-service'
     - 'glance:image-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
   - - 'placement:identity-service'
     - 'keystone:identity-service'
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
+  - ["keystone:shared-db", "keystone-mysql-router:shared-db"]
+  - ["glance:shared-db", "glance-mysql-router:shared-db"]
+  - ["nova-cloud-controller:shared-db", "nova-mysql-router:shared-db"]
+  - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
+  - ["placement:shared-db", "placement-mysql-router:shared-db"]
+  - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+  - ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+  - ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+  - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+  - ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml
index 2a0612e4..6d779c0e 100644
--- a/tests/bundles/trusty-mitaka.yaml
+++ b/tests/bundles/trusty-mitaka.yaml
@@ -1,98 +1,131 @@
-series: trusty
+variables:
+  openstack-origin: &openstack-origin cloud:trusty-mitaka
+
+series: &series trusty
 
 machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
+  0:
+    constraints: "mem=3072M"
+  1: {}
+  2: {}
+  3: {}
+  4: {}
+  5: {}
+  6: {}
+  7:
+    constraints: "root-disk=20G mem=4G"
+  8:
+    constraints: "root-disk=20G mem=4G"
 
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
 applications:
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+  percona-cluster:
+    charm: cs:trusty/percona-cluster
     num_units: 1
     options:
-      openstack-origin: cloud:trusty-mitaka
+      source: *openstack-origin
     to:
-    - '1'
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '1'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
   nova-cloud-controller:
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
-      openstack-origin: cloud:trusty-mitaka
+      openstack-origin: *openstack-origin
     to:
-    - '2'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
+      - '6'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
     options:
-      openstack-origin: cloud:trusty-mitaka
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
     to:
-    - '4'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:trusty-mitaka
-    to:
-    - '5'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: cloud:trusty-mitaka
-    to:
-    - '6'
-  percona-cluster:
-    charm: cs:trusty/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
+      - '7'
+      - '8'
 relations:
-- - 'neutron-openvswitch:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'neutron-openvswitch:neutron-plugin'
-  - 'nova-compute:neutron-plugin'
-- - 'neutron-openvswitch:neutron-plugin-api'
-  - 'neutron-api:neutron-plugin-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'neutron-api:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'neutron-api:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
+  - - 'neutron-api:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-gateway:neutron-plugin-api'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'nova-cloud-controller:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml
index 275f977e..77b9edc4 100644
--- a/tests/bundles/xenial-mitaka.yaml
+++ b/tests/bundles/xenial-mitaka.yaml
@@ -1,89 +1,133 @@
-series: xenial
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: &series xenial
 
 machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
+  0:
+    constraints: "mem=3072M"
+  1: {}
+  2: {}
+  3: {}
+  4: {}
+  5: {}
+  6: {}
+  7:
+    constraints: "root-disk=20G mem=4G"
+  8:
+    constraints: "root-disk=20G mem=4G"
 
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
 applications:
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
+    options:
+      source: *openstack-origin
     to:
-    - '1'
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '1'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
   nova-cloud-controller:
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
+      openstack-origin: *openstack-origin
     to:
-    - '2'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
+      - '6'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
     to:
-    - '3'
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    to:
-    - '4'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-    - '5'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    to:
-    - '6'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
+      - '7'
+      - '8'
 relations:
-- - 'neutron-openvswitch:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'neutron-openvswitch:neutron-plugin'
-  - 'nova-compute:neutron-plugin'
-- - 'neutron-openvswitch:neutron-plugin-api'
-  - 'neutron-api:neutron-plugin-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'neutron-api:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'neutron-api:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
+  - - 'neutron-api:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-gateway:neutron-plugin-api'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-openvswitch:neutron-plugin-api'
+  - - 'nova-cloud-controller:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml
index b8ed1fef..7eb2b2a0 100644
--- a/tests/bundles/xenial-ocata.yaml
+++ b/tests/bundles/xenial-ocata.yaml
@@ -1,98 +1,133 @@
-series: xenial
+variables:
+  openstack-origin: &openstack-origin cloud:xenial-ocata
+
+series: &series xenial
 
 machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
+  0:
+    constraints: "mem=3072M"
+  1: {}
+  2: {}
+  3: {}
+  4: {}
+  5: {}
+  6: {}
+  7:
+    constraints: "root-disk=20G mem=4G"
+  8:
+    constraints: "root-disk=20G mem=4G"
 
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
 applications:
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
     options:
-      openstack-origin: cloud:xenial-ocata
+      source: *openstack-origin
     to:
-    - '1'
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '1'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
   nova-cloud-controller:
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
-      openstack-origin: cloud:xenial-ocata
+      openstack-origin: *openstack-origin
     to:
-    - '2'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
+      - '6'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
     options:
-      openstack-origin: cloud:xenial-ocata
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
     to:
-    - '4'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-ocata
-    to:
-    - '5'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-ocata
-    to:
-    - '6'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
+      - '7'
+      - '8'
 relations:
-- - 'neutron-openvswitch:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'neutron-openvswitch:neutron-plugin'
-  - 'nova-compute:neutron-plugin'
-- - 'neutron-openvswitch:neutron-plugin-api'
-  - 'neutron-api:neutron-plugin-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'neutron-api:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'neutron-api:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
+  - - 'neutron-api:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-gateway:neutron-plugin-api'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-openvswitch:neutron-plugin-api'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'nova-cloud-controller:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml
index e0e2d2a8..275bcbed 100644
--- a/tests/bundles/xenial-pike.yaml
+++ b/tests/bundles/xenial-pike.yaml
@@ -1,98 +1,133 @@
-series: xenial
+variables:
+  openstack-origin: &openstack-origin cloud:xenial-pike
+
+series: &series xenial
 
 machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
+  0:
+    constraints: "mem=3072M"
+  1: {}
+  2: {}
+  3: {}
+  4: {}
+  5: {}
+  6: {}
+  7:
+    constraints: "root-disk=20G mem=4G"
+  8:
+    constraints: "root-disk=20G mem=4G"
 
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
 applications:
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
     options:
-      openstack-origin: cloud:xenial-pike
+      source: *openstack-origin
     to:
-    - '1'
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '1'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
   nova-cloud-controller:
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
-      openstack-origin: cloud:xenial-pike
+      openstack-origin: *openstack-origin
     to:
-    - '2'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
+      - '6'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
     options:
-      openstack-origin: cloud:xenial-pike
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
     to:
-    - '4'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-pike
-    to:
-    - '5'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-pike
-    to:
-    - '6'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
+      - '7'
+      - '8'
 relations:
-- - 'neutron-openvswitch:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'neutron-openvswitch:neutron-plugin'
-  - 'nova-compute:neutron-plugin'
-- - 'neutron-openvswitch:neutron-plugin-api'
-  - 'neutron-api:neutron-plugin-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'neutron-api:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'neutron-api:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
+  - - 'neutron-api:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-gateway:neutron-plugin-api'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-openvswitch:neutron-plugin-api'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'nova-cloud-controller:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
diff --git a/tests/bundles/xenial-queens-dvr-snat.yaml b/tests/bundles/xenial-queens-dvr-snat.yaml
new file mode 100644
index 00000000..0f3cac98
--- /dev/null
+++ b/tests/bundles/xenial-queens-dvr-snat.yaml
@@ -0,0 +1,125 @@
+variables:
+  openstack-origin: &openstack-origin cloud:xenial-queens
+
+series: &series xenial
+
+machines:
+  0:
+    constraints: "mem=3072M"
+  1: {}
+  2: {}
+  3: {}
+  4: {}
+  5: {}
+  6:
+    constraints: "root-disk=20G mem=4G"
+  7:
+    constraints: "root-disk=20G mem=4G"
+
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '1'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      overlay-network-type: 'vxlan'
+      l2-population: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+      enable-dvr: True
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+    options:
+      use-dvr-snat: True
+      bridge-mappings: physnet1:br-ex
+      enable-local-dhcp-and-metadata: True
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+      - '7'
+relations:
+  - - 'neutron-api:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-openvswitch:neutron-plugin-api'
+  - - 'nova-cloud-controller:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml
deleted file mode 100644
index 74ee3e5d..00000000
--- a/tests/bundles/xenial-queens.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-series: xenial
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-
-applications:
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-    to:
-    - '1'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:xenial-queens
-    to:
-    - '2'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-    to:
-    - '4'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-    to:
-    - '5'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-    to:
-    - '6'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  neutron-openvswitch:
-    charm: ../../../neutron-openvswitch
-
-relations:
-- - 'neutron-openvswitch:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'neutron-openvswitch:neutron-plugin'
-  - 'nova-compute:neutron-plugin'
-- - 'neutron-openvswitch:neutron-plugin-api'
-  - 'neutron-api:neutron-plugin-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'neutron-api:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'neutron-api:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:shared-db'
-  - 'percona-cluster:shared-db'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 264eee4e..ded91af4 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,25 +1,29 @@
 charm_name: neutron-openvswitch
 
 smoke_bundles:
-  - bionic-ussuri
+  - bionic-ussuri-dvr-snat
 
 gate_bundles:
   - xenial-mitaka
   - xenial-ocata
   - xenial-pike
-  - xenial-queens
-  - bionic-queens
-  - bionic-rocky
-  - bionic-stein
-  - bionic-train
-  - bionic-ussuri
-  - focal-ussuri
+  - xenial-queens-dvr-snat
+  - bionic-queens-dvr-snat
+  - bionic-rocky-dvr-snat
+  - bionic-stein-dvr-snat
+  - bionic-train-dvr-snat
+  - bionic-ussuri-dvr-snat
+  - focal-ussuri-dvr-snat
 
-dev_bundles:
-  - focal-ussuri
+configure:
+  - zaza.openstack.charm_tests.glance.setup.add_lts_image
+  - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
+  - zaza.openstack.charm_tests.nova.setup.create_flavors
+  - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
 
 tests:
+  - zaza.openstack.charm_tests.neutron.tests.NeutronNetworkingTest
   - zaza.openstack.charm_tests.neutron.tests.NeutronOpenvSwitchTest
 tests_options:
   force_deploy:
-    - focal-ussuri
+    - focal-ussuri-dvr-snat