diff --git a/cli/src/pcluster/cli/commands/dcv_connect.py b/cli/src/pcluster/cli/commands/dcv_connect.py index f1aac7a948..5d884d10ab 100644 --- a/cli/src/pcluster/cli/commands/dcv_connect.py +++ b/cli/src/pcluster/cli/commands/dcv_connect.py @@ -180,7 +180,7 @@ class DcvConnectCommand(CliCommand): # CLI name = "dcv-connect" - help = "Permits connection to the head or login nodes through an interactive session by using NICE DCV." + help = "Permits connection to the head or login nodes through an interactive session by using Amazon DCV." description = help def __init__(self, subparsers): diff --git a/cli/src/pcluster/constants.py b/cli/src/pcluster/constants.py index 855e56ff89..172fb88246 100644 --- a/cli/src/pcluster/constants.py +++ b/cli/src/pcluster/constants.py @@ -231,7 +231,7 @@ class Feature(Enum): """ BATCH = "AWS Batch scheduler" - DCV = "NICE DCV" + DCV = "Amazon DCV" FSX_LUSTRE = "FSx Lustre" FILE_CACHE = "FileCache" FSX_ONTAP = "FSx ONTAP" diff --git a/cli/src/pcluster/templates/cw_dashboard_builder.py b/cli/src/pcluster/templates/cw_dashboard_builder.py index 75b5f5dd15..3d17c49766 100644 --- a/cli/src/pcluster/templates/cw_dashboard_builder.py +++ b/cli/src/pcluster/templates/cw_dashboard_builder.py @@ -689,7 +689,7 @@ def _add_cw_log(self): ], ), SectionWidgets( - "NICE DCV integration logs", + "Amazon DCV integration logs", [ self._new_cw_log_widget( title="dcv-ext-authenticator", diff --git a/cli/src/pcluster/validators/cluster_validators.py b/cli/src/pcluster/validators/cluster_validators.py index f77050fa08..548db963c4 100644 --- a/cli/src/pcluster/validators/cluster_validators.py +++ b/cli/src/pcluster/validators/cluster_validators.py @@ -1037,7 +1037,7 @@ def _validate(self, instance_type, dcv_enabled, allowed_ips, port, os, architect allowed_oses = get_supported_dcv_os(architecture) if os not in allowed_oses: self._add_failure( - f"NICE DCV can be used with one of the following operating systems " + f"Amazon DCV can be used with one of the following operating systems " f"when using {architecture} architecture: {allowed_oses}. " "Please double check the os configuration.", FailureLevel.ERROR, @@ -1046,7 +1046,7 @@ def _validate(self, instance_type, dcv_enabled, allowed_ips, port, os, architect if re.search(r"(micro)|(nano)", instance_type): self._add_failure( "The packages required for desktop virtualization in the selected instance type '{0}' " - "may cause instability of the instance. If you want to use NICE DCV it is recommended " + "may cause instability of the instance. If you want to use Amazon DCV it is recommended " "to use an instance type with at least 1.7 GB of memory.".format(instance_type), FailureLevel.WARNING, ) diff --git a/cli/tests/pcluster/cli/test_dcv_connect/TestDcvConnectCommand/test_helper/pcluster-help.txt b/cli/tests/pcluster/cli/test_dcv_connect/TestDcvConnectCommand/test_helper/pcluster-help.txt index 22792d5a61..adcd2b17f6 100644 --- a/cli/tests/pcluster/cli/test_dcv_connect/TestDcvConnectCommand/test_helper/pcluster-help.txt +++ b/cli/tests/pcluster/cli/test_dcv_connect/TestDcvConnectCommand/test_helper/pcluster-help.txt @@ -3,7 +3,7 @@ usage: pcluster dcv-connect [-h] [--debug] [-r REGION] -n CLUSTER_NAME [--login-node-ip LOGIN_NODE_IP] Permits connection to the head or login nodes through an interactive session -by using NICE DCV. +by using Amazon DCV. options: -h, --help show this help message and exit diff --git a/cli/tests/pcluster/cli/test_entrypoint/TestParallelClusterCli/test_helper/pcluster-help.txt b/cli/tests/pcluster/cli/test_entrypoint/TestParallelClusterCli/test_helper/pcluster-help.txt index e0fd4beff7..ae1cd70e2a 100644 --- a/cli/tests/pcluster/cli/test_entrypoint/TestParallelClusterCli/test_helper/pcluster-help.txt +++ b/cli/tests/pcluster/cli/test_entrypoint/TestParallelClusterCli/test_helper/pcluster-help.txt @@ -50,7 +50,7 @@ COMMANDS: List Official ParallelCluster AMIs. configure Start the AWS ParallelCluster configuration. dcv-connect Permits connection to the head or login nodes through - an interactive session by using NICE DCV. + an interactive session by using Amazon DCV. export-cluster-logs Export the logs of the cluster to a local tar.gz archive by passing through an Amazon S3 Bucket. diff --git a/cli/tests/pcluster/templates/test_cw_dashboard_builder.py b/cli/tests/pcluster/templates/test_cw_dashboard_builder.py index 32d1c434a5..320b00642d 100644 --- a/cli/tests/pcluster/templates/test_cw_dashboard_builder.py +++ b/cli/tests/pcluster/templates/test_cw_dashboard_builder.py @@ -210,7 +210,7 @@ def _verify_head_node_logs_conditions(cluster_config, output_yaml): # conditional DCV logs if cluster_config.head_node.dcv and cluster_config.head_node.dcv.enabled: - assert_that(output_yaml).contains("NICE DCV integration logs") + assert_that(output_yaml).contains("Amazon DCV integration logs") assert_that(output_yaml).contains("dcv-ext-authenticator") assert_that(output_yaml).contains("dcv-authenticator") assert_that(output_yaml).contains("dcv-agent") @@ -219,7 +219,7 @@ def _verify_head_node_logs_conditions(cluster_config, output_yaml): assert_that(output_yaml).contains("dcv-session-launcher") assert_that(output_yaml).contains("Xdcv") else: - assert_that(output_yaml).does_not_contain("NICE DCV integration logs") + assert_that(output_yaml).does_not_contain("Amazon DCV integration logs") # Conditional System logs if cluster_config.image.os in ["alinux2", "rhel8"]: diff --git a/cli/tests/pcluster/validators/test_feature_validators.py b/cli/tests/pcluster/validators/test_feature_validators.py index c01cc4881e..e96ed11a6a 100644 --- a/cli/tests/pcluster/validators/test_feature_validators.py +++ b/cli/tests/pcluster/validators/test_feature_validators.py @@ -24,7 +24,7 @@ (Feature.BATCH, True, None), (Feature.BATCH, False, "AWS Batch scheduler is not supported in region 'WHATEVER-REGION'"), (Feature.DCV, True, None), - (Feature.DCV, False, "NICE DCV is not supported in region 'WHATEVER-REGION'"), + (Feature.DCV, False, "Amazon DCV is not supported in region 'WHATEVER-REGION'"), (Feature.FSX_LUSTRE, True, None), (Feature.FSX_LUSTRE, False, "FSx Lustre is not supported in region 'WHATEVER-REGION'"), (Feature.FSX_ONTAP, True, None),