fix(ec2): Correctly identify netplan renderer (#5361)

canonical · Jun 5, 2024 · d771d1f · d771d1f
1 parent d4661b1
commit d771d1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
@@ -1082,7 +1082,7 @@ def convert_ec2_metadata_network_config(
         netcfg["ethernets"][nic_name] = dev_config
         return netcfg
     # Apply network config for all nics and any secondary IPv4/v6 addresses
-    is_netplan = distro.network_renderer == netplan.Renderer
+    is_netplan = isinstance(distro.network_renderer, netplan.Renderer)
     macs = sorted(macs_to_nics.keys())
     nic_order = _build_nic_order(macs_metadata, macs)
     for mac in macs:

diff --git a/tests/unittests/sources/test_ec2.py b/tests/unittests/sources/test_ec2.py
@@ -1345,7 +1345,7 @@ def test_convert_ec2_metadata_network_config_multi_nics_ipv4(self):
             },
         }
         distro = mock.Mock()
-        distro.network_renderer = netplan.Renderer
+        distro.network_renderer = netplan.Renderer()
         distro.dhcp_client.dhcp_discovery.return_value = {
             "routers": "172.31.1.0"
         }
@@ -1422,7 +1422,7 @@ def test_convert_ec2_metadata_network_config_multi_nics_ipv4_ipv6_multi_ip(
             },
         }
         distro = mock.Mock()
-        distro.network_renderer = netplan.Renderer
+        distro.network_renderer = netplan.Renderer()
         distro.dhcp_client.dhcp_discovery.return_value = {
             "routers": "172.31.1.0"
         }
@@ -1478,7 +1478,7 @@ def test_convert_ec2_metadata_network_config_multi_nics_ipv6_only(self):
             },
         }
         distro = mock.Mock()
-        distro.network_renderer = netplan.Renderer
+        distro.network_renderer = netplan.Renderer()
         assert expected == ec2.convert_ec2_metadata_network_config(
             network_metadata, distro, macs_to_nics
         )