Merge "[Stateless SG] Add negative API tests for Stateless SG"
diff --git a/neutron_tempest_plugin/scenario/test_security_groups.py b/neutron_tempest_plugin/scenario/test_security_groups.py
index 7eae2eb..16313a3 100644
--- a/neutron_tempest_plugin/scenario/test_security_groups.py
+++ b/neutron_tempest_plugin/scenario/test_security_groups.py
@@ -140,8 +140,9 @@
**sg_kwargs)
self.create_loginable_secgroup_rule(
secgroup_id=ssh_secgrp['security_group']['id'])
- self.create_ingress_metadata_secgroup_rule(
- secgroup_id=ssh_secgrp['security_group']['id'])
+ if self.stateless_sg:
+ self.create_ingress_metadata_secgroup_rule(
+ secgroup_id=ssh_secgrp['security_group']['id'])
icmp_secgrp = self.os_primary.network_client.create_security_group(
name=icmp_secgrp_name,
**sg_kwargs)
@@ -235,8 +236,9 @@
**sg_kwargs)
self.create_pingable_secgroup_rule(
secgroup_id=icmp_secgrp['security_group']['id'])
- self.create_ingress_metadata_secgroup_rule(
- secgroup_id=ssh_secgrp['security_group']['id'])
+ if self.stateless_sg:
+ self.create_ingress_metadata_secgroup_rule(
+ secgroup_id=ssh_secgrp['security_group']['id'])
for sec_grp in (ssh_secgrp, icmp_secgrp):
self.security_groups.append(sec_grp['security_group'])
security_groups_list = [{'name': ssh_secgrp_name},
@@ -294,8 +296,9 @@
# configure sec group to support SSH connectivity
self.create_loginable_secgroup_rule(
secgroup_id=ssh_secgrp['security_group']['id'])
- self.create_ingress_metadata_secgroup_rule(
- secgroup_id=ssh_secgrp['security_group']['id'])
+ if self.stateless_sg:
+ self.create_ingress_metadata_secgroup_rule(
+ secgroup_id=ssh_secgrp['security_group']['id'])
# spawn two instances with the sec group created
server_ssh_clients, fips, servers = self.create_vm_testing_sec_grp(
security_groups=[{'name': ssh_secgrp_name}])
@@ -426,8 +429,9 @@
secgroup_id=secgrp['security_group']['id'])
self.create_pingable_secgroup_rule(
secgroup_id=secgrp['security_group']['id'])
- self.create_ingress_metadata_secgroup_rule(
- secgroup_id=secgrp['security_group']['id'])
+ if self.stateless_sg:
+ self.create_ingress_metadata_secgroup_rule(
+ secgroup_id=secgrp['security_group']['id'])
# add security group to cleanup
self.security_groups.append(secgrp['security_group'])
# create two ports with fixed IPs and the security group created
diff --git a/zuul.d/base-nested-switch.yaml b/zuul.d/base-nested-switch.yaml
index 9689d82..df40e21 100644
--- a/zuul.d/base-nested-switch.yaml
+++ b/zuul.d/base-nested-switch.yaml
@@ -13,20 +13,21 @@
name: neutron-tempest-plugin-base-nested-switch
parent: neutron-tempest-plugin-base
abstract: true
- branches: ^(?!stable/(queens|rocky|stein|train|ussuri|victoria)).*$
+ branches: ^(?!stable/(queens|rocky|stein|train|ussuri|victoria|wallaby)).*$
# Comment nodeset and vars to switch back to non nested nodes
nodeset: neutron-nested-virt-ubuntu-focal
vars:
devstack_localrc:
LIBVIRT_TYPE: kvm
- LIBVIRT_CPU_MODE: host-passthrough
- CIRROS_VERSION: 0.5.1
- DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-disk
- DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-disk.img
+ # cirros 0.6.1 not booting when host-passthrough is used
+ # LIBVIRT_CPU_MODE: host-passthrough
+ CIRROS_VERSION: 0.6.1
+ DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-disk
+ DEFAULT_IMAGE_FILE_NAME: cirros-0.6.1-x86_64-disk.img
# Base nested switch job for EM releases
- job:
name: neutron-tempest-plugin-base-nested-switch
parent: neutron-tempest-plugin-base
abstract: true
- branches: ^(stable/(queens|rocky|stein|train|ussuri|victoria)).*$
+ branches: ^(stable/(queens|rocky|stein|train|ussuri|victoria|wallaby)).*$
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 93c8fe2..cedb13b 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -27,9 +27,9 @@
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}"
PHYSICAL_NETWORK: public
IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
- CIRROS_VERSION: 0.5.1
- DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
- DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
+ CIRROS_VERSION: 0.6.1
+ DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-uec
+ DEFAULT_IMAGE_FILE_NAME: cirros-0.6.1-x86_64-uec.tar.gz
ADVANCED_IMAGE_NAME: ubuntu-20.04-minimal-cloudimg-amd64
ADVANCED_INSTANCE_TYPE: ntp_image_256M
ADVANCED_INSTANCE_USER: ubuntu
@@ -724,9 +724,9 @@
USE_PYTHON3: true
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}"
PHYSICAL_NETWORK: default
- CIRROS_VERSION: 0.5.1
- DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
- DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
+ CIRROS_VERSION: 0.6.1
+ DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-uec
+ DEFAULT_IMAGE_FILE_NAME: cirros-0.6.1-x86_64-uec.tar.gz
IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
ADVANCED_IMAGE_NAME: ubuntu-20.04-minimal-cloudimg-amd64
ADVANCED_INSTANCE_TYPE: ntp_image_256M
@@ -968,6 +968,11 @@
- flow_classifier
- sfc
devstack_localrc:
+ # TODO(slaweq): check why traceroute output is different in Cirros >
+ # 0.6.1 which is causing failures of the networking-sfc jobs
+ CIRROS_VERSION: 0.5.1
+ DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
+ DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
Q_AGENT: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 6adf860..bc048a1 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -85,7 +85,6 @@
- neutron-tempest-plugin-scenario-linuxbridge-train
- neutron-tempest-plugin-scenario-openvswitch-train
- neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-train
- - neutron-tempest-plugin-designate-scenario-train
gate:
jobs:
- neutron-tempest-plugin-api-train
@@ -216,7 +215,6 @@
templates:
- build-openstack-docs-pti
- neutron-tempest-plugin-jobs
- - neutron-tempest-plugin-jobs-wallaby
- neutron-tempest-plugin-jobs-xena
- neutron-tempest-plugin-jobs-yoga
- neutron-tempest-plugin-jobs-zed
@@ -226,24 +224,20 @@
check:
jobs:
- neutron-tempest-plugin-sfc
- - neutron-tempest-plugin-sfc-wallaby
- neutron-tempest-plugin-sfc-xena
- neutron-tempest-plugin-sfc-yoga
- neutron-tempest-plugin-sfc-zed
- neutron-tempest-plugin-bgpvpn-bagpipe
- - neutron-tempest-plugin-bgpvpn-bagpipe-wallaby
- neutron-tempest-plugin-bgpvpn-bagpipe-xena
- neutron-tempest-plugin-bgpvpn-bagpipe-yoga
- neutron-tempest-plugin-bgpvpn-bagpipe-zed
- neutron-tempest-plugin-dynamic-routing
- - neutron-tempest-plugin-dynamic-routing-wallaby
- neutron-tempest-plugin-dynamic-routing-xena
- neutron-tempest-plugin-dynamic-routing-yoga
- neutron-tempest-plugin-dynamic-routing-zed
- neutron-tempest-plugin-fwaas
- neutron-tempest-plugin-fwaas-zed
- neutron-tempest-plugin-vpnaas
- - neutron-tempest-plugin-vpnaas-wallaby
- neutron-tempest-plugin-vpnaas-xena
- neutron-tempest-plugin-vpnaas-yoga
- neutron-tempest-plugin-vpnaas-zed
diff --git a/zuul.d/train_jobs.yaml b/zuul.d/train_jobs.yaml
index b9a9921..159feb2 100644
--- a/zuul.d/train_jobs.yaml
+++ b/zuul.d/train_jobs.yaml
@@ -239,28 +239,6 @@
network_api_extensions_common: *api_extensions
- job:
- name: neutron-tempest-plugin-designate-scenario-train
- parent: neutron-tempest-plugin-designate-scenario
- nodeset: openstack-single-node-bionic
- override-checkout: stable/train
- required-projects:
- - openstack/neutron
- - name: openstack/neutron-tempest-plugin
- override-checkout: 1.5.0
- - openstack/tempest
- - name: openstack/designate-tempest-plugin
- override-checkout: 0.7.0
- vars:
- network_api_extensions_common: *api_extensions
- devstack_localrc:
- # NOTE(bcafarel) guestmount binary not available on host OS
- IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
- ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
- ADVANCED_INSTANCE_TYPE: ds512M
- ADVANCED_INSTANCE_USER: ubuntu
- CUSTOMIZE_IMAGE: false
-
-- job:
name: neutron-tempest-plugin-sfc-train
parent: neutron-tempest-plugin-sfc
nodeset: openstack-single-node-bionic
diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml
index d7b2f90..a79261d 100644
--- a/zuul.d/victoria_jobs.yaml
+++ b/zuul.d/victoria_jobs.yaml
@@ -1,6 +1,7 @@
- job:
name: neutron-tempest-plugin-api-victoria
parent: neutron-tempest-plugin-base
+ nodeset: openstack-single-node-focal
override-checkout: stable/victoria
required-projects: &required-projects-victoria
- openstack/neutron
@@ -242,6 +243,7 @@
- job:
name: neutron-tempest-plugin-dvr-multinode-scenario-victoria
parent: neutron-tempest-plugin-dvr-multinode-scenario
+ nodeset: openstack-two-node-focal
override-checkout: stable/victoria
required-projects: *required-projects-victoria
vars:
@@ -271,6 +273,7 @@
- job:
name: neutron-tempest-plugin-sfc-victoria
parent: neutron-tempest-plugin-sfc
+ nodeset: openstack-single-node-focal
override-checkout: stable/victoria
required-projects: *required-projects-victoria
vars:
@@ -279,6 +282,7 @@
- job:
name: neutron-tempest-plugin-bgpvpn-bagpipe-victoria
parent: neutron-tempest-plugin-bgpvpn-bagpipe
+ nodeset: openstack-single-node-focal
override-checkout: stable/victoria
required-projects: *required-projects-victoria
vars:
@@ -287,6 +291,7 @@
- job:
name: neutron-tempest-plugin-dynamic-routing-victoria
parent: neutron-tempest-plugin-dynamic-routing
+ nodeset: openstack-single-node-focal
override-checkout: stable/victoria
required-projects: *required-projects-victoria
vars:
@@ -295,6 +300,7 @@
- job:
name: neutron-tempest-plugin-vpnaas-victoria
parent: neutron-tempest-plugin-vpnaas
+ nodeset: openstack-single-node-focal
override-checkout: stable/victoria
required-projects: *required-projects-victoria
vars:
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index 17a5931..6f4648a 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -1,7 +1,13 @@
- job:
name: neutron-tempest-plugin-api-wallaby
parent: neutron-tempest-plugin-base
+ nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
+ required-projects: &required-projects-wallaby
+ - openstack/neutron
+ - name: openstack/neutron-tempest-plugin
+ override-checkout: 1.8.0
+ - openstack/tempest
vars:
tempest_concurrency: 4
tempest_test_regex: ^neutron_tempest_plugin\.api
@@ -93,6 +99,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-wallaby
parent: neutron-tempest-plugin-openvswitch
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -112,6 +119,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-wallaby
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -131,6 +139,7 @@
name: neutron-tempest-plugin-scenario-linuxbridge-wallaby
parent: neutron-tempest-plugin-linuxbridge
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -150,6 +159,7 @@
name: neutron-tempest-plugin-scenario-ovn-wallaby
parent: neutron-tempest-plugin-ovn
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -167,7 +177,9 @@
- job:
name: neutron-tempest-plugin-dvr-multinode-scenario-wallaby
parent: neutron-tempest-plugin-dvr-multinode-scenario
+ nodeset: openstack-two-node-focal
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
@@ -175,33 +187,48 @@
name: neutron-tempest-plugin-designate-scenario-wallaby
parent: neutron-tempest-plugin-designate-scenario
override-checkout: stable/wallaby
+ required-projects:
+ - openstack/neutron
+ - name: openstack/neutron-tempest-plugin
+ override-checkout: 1.8.0
+ - openstack/tempest
+ - name: openstack/designate-tempest-plugin
+ override-checkout: 0.16.0
vars:
network_api_extensions_common: *api_extensions
- job:
name: neutron-tempest-plugin-sfc-wallaby
parent: neutron-tempest-plugin-sfc
+ nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
- job:
name: neutron-tempest-plugin-bgpvpn-bagpipe-wallaby
parent: neutron-tempest-plugin-bgpvpn-bagpipe
+ nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
network_api_extensions: *api_extensions
- job:
name: neutron-tempest-plugin-dynamic-routing-wallaby
parent: neutron-tempest-plugin-dynamic-routing
+ nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
- job:
name: neutron-tempest-plugin-vpnaas-wallaby
parent: neutron-tempest-plugin-vpnaas
+ nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index 2cd82d1..595b4d8 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -1,6 +1,7 @@
- job:
name: neutron-tempest-plugin-api-xena
parent: neutron-tempest-plugin-base
+ nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
tempest_concurrency: 4
@@ -169,6 +170,7 @@
- job:
name: neutron-tempest-plugin-dvr-multinode-scenario-xena
parent: neutron-tempest-plugin-dvr-multinode-scenario
+ nodeset: openstack-two-node-focal
override-checkout: stable/xena
vars:
network_api_extensions_common: *api_extensions
@@ -183,6 +185,7 @@
- job:
name: neutron-tempest-plugin-sfc-xena
parent: neutron-tempest-plugin-sfc
+ nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
network_api_extensions_common: *api_extensions
@@ -190,6 +193,7 @@
- job:
name: neutron-tempest-plugin-bgpvpn-bagpipe-xena
parent: neutron-tempest-plugin-bgpvpn-bagpipe
+ nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
network_api_extensions: *api_extensions
@@ -197,6 +201,7 @@
- job:
name: neutron-tempest-plugin-dynamic-routing-xena
parent: neutron-tempest-plugin-dynamic-routing
+ nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
network_api_extensions_common: *api_extensions
@@ -204,6 +209,7 @@
- job:
name: neutron-tempest-plugin-vpnaas-xena
parent: neutron-tempest-plugin-vpnaas
+ nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
network_api_extensions_common: *api_extensions
@@ -211,6 +217,7 @@
- job:
name: neutron-tempest-plugin-tap-as-a-service-xena
parent: neutron-tempest-plugin-tap-as-a-service
+ nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
network_api_extensions_common: *api_extensions
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index 46b9ca2..d47fc93 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -1,6 +1,7 @@
- job:
name: neutron-tempest-plugin-api-yoga
parent: neutron-tempest-plugin-base
+ nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
tempest_concurrency: 4
@@ -173,6 +174,7 @@
- job:
name: neutron-tempest-plugin-dvr-multinode-scenario-yoga
parent: neutron-tempest-plugin-dvr-multinode-scenario
+ nodeset: openstack-two-node-focal
override-checkout: stable/yoga
vars:
network_api_extensions_common: *api_extensions
@@ -187,6 +189,7 @@
- job:
name: neutron-tempest-plugin-sfc-yoga
parent: neutron-tempest-plugin-sfc
+ nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
network_api_extensions_common: *api_extensions
@@ -194,6 +197,7 @@
- job:
name: neutron-tempest-plugin-bgpvpn-bagpipe-yoga
parent: neutron-tempest-plugin-bgpvpn-bagpipe
+ nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
network_api_extensions: *api_extensions
@@ -201,6 +205,7 @@
- job:
name: neutron-tempest-plugin-dynamic-routing-yoga
parent: neutron-tempest-plugin-dynamic-routing
+ nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
network_api_extensions_common: *api_extensions
@@ -208,6 +213,7 @@
- job:
name: neutron-tempest-plugin-vpnaas-yoga
parent: neutron-tempest-plugin-vpnaas
+ nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
network_api_extensions_common: *api_extensions
@@ -215,6 +221,7 @@
- job:
name: neutron-tempest-plugin-tap-as-a-service-yoga
parent: neutron-tempest-plugin-tap-as-a-service
+ nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
network_api_extensions_common: *api_extensions
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index f6e143f..a11c2c8 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -185,6 +185,7 @@
- job:
name: neutron-tempest-plugin-dvr-multinode-scenario-zed
parent: neutron-tempest-plugin-dvr-multinode-scenario
+ nodeset: openstack-two-node-focal
override-checkout: stable/zed
vars:
network_api_extensions_common: *api_extensions
@@ -199,6 +200,7 @@
- job:
name: neutron-tempest-plugin-sfc-zed
parent: neutron-tempest-plugin-sfc
+ nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
network_api_extensions_common: *api_extensions
@@ -206,6 +208,7 @@
- job:
name: neutron-tempest-plugin-bgpvpn-bagpipe-zed
parent: neutron-tempest-plugin-bgpvpn-bagpipe
+ nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
network_api_extensions: *api_extensions
@@ -213,6 +216,7 @@
- job:
name: neutron-tempest-plugin-dynamic-routing-zed
parent: neutron-tempest-plugin-dynamic-routing
+ nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
network_api_extensions_common: *api_extensions
@@ -220,6 +224,7 @@
- job:
name: neutron-tempest-plugin-fwaas-zed
parent: neutron-tempest-plugin-fwaas
+ nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
network_api_extensions_common: *api_extensions
@@ -227,6 +232,7 @@
- job:
name: neutron-tempest-plugin-vpnaas-zed
parent: neutron-tempest-plugin-vpnaas
+ nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
network_api_extensions_common: *api_extensions
@@ -234,6 +240,7 @@
- job:
name: neutron-tempest-plugin-tap-as-a-service-zed
parent: neutron-tempest-plugin-tap-as-a-service
+ nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
network_api_extensions_common: *api_extensions