Skip to content

Commit

Permalink
move test_verify_backingstore_uses_rgw to test_provider_client.py
Browse files Browse the repository at this point in the history
Signed-off-by: fbalak <[email protected]>
  • Loading branch information
fbalak committed Jan 31, 2024
1 parent 68ef13d commit ca8c928
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 30 deletions.
41 changes: 41 additions & 0 deletions tests/functional/object/mcg/test_provider_client.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import logging

from ocs_ci.framework.pytest_customization.marks import (
tier1,
red_squad,
runs_on_provider,
mcg,
provider_client_ms_platform_required,
)
from ocs_ci.ocs import constants
from ocs_ci.ocs.ocp import OCP
from ocs_ci.framework.testlib import polarion_id

log = logging.getLogger(__name__)


@mcg
@red_squad
@runs_on_provider
@provider_client_ms_platform_required
@tier1
@polarion_id("OCS-5415")
def test_verify_backingstore_uses_rgw(mcg_obj_session):
"""
Validates whether default MCG backingstore uses rgw endpoint
"""
ceph_object_store = OCP(
kind=constants.CEPHOBJECTSTORE,
resource_name="ocs-storagecluster-cephobjectstore",
).get()
log.debug(f"Ceph object store: {ceph_object_store}")
rgw_endpoint = ceph_object_store["status"]["endpoints"]["secure"][0]
log.info(
f"Checking if backingstore noobaa-default-backing-store uses endpoint {rgw_endpoint}"
)

# Get default backingstore status
backingstore_data = mcg_obj_session.exec_mcg_cmd(
"backingstore status noobaa-default-backing-store"
).stdout
assert f"endpoint: {rgw_endpoint}" in backingstore_data
30 changes: 0 additions & 30 deletions tests/functional/object/mcg/test_verify_noobaa_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
skipif_ocs_version,
skipif_openshift_dedicated,
red_squad,
runs_on_provider,
mcg,
provider_client_ms_platform_required,
)
from ocs_ci.ocs import constants
from ocs_ci.ocs.ocp import OCP
from ocs_ci.ocs.resources.pod import get_pod_logs
from ocs_ci.framework.testlib import polarion_id, bugzilla
from ocs_ci.framework.pytest_customization.marks import skipif_managed_service
Expand Down Expand Up @@ -65,30 +62,3 @@ def test_verify_noobaa_db_service(mcg_obj_session):
assert (
re.search(pattern=pattern, string=noobaa_db_log) is None
), f"Error: {pattern} msg found in the noobaa db logs."


@mcg
@red_squad
@runs_on_provider
@provider_client_ms_platform_required
@tier1
@polarion_id("OCS-5415")
def test_verify_backingstore_uses_rgw(mcg_obj_session):
"""
Validates whether default MCG backingstore uses rgw endpoint
"""
ceph_object_store = OCP(
kind=constants.CEPHOBJECTSTORE,
resource_name="ocs-storagecluster-cephobjectstore",
).get()
log.debug(f"Ceph object store: {ceph_object_store}")
rgw_endpoint = ceph_object_store["status"]["endpoints"]["secure"][0]
log.info(
f"Checking if backingstore noobaa-default-backing-store uses endpoint {rgw_endpoint}"
)

# Get default backingstore status
backingstore_data = mcg_obj_session.exec_mcg_cmd(
"backingstore status noobaa-default-backing-store"
).stdout
assert f"endpoint: {rgw_endpoint}" in backingstore_data

0 comments on commit ca8c928

Please sign in to comment.