Skip to content

Fix issue regarding cache and region codes #1938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
holmanb merged 4 commits into from
Jan 9, 2023
+20 −9
Merged

Fix issue regarding cache and region codes #1938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5dd89c0
Fix issue regarding cache and region codes
eb3095 Jan 6, 2023
bd3b8ec
Refactor how metadata is used
eb3095 Jan 7, 2023
baac1c9
Refactor unittests
eb3095 Jan 7, 2023
be9ce95
Lowercase
eb3095 Jan 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions cloudinit/sources/DataSourceVultr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@ def _get_data(self):

# Fetch metadata
self.metadata = self.get_metadata()
self.metadata["instance-id"] = self.metadata["instance-v2-id"]
self.metadata["local-hostname"] = self.metadata["hostname"]
region = self.metadata["region"]["regioncode"]
if "countrycode" in self.metadata["region"]:
region = self.metadata["region"]["countrycode"]
self.metadata["region"] = region.lower()
self.userdata_raw = self.metadata["user-data"]

# Generate config and process data
Expand Down
14 changes: 13 additions & 1 deletion cloudinit/sources/helpers/vultr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ def get_metadata(url, timeout, retries, sec_between, agent, tmp_dir=None):
# Fetch the metadata
v1 = read_metadata(url, timeout, retries, sec_between, agent)

return json.loads(v1)
metadata = json.loads(v1)
refactor_metadata(metadata)
return metadata
except (
NoDHCPLeaseError,
subp.ProcessExecutionError,
Expand All @@ -49,6 +51,16 @@ def get_metadata(url, timeout, retries, sec_between, agent, tmp_dir=None):
raise exception


# Refactor metadata into acceptable format
def refactor_metadata(metadata):
metadata["instance-id"] = metadata["instance-v2-id"]
metadata["local-hostname"] = metadata["hostname"]
region = metadata["region"]["regioncode"]
if "countrycode" in metadata["region"]:
region = metadata["region"]["countrycode"]
metadata["region"] = region.lower()


# Get interface list, sort, and clean
def get_interface_list():
ifaces = []
Expand Down
9 changes: 7 additions & 2 deletions tests/unittests/sources/test_vultr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
},
},
"hostname": "CLOUDINIT_1",
"local-hostname": "CLOUDINIT_1",
"instance-v2-id": "29bea708-2e6e-480a-90ad-0e6b5d5ad62f",
"instance-id": "29bea708-2e6e-480a-90ad-0e6b5d5ad62f",
"instanceid": "42506325",
"interfaces": [
{
Expand All @@ -50,7 +53,7 @@
}
],
"public-keys": ["ssh-rsa AAAAB3NzaC1y...IQQhv5PAOKaIl+mM3c= test3@key"],
"region": {"regioncode": "EWR"},
"region": "us",
"user-defined": [],
"startup-script": "echo No configured startup script",
"raid1-script": "",
Expand Down Expand Up @@ -85,7 +88,9 @@
},
},
"hostname": "CLOUDINIT_2",
"local-hostname": "CLOUDINIT_2",
"instance-v2-id": "29bea708-2e6e-480a-90ad-0e6b5d5ad62f",
"instance-id": "29bea708-2e6e-480a-90ad-0e6b5d5ad62f",
"instanceid": "42872224",
"interfaces": [
{
Expand Down Expand Up @@ -121,7 +126,7 @@
},
],
"public-keys": ["ssh-rsa AAAAB3NzaC1y...IQQhv5PAOKaIl+mM3c= test3@key"],
"region": {"regioncode": "EWR"},
"region": "us",
"user-defined": [],
"startup-script": "echo No configured startup script",
"user-data": [],
Expand Down