diff options
| author | Chris Patterson <cpatterson@microsoft.com> | 2022-01-04 13:28:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-04 12:28:59 -0600 |
| commit | 2fd80c633d09717b4d669848b814848748e91470 (patch) | |
| tree | 5783d23fff3afb132a52d59b3ebd4858b1bb0c2c /tests | |
| parent | 137c9b0e56bf2a9d4651aeb4ceb210d85a630923 (diff) | |
| download | vyos-cloud-init-2fd80c633d09717b4d669848b814848748e91470.tar.gz vyos-cloud-init-2fd80c633d09717b4d669848b814848748e91470.zip | |
sources/azure: do not persist failed_desired_api_version flag (#1159)
If get_imds_data_with_api_fallback() falls back to the minimum required
API version, it is effectively pinned to the old API version forever.
Remove the failed_desired_api_version property to prevent persistence of
the flag between calls and/or reboots.
The continued presence of this flag in obj.pkl should be harmless.
Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unittests/sources/test_azure.py | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/tests/unittests/sources/test_azure.py b/tests/unittests/sources/test_azure.py index 8b0762b7..44c0a545 100644 --- a/tests/unittests/sources/test_azure.py +++ b/tests/unittests/sources/test_azure.py @@ -2149,7 +2149,24 @@ scbus-1 on xpt0 bus 0 dsrc = self._get_ds(data) dsrc.get_data() self.assertIsNotNone(dsrc.metadata) - self.assertTrue(dsrc.failed_desired_api_version) + + assert m_get_metadata_from_imds.mock_calls == [ + mock.call( + fallback_nic="eth9", + retries=0, + md_type=dsaz.metadata_type.all, + api_version="2021-08-01", + exc_cb=mock.ANY, + ), + mock.call( + fallback_nic="eth9", + retries=10, + md_type=dsaz.metadata_type.all, + api_version="2019-06-01", + exc_cb=mock.ANY, + infinite=False, + ), + ] @mock.patch( MOCKPATH + "get_metadata_from_imds", return_value=NETWORK_METADATA @@ -2164,7 +2181,16 @@ scbus-1 on xpt0 bus 0 dsrc = self._get_ds(data) dsrc.get_data() self.assertIsNotNone(dsrc.metadata) - self.assertFalse(dsrc.failed_desired_api_version) + + assert m_get_metadata_from_imds.mock_calls == [ + mock.call( + fallback_nic="eth9", + retries=0, + md_type=dsaz.metadata_type.all, + api_version="2021-08-01", + exc_cb=mock.ANY, + ) + ] @mock.patch(MOCKPATH + "get_metadata_from_imds") def test_hostname_from_imds(self, m_get_metadata_from_imds): |