test_validate_ceph_config_values_in_rook_config_override - Test ready…

… for 4.16 (#10043)


Signed-off-by: Aviadp <apolak@redhat.com>

ocs_ci/ocs/constants.py

@@ -2402,6 +2402,22 @@
 bluestore_prefer_deferred_size_hdd = 0
 """
 
+ROOK_CEPH_CONFIG_VALUES_416 = """
+[global]
+bdev_flock_retry = 20
+mon_osd_full_ratio = .85
+mon_osd_backfillfull_ratio = .8
+mon_osd_nearfull_ratio = .75
+mon_max_pg_per_osd = 600
+mon_pg_warn_max_object_skew = 0
+mon_data_avail_warn = 15
+mon_warn_on_pool_no_redundancy = false
+[osd]
+osd_memory_target_cgroup_limit_ratio = 0.8
+bluestore_prefer_deferred_size_hdd = 0
+"""
+
+
 CEPH_DEBUG_CONFIG_VALUES = """
 [mon]
 debug_mon = 30

tests/functional/z_cluster/test_ceph_default_values_check.py

@@ -122,18 +122,12 @@ def test_validate_ceph_config_values_in_rook_config_override(self):
  )
  ocs_version = version.get_semantic_ocs_version_from_config()
 
- if ocs_version == version.VERSION_4_8:
- stored_values = constants.ROOK_CEPH_CONFIG_VALUES_48.split("\n")
- elif ocs_version == version.VERSION_4_9:
- stored_values = constants.ROOK_CEPH_CONFIG_VALUES_49.split("\n")
- elif ocs_version == version.VERSION_4_10:
- stored_values = constants.ROOK_CEPH_CONFIG_VALUES_410.split("\n")
- elif ocs_version == version.VERSION_4_11:
- stored_values = constants.ROOK_CEPH_CONFIG_VALUES_411.split("\n")
- elif ocs_version == version.VERSION_4_12 or ocs_version == version.VERSION_4_13:
+ if ocs_version == version.VERSION_4_12 or ocs_version == version.VERSION_4_13:
  stored_values = constants.ROOK_CEPH_CONFIG_VALUES_412.split("\n")
- elif ocs_version >= version.VERSION_4_14:
+ elif ocs_version == version.VERSION_4_14 or ocs_version == version.VERSION_4_15:
  stored_values = constants.ROOK_CEPH_CONFIG_VALUES_414.split("\n")
+ elif ocs_version >= version.VERSION_4_16:
+ stored_values = constants.ROOK_CEPH_CONFIG_VALUES_416.split("\n")
  else:
  stored_values = constants.ROOK_CEPH_CONFIG_VALUES.split("\n")
  log.info(f"OCS version is {ocs_version}")