From 725b2911d0951589a1f3a5c2221591a6a5783ab5 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 5 Mar 2021 13:46:46 +0000 Subject: [PATCH] Test bundles for focal-wallaby and hirsute-wallaby These are the test bundles (and any associated changes) for focal-wallaby and hirsute-wallaby support. hisute-wallaby test is disabled (moved to dev) due to [1]. [1] https://github.com/juju-solutions/layer-basic/issues/194 Change-Id: I07fe7d323953f5b50fe8a77e7c7933d0f1e08b85 --- osci.yaml | 4 +- src/tests/bundles/focal-wallaby.yaml | 180 ++++++++++++++++++ src/tests/bundles/hirsute-wallaby.yaml | 180 ++++++++++++++++++ .../bundles/overlays/focal-wallaby.yaml.j2 | 1 + .../bundles/overlays/hirsute-wallaby.yaml.j2 | 1 + src/tests/tests.yaml | 10 +- 6 files changed, 374 insertions(+), 2 deletions(-) create mode 100644 src/tests/bundles/focal-wallaby.yaml create mode 100644 src/tests/bundles/hirsute-wallaby.yaml create mode 120000 src/tests/bundles/overlays/focal-wallaby.yaml.j2 create mode 120000 src/tests/bundles/overlays/hirsute-wallaby.yaml.j2 diff --git a/osci.yaml b/osci.yaml index d47d534..c8408f9 100644 --- a/osci.yaml +++ b/osci.yaml @@ -9,7 +9,9 @@ - bionic-ussuri - focal-ussuri - focal-victoria + - focal-wallaby - groovy-victoria + - hirsute-wallaby vars: needs_charm_build: true - charm_build_name: neutron-api-plugin-arista \ No newline at end of file + charm_build_name: neutron-api-plugin-arista diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml new file mode 100644 index 0000000..6f09f4e --- /dev/null +++ b/src/tests/bundles/focal-wallaby.yaml @@ -0,0 +1,180 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-wallaby + +series: &series focal + +applications: + + 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 + neutron-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + mysql-innodb-cluster: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + enable-ml2-dns: False + flat-network-providers: default + vlan-ranges: default:1000:3000 + vni-ranges: 1001:2000 + neutron-security-groups: True + overlay-network-type: vxlan + use-internal-endpoints: True + enable-l3ha: True + dhcp-agents-per-network: 2 + enable-ml2-port-security: True + default-tenant-network-type: vlan + l2-population: False + ipv4-ptr-zone-prefix-size: + reverse-dns-lookup: False + dns-domain: + manage-neutron-plugin-legacy-mode: False + + neutron-openvswitch: + charm: cs:~openstack-charmers-next/neutron-openvswitch + num_units: 0 + options: + prevent-arp-spoofing: True + firewall-driver: openvswitch + enable-local-dhcp-and-metadata: True + bridge-mappings: default:br-data + data-port: ens7 + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + network-manager: Neutron + + neutron-api-plugin-arista: + charm: ../../../neutron-api-plugin-arista + num_units: 0 + options: + source: *openstack-origin + + # Fake IP, will be set to arista-virt-test-fixture's IP address on test + # setup: + eapi-host: 192.0.2.42 + eapi-username: admin + eapi-password: password123 + api-type: EAPI + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 2 + constraints: mem=4G cores=4 + options: + openstack-origin: *openstack-origin + config-flags: default_ephemeral_format=ext4 + enable-live-migration: true + enable-resize: true + migration-auth-type: ssh + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + + lldpd: + charm: cs:lldpd + options: + interfaces-regex: 'en*' + short-name: true + + arista-virt-test-fixture: + charm: cs:~openstack-charmers-next/arista-virt-test-fixture + num_units: 1 + constraints: mem=4G + +relations: +- - keystone:shared-db + - keystone-mysql-router:shared-db +- - nova-cloud-controller:shared-db + - nova-mysql-router:shared-db +- - glance:shared-db + - glance-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 + +- - nova-compute:amqp + - rabbitmq-server:amqp +- - nova-cloud-controller:identity-service + - keystone:identity-service +- - glance:identity-service + - keystone:identity-service +- - neutron-api:identity-service + - keystone:identity-service +- - neutron-openvswitch:neutron-plugin-api + - neutron-api:neutron-plugin-api +- - neutron-api:amqp + - rabbitmq-server:amqp +- - glance:amqp + - rabbitmq-server:amqp +- - nova-cloud-controller:image-service + - glance:image-service +- - nova-compute:image-service + - glance:image-service +- - nova-cloud-controller:cloud-compute + - nova-compute:cloud-compute +- - nova-cloud-controller:amqp + - rabbitmq-server:amqp +- - nova-compute:neutron-plugin + - neutron-openvswitch:neutron-plugin +- - neutron-openvswitch:amqp + - rabbitmq-server:amqp +- - nova-cloud-controller:neutron-api + - neutron-api:neutron-api +- - neutron-api + - neutron-api-plugin-arista +- - neutron-api:neutron-plugin-api-subordinate + - neutron-api-plugin-arista:neutron-plugin-api-subordinate +- - lldpd + - nova-compute +- - placement:identity-service + - keystone:identity-service +- - placement:placement + - nova-cloud-controller:placement diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml new file mode 100644 index 0000000..d2e85ba --- /dev/null +++ b/src/tests/bundles/hirsute-wallaby.yaml @@ -0,0 +1,180 @@ +variables: + openstack-origin: &openstack-origin distro + +series: &series hirsute + +applications: + + 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 + neutron-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + mysql-innodb-cluster: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + enable-ml2-dns: False + flat-network-providers: default + vlan-ranges: default:1000:3000 + vni-ranges: 1001:2000 + neutron-security-groups: True + overlay-network-type: vxlan + use-internal-endpoints: True + enable-l3ha: True + dhcp-agents-per-network: 2 + enable-ml2-port-security: True + default-tenant-network-type: vlan + l2-population: False + ipv4-ptr-zone-prefix-size: + reverse-dns-lookup: False + dns-domain: + manage-neutron-plugin-legacy-mode: False + + neutron-openvswitch: + charm: cs:~openstack-charmers-next/neutron-openvswitch + num_units: 0 + options: + prevent-arp-spoofing: True + firewall-driver: openvswitch + enable-local-dhcp-and-metadata: True + bridge-mappings: default:br-data + data-port: ens7 + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + network-manager: Neutron + + neutron-api-plugin-arista: + charm: ../../../neutron-api-plugin-arista + num_units: 0 + options: + source: *openstack-origin + + # Fake IP, will be set to arista-virt-test-fixture's IP address on test + # setup: + eapi-host: 192.0.2.42 + eapi-username: admin + eapi-password: password123 + api-type: EAPI + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 2 + constraints: mem=4G cores=4 + options: + openstack-origin: *openstack-origin + config-flags: default_ephemeral_format=ext4 + enable-live-migration: true + enable-resize: true + migration-auth-type: ssh + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + + lldpd: + charm: cs:lldpd + options: + interfaces-regex: 'en*' + short-name: true + + arista-virt-test-fixture: + charm: cs:~openstack-charmers-next/arista-virt-test-fixture + num_units: 1 + constraints: mem=4G + +relations: +- - keystone:shared-db + - keystone-mysql-router:shared-db +- - nova-cloud-controller:shared-db + - nova-mysql-router:shared-db +- - glance:shared-db + - glance-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 + +- - nova-compute:amqp + - rabbitmq-server:amqp +- - nova-cloud-controller:identity-service + - keystone:identity-service +- - glance:identity-service + - keystone:identity-service +- - neutron-api:identity-service + - keystone:identity-service +- - neutron-openvswitch:neutron-plugin-api + - neutron-api:neutron-plugin-api +- - neutron-api:amqp + - rabbitmq-server:amqp +- - glance:amqp + - rabbitmq-server:amqp +- - nova-cloud-controller:image-service + - glance:image-service +- - nova-compute:image-service + - glance:image-service +- - nova-cloud-controller:cloud-compute + - nova-compute:cloud-compute +- - nova-cloud-controller:amqp + - rabbitmq-server:amqp +- - nova-compute:neutron-plugin + - neutron-openvswitch:neutron-plugin +- - neutron-openvswitch:amqp + - rabbitmq-server:amqp +- - nova-cloud-controller:neutron-api + - neutron-api:neutron-api +- - neutron-api + - neutron-api-plugin-arista +- - neutron-api:neutron-plugin-api-subordinate + - neutron-api-plugin-arista:neutron-plugin-api-subordinate +- - lldpd + - nova-compute +- - placement:identity-service + - keystone:identity-service +- - placement:placement + - nova-cloud-controller:placement diff --git a/src/tests/bundles/overlays/focal-wallaby.yaml.j2 b/src/tests/bundles/overlays/focal-wallaby.yaml.j2 new file mode 120000 index 0000000..4dfadc8 --- /dev/null +++ b/src/tests/bundles/overlays/focal-wallaby.yaml.j2 @@ -0,0 +1 @@ +arista-virt-test-fixture-image.yaml.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/hirsute-wallaby.yaml.j2 b/src/tests/bundles/overlays/hirsute-wallaby.yaml.j2 new file mode 120000 index 0000000..4dfadc8 --- /dev/null +++ b/src/tests/bundles/overlays/hirsute-wallaby.yaml.j2 @@ -0,0 +1 @@ +arista-virt-test-fixture-image.yaml.j2 \ No newline at end of file diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 3a57f4b..e347254 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,6 +1,8 @@ charm_name: neutron-api-plugin-arista + smoke_bundles: - bionic-train + gate_bundles: - bionic-queens - bionic-stein @@ -8,17 +10,23 @@ gate_bundles: - bionic-ussuri - focal-ussuri - focal-victoria +- focal-wallaby - groovy-victoria + dev_bundles: - xenial-queens - bionic-rocky +- hirsute-wallaby before_deploy: - zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image + configure: - zaza.openstack.charm_tests.neutron_arista.setup.test_fixture + tests: - zaza.openstack.charm_tests.neutron_arista.tests.NeutronCreateAristaNetworkTest + tests_options: force_deploy: - - groovy-victoria + - hirsute-wallaby