diff --git a/conf/reef/rados/13-node-cluster-4-clients-rhos-d.yaml b/conf/reef/rados/13-node-cluster-4-clients-rhos-d.yaml new file mode 100644 index 00000000000..98e692fcc59 --- /dev/null +++ b/conf/reef/rados/13-node-cluster-4-clients-rhos-d.yaml @@ -0,0 +1,151 @@ +# Test Suite to test CIDR blocklisting of clients + every other generic rados test suite +# Deployment for all the ceph daemons , with 5 mon's, 5 mgr's, 36 OSD daemons & 4 Client nodes +# 12 x OSD hosts: 10 standard, 2 backup +globals: + - ceph-cluster: + name: ceph + node1: + networks: + - provider_net_cci_15 + role: + - _admin + - mon + - mgr + - installer + - alertmanager + - grafana + - prometheus + node2: + networks: + - provider_net_cci_15 + role: + - osd + - rgw + - mds + no-of-volumes: 4 + disk-size: 15 + node3: + networks: + - provider_net_cci_15 + role: + - mon + - mgr + - osd + no-of-volumes: 4 + disk-size: 15 + node4: + networks: + - provider_net_cci_15 + role: + - osd + - rgw + - mds + no-of-volumes: 4 + disk-size: 15 + node5: + networks: + - provider_net_cci_15 + role: + - osd + - nfs + no-of-volumes: 4 + disk-size: 15 + node6: + networks: + - provider_net_cci_15 + role: + - osd + - rgw + - mds + no-of-volumes: 4 + disk-size: 15 + node7: + image-name: + openstack: RHEL-9.4.0-x86_64-ga-latest + ibmc: rhel-91-server-released + networks: + - provider_net_cci_16 + role: + - client + node8: + networks: + - provider_net_cci_15 + role: + - mon + - mgr + - osd + no-of-volumes: 4 + disk-size: 15 + node9: + networks: + - provider_net_cci_15 + role: + - osd + - mon + - mgr + no-of-volumes: 4 + disk-size: 15 + node10: + networks: + - provider_net_cci_15 + role: + - osd + - nfs + no-of-volumes: 4 + disk-size: 15 + node11: + networks: + - provider_net_cci_15 + role: + - mon + - mgr + - osd + no-of-volumes: 4 + disk-size: 15 + node12: + networks: + - provider_net_cci_15 + role: + - osd-bak + no-of-volumes: 4 + disk-size: 15 + node13: + networks: + - provider_net_cci_15 + role: + - osd-bak + no-of-volumes: 4 + disk-size: 15 + node14: + networks: + - provider_net_cci_15 + role: + - rgw + - mds + - osd + no-of-volumes: 4 + disk-size: 15 + node15: + image-name: + openstack: RHEL-9.4.0-x86_64-ga-latest + ibmc: rhel-91-server-released + networks: + - provider_net_cci_16 + role: + - client + node16: + image-name: + openstack: RHEL-9.4.0-x86_64-ga-latest + ibmc: rhel-91-server-released + networks: + - provider_net_cci_13 + role: + - client + node17: + image-name: + openstack: RHEL-9.4.0-x86_64-ga-latest + ibmc: rhel-91-server-released + networks: + - provider_net_cci_13 + role: + - client diff --git a/conf/reef/rados/13-node-cluster-4-clients.yaml b/conf/reef/rados/13-node-cluster-4-clients.yaml index ec294c4e265..d4197b04b48 100644 --- a/conf/reef/rados/13-node-cluster-4-clients.yaml +++ b/conf/reef/rados/13-node-cluster-4-clients.yaml @@ -43,6 +43,8 @@ globals: no-of-volumes: 4 disk-size: 15 node5: + networks: + - shared_net_15 role: - osd - nfs @@ -66,6 +68,8 @@ globals: role: - client node8: + networks: + - shared_net_15 role: - mon - mgr @@ -73,6 +77,8 @@ globals: no-of-volumes: 4 disk-size: 15 node9: + networks: + - shared_net_15 role: - osd - mon @@ -80,12 +86,16 @@ globals: no-of-volumes: 4 disk-size: 15 node10: + networks: + - shared_net_15 role: - osd - nfs no-of-volumes: 4 disk-size: 15 node11: + networks: + - shared_net_15 role: - mon - mgr @@ -93,16 +103,22 @@ globals: no-of-volumes: 4 disk-size: 15 node12: + networks: + - shared_net_15 role: - osd-bak no-of-volumes: 4 disk-size: 15 node13: + networks: + - shared_net_15 role: - osd-bak no-of-volumes: 4 disk-size: 15 node14: + networks: + - shared_net_15 role: - rgw - mds diff --git a/conf/squid/rados/13-node-cluster-4-clients-rhos-d.yaml b/conf/squid/rados/13-node-cluster-4-clients-rhos-d.yaml new file mode 100644 index 00000000000..98e692fcc59 --- /dev/null +++ b/conf/squid/rados/13-node-cluster-4-clients-rhos-d.yaml @@ -0,0 +1,151 @@ +# Test Suite to test CIDR blocklisting of clients + every other generic rados test suite +# Deployment for all the ceph daemons , with 5 mon's, 5 mgr's, 36 OSD daemons & 4 Client nodes +# 12 x OSD hosts: 10 standard, 2 backup +globals: + - ceph-cluster: + name: ceph + node1: + networks: + - provider_net_cci_15 + role: + - _admin + - mon + - mgr + - installer + - alertmanager + - grafana + - prometheus + node2: + networks: + - provider_net_cci_15 + role: + - osd + - rgw + - mds + no-of-volumes: 4 + disk-size: 15 + node3: + networks: + - provider_net_cci_15 + role: + - mon + - mgr + - osd + no-of-volumes: 4 + disk-size: 15 + node4: + networks: + - provider_net_cci_15 + role: + - osd + - rgw + - mds + no-of-volumes: 4 + disk-size: 15 + node5: + networks: + - provider_net_cci_15 + role: + - osd + - nfs + no-of-volumes: 4 + disk-size: 15 + node6: + networks: + - provider_net_cci_15 + role: + - osd + - rgw + - mds + no-of-volumes: 4 + disk-size: 15 + node7: + image-name: + openstack: RHEL-9.4.0-x86_64-ga-latest + ibmc: rhel-91-server-released + networks: + - provider_net_cci_16 + role: + - client + node8: + networks: + - provider_net_cci_15 + role: + - mon + - mgr + - osd + no-of-volumes: 4 + disk-size: 15 + node9: + networks: + - provider_net_cci_15 + role: + - osd + - mon + - mgr + no-of-volumes: 4 + disk-size: 15 + node10: + networks: + - provider_net_cci_15 + role: + - osd + - nfs + no-of-volumes: 4 + disk-size: 15 + node11: + networks: + - provider_net_cci_15 + role: + - mon + - mgr + - osd + no-of-volumes: 4 + disk-size: 15 + node12: + networks: + - provider_net_cci_15 + role: + - osd-bak + no-of-volumes: 4 + disk-size: 15 + node13: + networks: + - provider_net_cci_15 + role: + - osd-bak + no-of-volumes: 4 + disk-size: 15 + node14: + networks: + - provider_net_cci_15 + role: + - rgw + - mds + - osd + no-of-volumes: 4 + disk-size: 15 + node15: + image-name: + openstack: RHEL-9.4.0-x86_64-ga-latest + ibmc: rhel-91-server-released + networks: + - provider_net_cci_16 + role: + - client + node16: + image-name: + openstack: RHEL-9.4.0-x86_64-ga-latest + ibmc: rhel-91-server-released + networks: + - provider_net_cci_13 + role: + - client + node17: + image-name: + openstack: RHEL-9.4.0-x86_64-ga-latest + ibmc: rhel-91-server-released + networks: + - provider_net_cci_13 + role: + - client diff --git a/conf/squid/rados/13-node-cluster-4-clients.yaml b/conf/squid/rados/13-node-cluster-4-clients.yaml index ec294c4e265..d4197b04b48 100644 --- a/conf/squid/rados/13-node-cluster-4-clients.yaml +++ b/conf/squid/rados/13-node-cluster-4-clients.yaml @@ -43,6 +43,8 @@ globals: no-of-volumes: 4 disk-size: 15 node5: + networks: + - shared_net_15 role: - osd - nfs @@ -66,6 +68,8 @@ globals: role: - client node8: + networks: + - shared_net_15 role: - mon - mgr @@ -73,6 +77,8 @@ globals: no-of-volumes: 4 disk-size: 15 node9: + networks: + - shared_net_15 role: - osd - mon @@ -80,12 +86,16 @@ globals: no-of-volumes: 4 disk-size: 15 node10: + networks: + - shared_net_15 role: - osd - nfs no-of-volumes: 4 disk-size: 15 node11: + networks: + - shared_net_15 role: - mon - mgr @@ -93,16 +103,22 @@ globals: no-of-volumes: 4 disk-size: 15 node12: + networks: + - shared_net_15 role: - osd-bak no-of-volumes: 4 disk-size: 15 node13: + networks: + - shared_net_15 role: - osd-bak no-of-volumes: 4 disk-size: 15 node14: + networks: + - shared_net_15 role: - rgw - mds diff --git a/suites/pacific/rados/tier-3_rados_cidr_blocklisting.yaml b/suites/pacific/rados/tier-3_rados_cidr_blocklisting.yaml index 43b1f6ad5d2..92a042487a3 100644 --- a/suites/pacific/rados/tier-3_rados_cidr_blocklisting.yaml +++ b/suites/pacific/rados/tier-3_rados_cidr_blocklisting.yaml @@ -1,5 +1,6 @@ # Suite contains tests related to CIDR blocklisting of ceph clients # This is Openstack only test suite. +# conf: 13-node-cluster-4-clients.yaml tests: - test: @@ -96,7 +97,7 @@ tests: command: add id: client.1 # client Id (.) nodes: - - node8: + - node15: release: 5 - node7: release: 5 @@ -117,7 +118,7 @@ tests: command: add id: client.2 # client Id (.) nodes: - - node9: + - node16: release: 5 install_packages: - ceph-common @@ -135,7 +136,7 @@ tests: config: command: add id: client.3 # client Id (.) - node: node10 # client node + node: node17 # client node install_packages: - ceph-common copy_admin_keyring: true # Copy admin keyring to node diff --git a/suites/quincy/rados/tier-3_rados_cidr_blocklisting.yaml b/suites/quincy/rados/tier-3_rados_cidr_blocklisting.yaml index 03c26898a7f..786a515851d 100644 --- a/suites/quincy/rados/tier-3_rados_cidr_blocklisting.yaml +++ b/suites/quincy/rados/tier-3_rados_cidr_blocklisting.yaml @@ -1,5 +1,6 @@ # Suite contains tests related to CIDR blocklisting of ceph clients # This is Openstack only test suite. +# conf: 13-node-cluster-4-clients.yaml tests: - test: @@ -96,7 +97,7 @@ tests: command: add id: client.1 # client Id (.) nodes: - - node8: + - node15: release: 5 - node7: release: 5 @@ -117,7 +118,7 @@ tests: command: add id: client.2 # client Id (.) nodes: - - node9: + - node16: release: 6 install_packages: - ceph-common @@ -135,7 +136,7 @@ tests: config: command: add id: client.3 # client Id (.) - node: node10 # client node + node: node17 # client node install_packages: - ceph-common copy_admin_keyring: true # Copy admin keyring to node diff --git a/suites/reef/rados/tier-3_rados_cidr_blocklisting.yaml b/suites/reef/rados/tier-3_rados_cidr_blocklisting.yaml index 85d2edb1013..383c14f1426 100644 --- a/suites/reef/rados/tier-3_rados_cidr_blocklisting.yaml +++ b/suites/reef/rados/tier-3_rados_cidr_blocklisting.yaml @@ -1,6 +1,6 @@ # Suite contains tests related to CIDR blocklisting of ceph clients # This is Openstack only test suite. -# conf: 6-node-cluster-4-clients.yaml +# conf: 13-node-cluster-4-clients.yaml # RHOS-d run duration: 50 mins + 50 min (slow_ops) + 20 min (recovery_tests) tests: - test: @@ -97,7 +97,7 @@ tests: command: add id: client.1 # client Id (.) nodes: - - node8: + - node15: release: 6 - node7: release: 6 @@ -118,7 +118,7 @@ tests: command: add id: client.2 # client Id (.) nodes: - - node9: + - node16: release: 7 install_packages: - ceph-common @@ -136,7 +136,7 @@ tests: config: command: add id: client.3 # client Id (.) - node: node10 # client node + node: node17 # client node install_packages: - ceph-common copy_admin_keyring: true # Copy admin keyring to node diff --git a/suites/reef/rados/tier-3_rados_test-location-stretch-mode.yaml b/suites/reef/rados/tier-3_rados_test-location-stretch-mode.yaml index 59deb0436c6..315a7721df1 100644 --- a/suites/reef/rados/tier-3_rados_test-location-stretch-mode.yaml +++ b/suites/reef/rados/tier-3_rados_test-location-stretch-mode.yaml @@ -1,4 +1,4 @@ -# Use cluster-conf file: conf/reef/rados/stretch-mode-host-location-attrs.yaml +# conf: 13-node-cluster-4-clients.yaml # Stretch mode tests performing site down scenarios # This test case is Openstack only and cannot be run in Baremetal env due to test constrains. @@ -140,7 +140,7 @@ tests: id: client.1 # client Id (.) nodes: - node7: - release: 6 + release: 7 install_packages: - ceph-common - ceph-base diff --git a/suites/squid/rados/tier-3_rados_cidr_blocklisting.yaml b/suites/squid/rados/tier-3_rados_cidr_blocklisting.yaml index 35ca800372e..9defd6b7b17 100644 --- a/suites/squid/rados/tier-3_rados_cidr_blocklisting.yaml +++ b/suites/squid/rados/tier-3_rados_cidr_blocklisting.yaml @@ -1,6 +1,6 @@ # Suite contains tests related to CIDR blocklisting of ceph clients # This is Openstack only test suite. -# conf: 6-node-cluster-4-clients.yaml +# conf: 13-node-cluster-4-clients.yaml # RHOS-d run duration: 50 mins + 50 min (slow_ops) + 20 min (recovery_tests) tests: - test: @@ -97,7 +97,7 @@ tests: command: add id: client.1 # client Id (.) nodes: - - node8: + - node15: release: 6 - node7: release: 6 @@ -118,7 +118,7 @@ tests: command: add id: client.2 # client Id (.) nodes: - - node9: + - node16: release: 7 install_packages: - ceph-common @@ -136,7 +136,7 @@ tests: config: command: add id: client.3 # client Id (.) - node: node10 # client node + node: node17 # client node install_packages: - ceph-common copy_admin_keyring: true # Copy admin keyring to node diff --git a/suites/squid/rados/tier-3_rados_test-location-stretch-mode.yaml b/suites/squid/rados/tier-3_rados_test-location-stretch-mode.yaml index 55acb57b9ed..3f731e6617b 100644 --- a/suites/squid/rados/tier-3_rados_test-location-stretch-mode.yaml +++ b/suites/squid/rados/tier-3_rados_test-location-stretch-mode.yaml @@ -1,6 +1,5 @@ -# Use cluster-conf file: conf/squid/rados/stretch-mode-host-location-attrs.yaml # Stretch mode tests performing site down scenarios - +# conf: 13-node-cluster-4-clients.yaml # This test case is Openstack only and cannot be run in Baremetal env due to test constrains. # Stretch mode deployment in BM is run by suite : suites/squid/rados/deploy-stretch-cluster-mode.yaml diff --git a/tests/rados/test_stretch_deployment_with_placement.py b/tests/rados/test_stretch_deployment_with_placement.py index dbe82b139e6..c8cc8683796 100644 --- a/tests/rados/test_stretch_deployment_with_placement.py +++ b/tests/rados/test_stretch_deployment_with_placement.py @@ -91,7 +91,7 @@ def run(ceph_cluster, **kw): ) cmd = "ceph osd tree" tree_op, _ = client_node.exec_command(cmd=cmd, sudo=True) - datacenters = re.findall(r"\n(-\d+)\s+([\d.]+)\s+datacenter\s+(\w+)", tree_op) + datacenters = re.findall(r"\s*(-\d+)\s+([\d.]+)\s+datacenter\s+(\w+)", tree_op) weights = [(weight, name) for _, weight, name in datacenters] for dc in weights: log.debug(f"Datacenter: {dc[0]}, Weight: {dc[1]}")