Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/src/pcluster/cli/commands/dcv_connect.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion cli/src/pcluster/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cli/src/pcluster/templates/cw_dashboard_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions cli/src/pcluster/validators/cluster_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/tests/pcluster/templates/test_cw_dashboard_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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"]:
Expand Down
2 changes: 1 addition & 1 deletion cli/tests/pcluster/validators/test_feature_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading