From 76f6b358cf612e67b586452236394feabc464373 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Fri, 1 Jun 2018 12:41:44 -0300 Subject: [PATCH] 7478: Fixes integration tests. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- services/nodemanager/arvnodeman/test/fake_driver.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/services/nodemanager/arvnodeman/test/fake_driver.py b/services/nodemanager/arvnodeman/test/fake_driver.py index 978c6aa908..11ba271b67 100644 --- a/services/nodemanager/arvnodeman/test/fake_driver.py +++ b/services/nodemanager/arvnodeman/test/fake_driver.py @@ -43,6 +43,9 @@ class FakeDriver(NodeDriver): global all_nodes, create_calls create_calls += 1 nodeid = "node%i" % create_calls + if ex_tags is None: + ex_tags = {} + ex_tags.update({'arvados_node_size': size.id}) n = Node(nodeid, nodeid, NodeState.RUNNING, [], [], self, size=size, extra={"tags": ex_tags}) all_nodes.append(n) if ex_customdata: @@ -161,7 +164,12 @@ class FakeAwsDriver(FakeDriver): auth=auth, ex_metadata=ex_metadata, ex_userdata=ex_userdata) - n.extra = {"launch_time": time.strftime(ARVADOS_TIMEFMT, time.gmtime())[:-1]} + n.extra = { + "launch_time": time.strftime(ARVADOS_TIMEFMT, time.gmtime())[:-1], + "metadata" : { + "arvados_node_size": size.id + } + } return n def list_sizes(self, **kwargs): @@ -187,7 +195,8 @@ class FakeGceDriver(FakeDriver): ex_metadata=ex_metadata) n.extra = { "metadata": { - "items": [{"key": k, "value": v} for k,v in ex_metadata.iteritems()] + "items": [{"key": k, "value": v} for k,v in ex_metadata.iteritems()], + "arvados_node_size": size.id }, "zone": "fake" } -- 2.30.2