7454: Add 'size' to arvados_create_kwargs so that it can be included in CustomData.

[arvados.git] / services / nodemanager / arvnodeman / computenode / driver / dummy.py

diff --git a/services/nodemanager/arvnodeman/computenode/driver/dummy.py b/services/nodemanager/arvnodeman/computenode/driver/dummy.py
index 3a286bba017d3b9fd8999fe7185a90d197917df8..b8288241fdb1be576784e3d09ff43574be21aff9 100644 (file)
--- a/services/nodemanager/arvnodeman/computenode/driver/dummy.py
+++ b/services/nodemanager/arvnodeman/computenode/driver/dummy.py
@@ -31,13 +31,14 @@ class ComputeNodeDriver(BaseComputeNodeDriver):
         if not node.private_ips:
             node.private_ips = ['10.10.0.{}'.format(node.id)]
 
-    def arvados_create_kwargs(self, arvados_node):
+    def arvados_create_kwargs(self, arvados_node, size):
         return {}
 
     def list_nodes(self):
         nodelist = super(ComputeNodeDriver, self).list_nodes()
         for node in nodelist:
             self._ensure_private_ip(node)
+            node.size = self.sizes["1"]
         return nodelist
 
     def create_node(self, size, arvados_node):
@@ -48,6 +49,10 @@ class ComputeNodeDriver(BaseComputeNodeDriver):
     def sync_node(self, cloud_node, arvados_node):
         cloud_node.name = arvados_node_fqdn(arvados_node)
 
+    @classmethod
+    def node_fqdn(cls, node):
+        return node.name
+
     @classmethod
     def node_start_time(cls, node):
         return cls.DUMMY_START_TIME