Add id to CloudNode

Author: milliams

citc/aws.py

@@ -69,7 +69,7 @@ def from_response(cls: Type["AwsNode"], response) -> "AwsNode":
 
         ip = response["PrivateIpAddress"]
 
-        return cls(name=name, state=node_state, ip=ip)
+        return cls(name=name, state=node_state, ip=ip, id=response["InstanceId"])
 
     @classmethod
     def all(cls, client: EC2Client, nodespace: dict):

citc/cloud.py

@@ -36,11 +36,13 @@ class CloudNode(ABC):
     name: str
     state: NodeState
     ip: str
+    id: str
 
-    def __init__(self, name, state, ip):
+    def __init__(self, name, state, ip, id):
         self.name = name
         self.state = state
         self.ip = ip
+        self.id = id
 
     @classmethod
     @abstractmethod

citc/google.py

@@ -76,7 +76,7 @@ def from_response(cls: Type["GoogleNode"], response) -> "GoogleNode":
 
         ip = response["networkInterfaces"][0]["networkIP"]
 
-        return cls(name=name, state=node_state, ip=ip)
+        return cls(name=name, state=node_state, ip=ip, id=response["id"])
 
     @classmethod
     def all(cls, client, nodespace: dict):

citc/oracle.py

@@ -64,7 +64,7 @@ def from_response(
         )
         ip = virtual_network_client.get_vnic(vnic_id).data.private_ip
 
-        return cls(name=name, state=node_state, ip=ip)
+        return cls(name=name, state=node_state, ip=ip, id=node_id)
 
     @classmethod
     def all(cls, config, nodespace: dict):

pyproject.toml

@@ -23,7 +23,7 @@ mypy = "^0.782"
 flake8 = "^3.7.9"
 moto = "^1.3.15"
 coverage = "^5.0.3"
-mebula = {version = "^0.2.6", allow-prereleases = true, extras = ["azure", "google", "oracle"]}
+mebula = {version = "^0.2.7", allow-prereleases = true, extras = ["azure", "google", "oracle"]}
 
 [tool.poetry.scripts]
 watchdog = 'citc.watchdog:main'

tests/test_list_nodes.py

@@ -11,7 +11,7 @@ def test_create_table():
         SlurmNode(name="foo-1", state="idle", state_flag=None, features={}, reason=""),
         SlurmNode(name="foo-2", state="idle", state_flag="~", features={}, reason=""),
     ]
-    cloud_nodes = [AwsNode(name="foo-1", state=NodeState.RUNNING, ip="10.0.0.25")]
+    cloud_nodes = [AwsNode(name="foo-1", state=NodeState.RUNNING, ip="10.0.0.25", id="i-foobar")]
     table, headers = create_table(slurm_nodes, cloud_nodes)
     assert table == [
         ["foo-1", "idle", "", NodeState.RUNNING],
@@ -24,6 +24,6 @@ def test_print_table():
     slurm_nodes = [
         SlurmNode(name="foo-1", state="idle", state_flag=None, features={}, reason="")
     ]
-    cloud_nodes = [AwsNode(name="foo-1", state=NodeState.RUNNING, ip="10.0.0.25")]
+    cloud_nodes = [AwsNode(name="foo-1", state=NodeState.RUNNING, ip="10.0.0.25", id="i-foobar")]
     table_data = create_table(slurm_nodes, cloud_nodes)
     print(tabulate(table_data))

tests/test_watchdog.py

@@ -17,7 +17,7 @@ def test_crosscheck_one_match():
     slurm_nodes = [
         SlurmNode(name="foo-1", state="idle", state_flag=None, features={}, reason="")
     ]
-    cloud_nodes = [AwsNode(name="foo-1", state=NodeState.RUNNING, ip="10.0.0.25")]
+    cloud_nodes = [AwsNode(name="foo-1", state=NodeState.RUNNING, ip="10.0.0.25", id="i-foobar")]
 
     res = crosscheck(slurm_nodes, cloud_nodes)
     res = list(res)