Skip to content

Commit

Permalink
Create Cluster via ACM
Browse files Browse the repository at this point in the history
Signed-off-by: oviner <[email protected]>
  • Loading branch information
OdedViner committed Jun 6, 2024
1 parent 40988e1 commit 5791194
Show file tree
Hide file tree
Showing 15 changed files with 650 additions and 11 deletions.
1 change: 1 addition & 0 deletions ocs_ci/framework/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class Config:
COMPONENTS: dict = field(default_factory=dict)
# Used for multicluster only
MULTICLUSTER: dict = field(default_factory=dict)
ACM_CONFIG: dict = field(default_factory=dict)

def __post_init__(self):
self.reset()
Expand Down
12 changes: 12 additions & 0 deletions ocs_ci/framework/conf/default_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -347,3 +347,15 @@ MULTICLUSTER:
acm_cluster: False
primary_cluster: False
active_acm_cluster: False

ACM_CONFIG:
ocp_image: "img4.14.3-multi-appsub"
cpus: 16
coresPerSocket: 2
memoryMB: 65536
diskSizeGB: 120
replicas: 3
clusternetwork_cidr: 10.128.0.0/14
clusternetwork_hostprefix: 23
servicenetwork: 172.30.0.0/16
networktype: OVNKubernetes
2 changes: 2 additions & 0 deletions ocs_ci/framework/pytest_customization/marks.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@
polarion_id = pytest.mark.polarion_id
bugzilla = pytest.mark.bugzilla
acm_import = pytest.mark.acm_import
acm_install = pytest.mark.acm_install


tier_marks = [
tier1,
Expand Down
19 changes: 19 additions & 0 deletions ocs_ci/helpers/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4546,6 +4546,7 @@ def check_selinux_relabeling(pod_obj):
logger.info(f"{key} is present in inspect logs of application pod running node")


<<<<<<< HEAD
def verify_log_exist_in_pods_logs(
pod_names,
expected_log,
Expand Down Expand Up @@ -4776,3 +4777,21 @@ def is_rbd_default_storage_class(custom_sc=None):

logger.error("Storageclass {default_rbd_sc} is not a default RBD StorageClass.")
return False

def get_secret_obj(name, namespace):
"""
Get Secret obj by name
Args:
name (str): the name secret
namespace (str): the namespace
Returns:
ocp object: ocp object of secret
"""
return OCP(
kind="secret",
namespace=namespace,
resource_name=name,
).get()
Loading

0 comments on commit 5791194

Please sign in to comment.