Apply "Drop deprecated features and use inclusive language"

Apply the changes in "Drop deprecated features and use inclusive language" after clustermgtd refactor

Signed-off-by: chenwany <[email protected]>

Author: chenwany

src/slurm_plugin/instance_manager.py

@@ -159,8 +159,8 @@ def _store_assigned_hostnames(self, nodes):
                         Item={
                             "Id": nodename,
                             "InstanceId": instance.id,
-                            "MasterPrivateIp": self._head_node_private_ip,
-                            "MasterHostname": self._head_node_hostname,
+                            "HeadNodePrivateIp": self._head_node_private_ip,
+                            "HeadNodeHostname": self._head_node_hostname,
                         }
                     )
 

tests/slurm_plugin/slurm_resources/test_instance_manager.py

@@ -52,8 +52,8 @@ def instance_manager(self, mocker):
             cluster_name="hit",
             boto3_config=botocore.config.Config(),
             table_name="table_name",
-            head_node_private_ip="master.ip",
-            head_node_hostname="master-hostname",
+            head_node_private_ip="head.node.ip",
+            head_node_hostname="head-node-hostname",
             hosted_zone="hosted_zone",
             dns_domain="dns.domain",
             use_private_hostname=False,
@@ -737,8 +737,8 @@ def test_update_slurm_node_addrs(
                         Item={
                             "Id": "queue1-st-c5xlarge-1",
                             "InstanceId": "id-1",
-                            "MasterPrivateIp": "master.ip",
-                            "MasterHostname": "master-hostname",
+                            "HeadNodePrivateIp": "head.node.ip",
+                            "HeadNodeHostname": "head-node-hostname",
                         }
                     )
                 ],
@@ -756,16 +756,16 @@ def test_update_slurm_node_addrs(
                         Item={
                             "Id": "queue1-st-c5xlarge-1",
                             "InstanceId": "id-1",
-                            "MasterPrivateIp": "master.ip",
-                            "MasterHostname": "master-hostname",
+                            "HeadNodePrivateIp": "head.node.ip",
+                            "HeadNodeHostname": "head-node-hostname",
                         }
                     ),
                     call(
                         Item={
                             "Id": "queue1-st-c5xlarge-2",
                             "InstanceId": "id-2",
-                            "MasterPrivateIp": "master.ip",
-                            "MasterHostname": "master-hostname",
+                            "HeadNodePrivateIp": "head.node.ip",
+                            "HeadNodeHostname": "head-node-hostname",
                         }
                     ),
                 ],