Skip to content

Commit 62f98a1

Browse files
author
Himani Anil Deshpande
committed
[Unit Test] Update user_data variables for head Node
* Change dna.json and extra.json test for compute fleet
1 parent 8c7700d commit 62f98a1

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

cli/tests/pcluster/templates/test_cluster_stack.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ def test_compute_launch_template_properties(
416416
"UserData"
417417
]["Fn::Base64"]["Fn::Sub"][1]
418418
expected_user_data_variables = {
419-
"CloudFormationUrl": "https://cloudformation.us-east-1.amazonaws.com",
420-
"LaunchTemplateResourceId": launch_template_logical_id,
419+
'DisableMultiThreadingManually': 'true',
420+
'ProxyServer': 'NONE',
421421
}
422422
for k, v in expected_user_data_variables.items():
423423
assert_that(user_data_variables[k]).is_equal_to(v)

cli/tests/pcluster/templates/test_queues_stack.py

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,29 +131,19 @@ def test_compute_nodes_dna_json(
131131
# Generated dna.json and extra.json
132132
compute_node_lt_asset = get_asset_content_with_resource_name(cdk_assets, "LaunchTemplateA7211c84b953696f")
133133
compute_node_lt = compute_node_lt_asset["Resources"]["LaunchTemplateA7211c84b953696f"]
134-
compute_node_cfn_init_files = compute_node_lt["Metadata"]["AWS::CloudFormation::Init"]["deployConfigFiles"]["files"]
135-
compute_node_dna_json = compute_node_cfn_init_files["/tmp/dna.json"]
136-
compute_node_extra_json = compute_node_cfn_init_files["/tmp/extra.json"]
134+
compute_node_dna_json = render_join(compute_node_lt['Properties']['LaunchTemplateData']['UserData']['Fn::Base64']['Fn::Sub'][1]['DnaJson']['Fn::Join'])
135+
136+
compute_node_extra_json = compute_node_lt['Properties']['LaunchTemplateData']['UserData']['Fn::Base64']['Fn::Sub'][1]['ExtraJson']
137137

138138
# Expected dna.json and extra.json
139139
expected_compute_node_dna_json = load_json_dict(test_datadir / expected_compute_node_dna_json_file_name)
140140
expected_compute_node_extra_json = load_json_dict(test_datadir / expected_compute_node_extra_json_file_name)
141-
expected_owner = expected_group = "root"
142-
expected_mode = "000644"
143141

144142
# Assertions on dna.json
145-
rendered_dna_json_content = render_join(compute_node_dna_json["content"]["Fn::Join"])
146-
rendered_dna_json_content_as_json = json.loads(rendered_dna_json_content)
147-
assert_that(compute_node_dna_json["owner"]).is_equal_to(expected_owner)
148-
assert_that(compute_node_dna_json["group"]).is_equal_to(expected_group)
149-
assert_that(compute_node_dna_json["mode"]).is_equal_to(expected_mode)
150-
assert_that(rendered_dna_json_content_as_json).is_equal_to(expected_compute_node_dna_json)
143+
assert_that(json.loads(compute_node_dna_json)).is_equal_to(expected_compute_node_dna_json)
151144

152145
# Assertions on extra.json
153-
assert_that(compute_node_extra_json["owner"]).is_equal_to(expected_owner)
154-
assert_that(compute_node_extra_json["group"]).is_equal_to(expected_group)
155-
assert_that(compute_node_extra_json["mode"]).is_equal_to(expected_mode)
156-
assert_that(json.loads(compute_node_extra_json["content"])).is_equal_to(expected_compute_node_extra_json)
146+
assert_that(json.loads(compute_node_extra_json)).is_equal_to(expected_compute_node_extra_json)
157147

158148

159149
def render_join(elem: dict):

0 commit comments

Comments
 (0)