Update functional test definitions

Change-Id: I3e83f5c7b186687de617bc5f40fc31f5d1fbbbde

src/tests/bundles/bionic-rocky-functional.yaml

@@ -0,0 +1,42 @@
+relations:
+- [neutron-dynamic-routing, rabbitmq-server]
+- [neutron-dynamic-routing, quagga]
+- [keystone, mysql]
+- [neutron-api, mysql]
+- [neutron-api, rabbitmq-server]
+- [neutron-api, keystone]
+applications:
+  keystone:
+    charm: cs:~openstack-charmers-next/bionic/keystone
+    constraints: mem=1G
+    num_units: 1
+    options: {admin-password: openstack, admin-token: ubuntutesting, openstack-origin: 'cloud:bionic-rocky'}
+    series: bionic
+  mysql:
+    charm: cs:~openstack-charmers-next/bionic/percona-cluster
+    constraints: mem=4G
+    num_units: 1
+    options: {source: 'cloud:bionic-rocky'}
+    series: bionic
+  neutron-api:
+    charm: cs:~openstack-charmers-next/bionic/neutron-api
+    constraints: mem=1G
+    num_units: 1
+    options: {flat-network-providers: physnet1, neutron-security-groups: true, openstack-origin: 'cloud:bionic-rocky'}
+    series: bionic
+  neutron-dynamic-routing:
+    charm: ../../../neutron-dynamic-routing
+    num_units: 1
+    options: {openstack-origin: 'cloud:bionic-rocky'}
+    series: bionic
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
+    constraints: mem=1G
+    num_units: 1
+    options: {source: 'cloud:bionic-rocky'}
+    series: bionic
+  quagga:
+    charm: cs:~openstack-charmers-next/bionic/quagga
+    num_units: 1
+    series: bionic
+

src/tests/bundles/cosmic-rocky-functional.yaml

@@ -0,0 +1,40 @@
+series: cosmic
+relations:
+- [neutron-dynamic-routing, rabbitmq-server]
+- [neutron-dynamic-routing, quagga]
+- [keystone, mysql]
+- [neutron-api, mysql]
+- [neutron-api, rabbitmq-server]
+- [neutron-api, keystone]
+applications:
+  keystone:
+    charm: cs:~openstack-charmers-next/bionic/keystone
+    constraints: mem=1G
+    num_units: 1
+    options: {admin-password: openstack, admin-token: ubuntutesting}
+    series: cosmic
+  mysql:
+    charm: cs:~openstack-charmers-next/bionic/percona-cluster
+    constraints: mem=4G
+    num_units: 1
+    series: cosmic
+  neutron-api:
+    charm: cs:~openstack-charmers-next/bionic/neutron-api
+    constraints: mem=1G
+    num_units: 1
+    options: {flat-network-providers: physnet1, neutron-security-groups: true}
+    series: cosmic
+  neutron-dynamic-routing:
+    charm: ../../../neutron-dynamic-routing
+    num_units: 1
+    series: cosmic
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
+    constraints: mem=1G
+    num_units: 1
+    series: cosmic
+  quagga:
+    charm: cs:~openstack-charmers-next/bionic/quagga
+    num_units: 1
+    series: cosmic
+

src/tests/tests.yaml

@@ -1,7 +1,9 @@
 charm_name: neutron-dynamic-routing
 configure:
 - zaza.charm_tests.dragent.configure.setup
-dev_bundles: null
+dev_bundles:
+- bionic-rocky-functional
+- cosmic-rocky-functional
 gate_bundles:
 - bionic-queens-functional
 - xenial-pike-functional

src/tox.ini

@@ -35,3 +35,8 @@ commands =
 
 [testenv:venv]
 commands = {posargs}
+
+[testenv:func-dev]
+basepython = python3
+commands =
+    functest-run-suite --keep-model --dev