diff options
author | Scott Moser <smoser@brickies.net> | 2016-11-17 14:46:23 -0500 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2016-11-18 16:33:51 -0500 |
commit | 9e904bbc3336b96475bfd00fb3bf1262ae4de49f (patch) | |
tree | e22e9c0048d723f1b4d99634969a760c34d8da22 /tests/unittests | |
parent | 9d826b8855797bd37e477b6da43153c49529afe8 (diff) | |
download | vyos-cloud-init-9e904bbc3336b96475bfd00fb3bf1262ae4de49f.tar.gz vyos-cloud-init-9e904bbc3336b96475bfd00fb3bf1262ae4de49f.zip |
Add activate_datasource, for datasource specific code paths.
This adds a call to 'activate_datasource'. That will be called
during init stage (or init-local in the event of a 'local' dsmode).
It is present so that the datasource can do platform specific operations
that may be necessary. It is passed the fully rendered cloud-config
and whether or not the instance is a new instance.
The Azure datasource uses this to address formatting of the ephemeral
devices. It does so by
a.) waiting for the device to come online
b.) removing the marker files for the disk_setup and mounts modules
if it finds that the ephemeral device has been reset.
LP: #1611074
Diffstat (limited to 'tests/unittests')
-rw-r--r-- | tests/unittests/test_datasource/test_azure.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py index e90e903c..07127008 100644 --- a/tests/unittests/test_datasource/test_azure.py +++ b/tests/unittests/test_datasource/test_azure.py @@ -349,7 +349,7 @@ class TestAzureDataSource(TestCase): cfg = dsrc.get_config_obj() self.assertEqual(dsrc.device_name_to_device("ephemeral0"), - "/dev/sdb") + DataSourceAzure.RESOURCE_DISK_PATH) assert 'disk_setup' in cfg assert 'fs_setup' in cfg self.assertIsInstance(cfg['disk_setup'], dict) @@ -462,14 +462,6 @@ class TestAzureBounce(TestCase): mock.patch.object(DataSourceAzure, 'list_possible_azure_ds_devs', mock.MagicMock(return_value=[]))) self.patches.enter_context( - mock.patch.object(DataSourceAzure, - 'find_fabric_formatted_ephemeral_disk', - mock.MagicMock(return_value=None))) - self.patches.enter_context( - mock.patch.object(DataSourceAzure, - 'find_fabric_formatted_ephemeral_part', - mock.MagicMock(return_value=None))) - self.patches.enter_context( mock.patch.object(DataSourceAzure, 'get_metadata_from_fabric', mock.MagicMock(return_value={}))) self.patches.enter_context( |