diff --git a/keywords/cloud_platform/ansible_playbook/software_state_keywords.py b/keywords/cloud_platform/ansible_playbook/software_state_keywords.py index 492b2ea7..6eba368e 100644 --- a/keywords/cloud_platform/ansible_playbook/software_state_keywords.py +++ b/keywords/cloud_platform/ansible_playbook/software_state_keywords.py @@ -1,12 +1,11 @@ -from wrcp.keywords.cloud_platform.software.patch.software_patch_keywords import SwPatchQueryKeywords - from framework.logging.automation_logger import get_logger from framework.ssh.ssh_connection import SSHConnection from keywords.base_keyword import BaseKeyword -from starlingx.keywords.cloud_platform.ansible_playbook.object.software_state_output import SoftwareStateOutput -from starlingx.keywords.cloud_platform.upgrade.software_list_keywords import SoftwareListKeywords -from starlingx.keywords.cloud_platform.version_info.cloud_platform_software_version import CloudPlatformSoftwareVersion -from starlingx.keywords.cloud_platform.version_info.cloud_platform_version_manager import CloudPlatformVersionManager +from keywords.cloud_platform.ansible_playbook.object.software_state_output import SoftwareStateOutput +from keywords.cloud_platform.software.patch.software_patch_keywords import SwPatchQueryKeywords +from keywords.cloud_platform.upgrade.software_list_keywords import SoftwareListKeywords +from keywords.cloud_platform.version_info.cloud_platform_software_version import CloudPlatformSoftwareVersion +from keywords.cloud_platform.version_info.cloud_platform_version_manager import CloudPlatformVersionManager class SoftwareStateKeywords(BaseKeyword): diff --git a/keywords/k8s/certificate/object/kubectl_get_certificate_output.py b/keywords/k8s/certificate/object/kubectl_get_certificate_output.py index 4824f104..2aae08ec 100644 --- a/keywords/k8s/certificate/object/kubectl_get_certificate_output.py +++ b/keywords/k8s/certificate/object/kubectl_get_certificate_output.py @@ -1,5 +1,5 @@ -from starlingx.keywords.k8s.certificate.object.kubectl_cert_object import KubectlCertObject -from starlingx.keywords.k8s.certificate.object.kubectl_get_certificate_table_parser import KubectlGetCertsTableParser +from keywords.k8s.certificate.object.kubectl_cert_object import KubectlCertObject +from keywords.k8s.certificate.object.kubectl_get_certificate_table_parser import KubectlGetCertsTableParser class KubectlGetCertsOutput: diff --git a/keywords/k8s/certificate/object/kubectl_get_issuer_output.py b/keywords/k8s/certificate/object/kubectl_get_issuer_output.py index da4b96ef..33ee681a 100644 --- a/keywords/k8s/certificate/object/kubectl_get_issuer_output.py +++ b/keywords/k8s/certificate/object/kubectl_get_issuer_output.py @@ -1,5 +1,5 @@ -from starlingx.keywords.k8s.certificate.object.kubectl_get_issuer_table_parser import KubectlGetIssuerTableParser -from starlingx.keywords.k8s.certificate.object.kubectl_issuer_object import KubectlIssuerObject +from keywords.k8s.certificate.object.kubectl_get_issuer_table_parser import KubectlGetIssuerTableParser +from keywords.k8s.certificate.object.kubectl_issuer_object import KubectlIssuerObject class KubectlGetIssuerOutput: diff --git a/testcases/cloud_platform/regression/ptp/test_ptp_host_instance_errors.py b/testcases/cloud_platform/regression/ptp/test_ptp_host_instance_errors.py index 984f7947..ae2a430c 100644 --- a/testcases/cloud_platform/regression/ptp/test_ptp_host_instance_errors.py +++ b/testcases/cloud_platform/regression/ptp/test_ptp_host_instance_errors.py @@ -4,7 +4,7 @@ from framework.logging.automation_logger import get_logger from framework.validation.validation import validate_str_contains from keywords.cloud_platform.ssh.lab_connection_keywords import LabConnectionKeywords from keywords.cloud_platform.system.ptp.system_host_ptp_instance_keywords import SystemHostPTPInstanceKeywords -from starlingx.keywords.cloud_platform.system.ptp.system_ptp_instance_keywords import SystemPTPInstanceKeywords +from keywords.cloud_platform.system.ptp.system_ptp_instance_keywords import SystemPTPInstanceKeywords @mark.p3 diff --git a/testcases/cloud_platform/regression/security/test_pod_security_admission.py b/testcases/cloud_platform/regression/security/test_pod_security_admission.py index 0d25e2d7..902d56d4 100644 --- a/testcases/cloud_platform/regression/security/test_pod_security_admission.py +++ b/testcases/cloud_platform/regression/security/test_pod_security_admission.py @@ -1,19 +1,19 @@ from pytest import FixtureRequest, mark -from starlingx.config.configuration_file_locations_manager import ConfigurationFileLocationsManager -from starlingx.config.configuration_manager import ConfigurationManager -from starlingx.framework.logging.automation_logger import get_logger -from starlingx.framework.resources.resource_finder import get_stx_resource_path -from starlingx.framework.ssh.ssh_connection import SSHConnection -from starlingx.framework.validation.validation import validate_equals -from starlingx.keywords.cloud_platform.ssh.lab_connection_keywords import LabConnectionKeywords -from starlingx.keywords.docker.images.docker_load_image_keywords import DockerLoadImageKeywords -from starlingx.keywords.files.file_keywords import FileKeywords -from starlingx.keywords.k8s.files.kubectl_file_delete_keywords import KubectlFileDeleteKeywords -from starlingx.keywords.k8s.namespace.kubectl_get_namespaces_keywords import KubectlGetNamespacesKeywords -from starlingx.keywords.k8s.pods.kubectl_apply_pods_keywords import KubectlApplyPodsKeywords -from starlingx.keywords.k8s.pods.kubectl_get_pods_keywords import KubectlGetPodsKeywords -from starlingx.keywords.k8s.secret.kubectl_create_secret_keywords import KubectlCreateSecretsKeywords +from config.configuration_file_locations_manager import ConfigurationFileLocationsManager +from config.configuration_manager import ConfigurationManager +from framework.logging.automation_logger import get_logger +from framework.resources.resource_finder import get_stx_resource_path +from framework.ssh.ssh_connection import SSHConnection +from framework.validation.validation import validate_equals +from keywords.cloud_platform.ssh.lab_connection_keywords import LabConnectionKeywords +from keywords.docker.images.docker_load_image_keywords import DockerLoadImageKeywords +from keywords.files.file_keywords import FileKeywords +from keywords.k8s.files.kubectl_file_delete_keywords import KubectlFileDeleteKeywords +from keywords.k8s.namespace.kubectl_get_namespaces_keywords import KubectlGetNamespacesKeywords +from keywords.k8s.pods.kubectl_apply_pods_keywords import KubectlApplyPodsKeywords +from keywords.k8s.pods.kubectl_get_pods_keywords import KubectlGetPodsKeywords +from keywords.k8s.secret.kubectl_create_secret_keywords import KubectlCreateSecretsKeywords @mark.p0