X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d843787b4ece9952597d7814cbf10fb383c72625..a93ef946eb1e73ee190ea4ff19c4f9278235530c:/services/nodemanager/tests/test_computenode_driver_ec2.py diff --git a/services/nodemanager/tests/test_computenode_driver_ec2.py b/services/nodemanager/tests/test_computenode_driver_ec2.py index d28a2a6441..520c0dc0cc 100644 --- a/services/nodemanager/tests/test_computenode_driver_ec2.py +++ b/services/nodemanager/tests/test_computenode_driver_ec2.py @@ -1,4 +1,7 @@ #!/usr/bin/env python +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 from __future__ import absolute_import, print_function @@ -47,17 +50,51 @@ class EC2ComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase): create_method.call_args[1].get('ex_userdata', 'arg missing')) + def test_create_includes_metadata(self): + arv_node = testutil.arvados_node_mock() + driver = self.new_driver(list_kwargs={'tag_test': 'testvalue'}) + driver.create_node(testutil.MockSize(1), arv_node) + create_method = self.driver_mock().create_node + self.assertTrue(create_method.called) + self.assertIn( + ('test', 'testvalue'), + create_method.call_args[1].get('ex_metadata', {'arg': 'missing'}).items() + ) + + def test_create_includes_arvados_node_size(self): + arv_node = testutil.arvados_node_mock() + size = testutil.MockSize(1) + driver = self.new_driver() + driver.create_node(size, arv_node) + create_method = self.driver_mock().create_node + self.assertTrue(create_method.called) + self.assertIn( + ('arvados_node_size', size.id), + create_method.call_args[1].get('ex_metadata', {'arg': 'missing'}).items() + ) + + def test_create_preemptible_instance(self): + arv_node = testutil.arvados_node_mock() + driver = self.new_driver() + driver.create_node(testutil.MockSize(1, preemptible=True), arv_node) + create_method = self.driver_mock().create_node + self.assertTrue(create_method.called) + self.assertEqual( + True, + create_method.call_args[1].get('ex_spot_market', 'arg missing') + ) + def test_hostname_from_arvados_node(self): arv_node = testutil.arvados_node_mock(8) driver = self.new_driver() self.assertEqual('compute8.zzzzz.arvadosapi.com', - driver.arvados_create_kwargs(arv_node)['name']) + driver.arvados_create_kwargs(testutil.MockSize(1), arv_node)['name']) def test_default_hostname_from_new_arvados_node(self): arv_node = testutil.arvados_node_mock(hostname=None) driver = self.new_driver() self.assertEqual('dynamic.compute.zzzzz.arvadosapi.com', - driver.arvados_create_kwargs(arv_node)['name']) + driver.arvados_create_kwargs(testutil.MockSize(1), arv_node)['name']) def check_node_tagged(self, cloud_node, expected_tags): tag_mock = self.driver_mock().ex_create_tags @@ -65,16 +102,6 @@ class EC2ComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase): self.assertIs(cloud_node, tag_mock.call_args[0][0]) self.assertEqual(expected_tags, tag_mock.call_args[0][1]) - def test_post_create_node_tags_from_list_kwargs(self): - expect_tags = {'key1': 'test value 1', 'key2': 'test value 2'} - list_kwargs = {('tag_' + key): value - for key, value in expect_tags.iteritems()} - list_kwargs['instance-state-name'] = 'running' - cloud_node = testutil.cloud_node_mock() - driver = self.new_driver(list_kwargs=list_kwargs) - driver.post_create_node(cloud_node) - self.check_node_tagged(cloud_node, expect_tags) - def test_sync_node(self): arv_node = testutil.arvados_node_mock(1) cloud_node = testutil.cloud_node_mock(2) @@ -97,15 +124,52 @@ class EC2ComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase): node.name = name self.assertEqual(name, ec2.ComputeNodeDriver.node_fqdn(node)) - def test_cloud_exceptions(self): - for error in [Exception("test exception"), - IOError("test exception"), - ssl.SSLError("test exception"), - cloud_types.LibcloudError("test exception")]: - self.assertTrue(ec2.ComputeNodeDriver.is_cloud_exception(error), - "{} not flagged as cloud exception".format(error)) - - def test_noncloud_exceptions(self): - self.assertFalse( - ec2.ComputeNodeDriver.is_cloud_exception(ValueError("test error")), - "ValueError flagged as cloud exception") + def test_create_ebs_volume(self): + arv_node = testutil.arvados_node_mock() + driver = self.new_driver() + # libcloud/ec2 "disk" sizes are in GB, Arvados/SLURM "scratch" value is in MB + size = testutil.MockSize(1) + size.disk=5 + size.scratch=20000 + driver.create_node(size, arv_node) + create_method = self.driver_mock().create_node + self.assertTrue(create_method.called) + self.assertEqual([{ + "DeviceName": "/dev/xvdt", + "Ebs": { + "DeleteOnTermination": True, + "VolumeSize": 16, + "VolumeType": "gp2" + }}], + create_method.call_args[1].get('ex_blockdevicemappings')) + + def test_ebs_volume_not_needed(self): + arv_node = testutil.arvados_node_mock() + driver = self.new_driver() + # libcloud/ec2 "disk" sizes are in GB, Arvados/SLURM "scratch" value is in MB + size = testutil.MockSize(1) + size.disk=80 + size.scratch=20000 + driver.create_node(size, arv_node) + create_method = self.driver_mock().create_node + self.assertTrue(create_method.called) + self.assertIsNone(create_method.call_args[1].get('ex_blockdevicemappings')) + + def test_ebs_volume_too_big(self): + arv_node = testutil.arvados_node_mock() + driver = self.new_driver() + # libcloud/ec2 "disk" sizes are in GB, Arvados/SLURM "scratch" value is in MB + size = testutil.MockSize(1) + size.disk=80 + size.scratch=20000000 + driver.create_node(size, arv_node) + create_method = self.driver_mock().create_node + self.assertTrue(create_method.called) + self.assertEqual([{ + "DeviceName": "/dev/xvdt", + "Ebs": { + "DeleteOnTermination": True, + "VolumeSize": 16384, + "VolumeType": "gp2" + }}], + create_method.call_args[1].get('ex_blockdevicemappings'))