starlingx/test
Code Issues Proposed changes

Merge "Add enroll test case"

Browse Source
This commit is contained in:
Zuul
2025-05-16 20:32:07 +00:00
committed by Gerrit Code Review
parent 7a322cfa56 1b80e7bba3
commit 47668f1050
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
keywords/cloud_platform/dcmanager/dcmanager_subcloud_add_keywords.py
View File

@@ -67,3 +67,25 @@ class DcManagerSubcloudAddKeywords(BaseKeyword):
self.ssh_connection.send(cmd)
self.validate_success_return_code(self.ssh_connection)
def dcmanager_subcloud_add_enroll(self, subcloud_name: str, bootstrap_values: str, install_values: str, deploy_config_file: str):
"""
Runs 'dcmanager subcloud add --enroll' command.
Args:
subcloud_name (str): Subcloud name.
bootstrap_values (str): Bootstrap values file name.
install_values (str): Install values file name.
deploy_config_file (str): Deployment config file name.
"""
lab_config = ConfigurationManager.get_lab_config()
subcloud_obj = lab_config.get_subcloud(subcloud_name)
subcloud_ip = subcloud_obj.get_floating_ip()
subcloud_psswr = subcloud_obj.get_admin_credentials().get_password()
cmd = source_openrc(f"dcmanager subcloud add --enroll --bootstrap-address {subcloud_ip} --bootstrap-values {bootstrap_values} --install-values {install_values} --deploy-config {deploy_config_file} --sysadmin-password {subcloud_psswr} --bmc-password {subcloud_psswr}")
self.ssh_connection.send(cmd)
self.validate_success_return_code(self.ssh_connection)

2
keywords/cloud_platform/dcmanager/dcmanager_subcloud_list_keywords.py
View File

@@ -52,7 +52,7 @@ class DcManagerSubcloudListKeywords(BaseKeyword):
Exception: if the subcloud is in a failed state.
"""
failed_status = ["bootstrap-failed", "install-failed", "create-failed", "config-failed"]
failed_status = ["bootstrap-failed", "install-failed", "create-failed", "config-failed", "pre-enroll-failed", "enroll-failed", "pre-init-enroll-failed", "init-enroll-failed"]
time_out = 4800
polling_sleep_time = 60
end_time = time.time() + time_out