X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8deda2012ea7e25610f2cbd0a271e131d9364503..58a7e4f0854e392de979c531ad397bb508a77779:/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 fde103e10e..e7a36ebff3 100644 --- a/services/nodemanager/tests/test_computenode_driver_ec2.py +++ b/services/nodemanager/tests/test_computenode_driver_ec2.py @@ -2,23 +2,18 @@ from __future__ import absolute_import, print_function +import ssl import time import unittest +import libcloud.common.types as cloud_types import mock import arvnodeman.computenode.driver.ec2 as ec2 from . import testutil -class EC2ComputeNodeDriverTestCase(unittest.TestCase): - def setUp(self): - self.driver_mock = mock.MagicMock(name='driver_mock') - - def new_driver(self, auth_kwargs={}, list_kwargs={}, create_kwargs={}): - create_kwargs.setdefault('ping_host', '100::') - return ec2.ComputeNodeDriver( - auth_kwargs, list_kwargs, create_kwargs, - driver_class=self.driver_mock) +class EC2ComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase): + TEST_CLASS = ec2.ComputeNodeDriver def test_driver_instantiation(self): kwargs = {'key': 'testkey'} @@ -35,15 +30,12 @@ class EC2ComputeNodeDriverTestCase(unittest.TestCase): self.assertEqual({'tag:test': 'true'}, list_method.call_args[1].get('ex_filters')) - def test_create_location_loaded_at_initialization(self): - kwargs = {'location': 'testregion'} - driver = self.new_driver(create_kwargs=kwargs) - self.assertTrue(self.driver_mock().list_locations) - def test_create_image_loaded_at_initialization(self): - kwargs = {'image': 'testimage'} - driver = self.new_driver(create_kwargs=kwargs) - self.assertTrue(self.driver_mock().list_images) + list_method = self.driver_mock().list_images + list_method.return_value = [testutil.cloud_object_mock(c) + for c in 'abc'] + driver = self.new_driver(create_kwargs={'image_id': 'id_b'}) + self.assertEqual(1, list_method.call_count) def test_create_includes_ping_secret(self): arv_node = testutil.arvados_node_mock(info={'ping_secret': 'ssshh'}) @@ -55,30 +47,41 @@ class EC2ComputeNodeDriverTestCase(unittest.TestCase): create_method.call_args[1].get('ex_userdata', 'arg missing')) - def test_tags_created_from_arvados_node(self): + def test_hostname_from_arvados_node(self): arv_node = testutil.arvados_node_mock(8) - cloud_node = testutil.cloud_node_mock(8) - driver = self.new_driver(list_kwargs={'tag:list': 'test'}) - self.assertEqual({'ex_metadata': {'list': 'test'}, - 'name': 'compute8.zzzzz.arvadosapi.com'}, - driver.arvados_create_kwargs(arv_node)) + driver = self.new_driver() + self.assertEqual('compute8.zzzzz.arvadosapi.com', + driver.arvados_create_kwargs(testutil.MockSize(1), arv_node)['name']) - def test_tags_set_default_hostname_from_new_arvados_node(self): + def test_default_hostname_from_new_arvados_node(self): arv_node = testutil.arvados_node_mock(hostname=None) driver = self.new_driver() - actual = driver.arvados_create_kwargs(arv_node) self.assertEqual('dynamic.compute.zzzzz.arvadosapi.com', - actual['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 + self.assertTrue(tag_mock.called) + 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) driver = self.new_driver() driver.sync_node(cloud_node, arv_node) - tag_mock = self.driver_mock().ex_create_tags - self.assertTrue(tag_mock.called) - self.assertEqual('compute1.zzzzz.arvadosapi.com', - tag_mock.call_args[0][1].get('Name', 'no name')) + self.check_node_tagged(cloud_node, + {'Name': 'compute1.zzzzz.arvadosapi.com'}) def test_node_create_time(self): refsecs = int(time.time()) @@ -87,3 +90,40 @@ class EC2ComputeNodeDriverTestCase(unittest.TestCase): node.extra = {'launch_time': time.strftime('%Y-%m-%dT%H:%M:%S.000Z', reftuple)} self.assertEqual(refsecs, ec2.ComputeNodeDriver.node_start_time(node)) + + def test_node_fqdn(self): + name = 'fqdntest.zzzzz.arvadosapi.com' + node = testutil.cloud_node_mock() + node.name = name + self.assertEqual(name, ec2.ComputeNodeDriver.node_fqdn(node)) + + 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'))