diff options
| author | Chris Patterson <cpatterson@microsoft.com> | 2022-06-14 07:57:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-14 06:57:05 -0500 |
| commit | 924521228073294ec0b97287a639a2e1b9eb7e8c (patch) | |
| tree | af0bec3a6c8ef42cbd498e1d6976777a1fb74eb4 /cloudinit/cmd | |
| parent | c000ef20dc96949df410d64faa1efae4fdcb0f31 (diff) | |
| download | cloud-init-git-924521228073294ec0b97287a639a2e1b9eb7e8c.tar.gz | |
sources/azure: minor refactoring to network config generation (#1497)
- Replace parse_network_config() with _generate_network_config()
instance method and consolidate cache checks into network_config.
- Update _generate_network_config_from_imds_metadata() to take
just network metadata portion of instance metadata and rename to
generate_network_config_from_instance_network_metadata().
- Consolidate relevant unit tests and refactor to pytest.
- Update net-convert to use
generate_network_config_from_instance_network_metadata().
Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
Diffstat (limited to 'cloudinit/cmd')
| -rwxr-xr-x | cloudinit/cmd/devel/net_convert.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/cmd/devel/net_convert.py b/cloudinit/cmd/devel/net_convert.py index f92efe72..3e6cdd95 100755 --- a/cloudinit/cmd/devel/net_convert.py +++ b/cloudinit/cmd/devel/net_convert.py @@ -126,7 +126,9 @@ def handle_args(name, args): json.loads(net_data), known_macs=known_macs ) elif args.kind == "azure-imds": - pre_ns = azure.parse_network_config(json.loads(net_data)) + pre_ns = azure.generate_network_config_from_instance_network_metadata( + json.loads(net_data)["network"] + ) elif args.kind == "vmware-imc": config = ovf.Config(ovf.ConfigFile(args.network_data.name)) pre_ns = ovf.get_network_config_from_conf(config, False) |