2a3769fe74
- ci-Support-metalink-in-yum-repository-config-5444.patch [RHEL-44918] - ci-fix-vmware-Set-IPv6-to-dhcp-when-there-is-no-IPv6-ad.patch [RHEL-35562] - Resolves: RHEL-44918 ([RFE] Support metalink in yum repository config [rhel-10]) - Resolves: RHEL-35562 ([RHEL-10] It leaves the ipv6 networking config as blank in NM keyfile when config dhcp ipv6 with customization spec)
186 lines
7.4 KiB
Diff
186 lines
7.4 KiB
Diff
From e1f1152cd883988f3b5cb7552b11c883e8e423f1 Mon Sep 17 00:00:00 2001
|
|
From: PengpengSun <40026211+PengpengSun@users.noreply.github.com>
|
|
Date: Thu, 4 Jul 2024 04:06:39 +0800
|
|
Subject: [PATCH 2/2] fix(vmware): Set IPv6 to dhcp when there is no IPv6 addr
|
|
(#5471)
|
|
|
|
RH-Author: xiachen <xiachen@redhat.com>
|
|
RH-MergeRequest: 98: fix(vmware): Set IPv6 to dhcp when there is no IPv6 addr (#5471)
|
|
RH-Jira: RHEL-35562
|
|
RH-Acked-by: Ani Sinha <anisinha@redhat.com>
|
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
RH-Commit: [1/1] 5b64e6ce3df0aebbadfcbc00cf7d768408aac6cf (xiachen/cloud-init-centos)
|
|
|
|
When there is no IPv6 addr given in the customization configuration,
|
|
we shall set IPv6 type to dhcp6, then customized Linux network will be
|
|
set to dhcp IPv6 explicitly.
|
|
|
|
(cherry picked from commit 2b6fe6403db769de14f7c7b7e4aa65f5bea8f3e0)
|
|
---
|
|
.../sources/helpers/vmware/imc/config_nic.py | 2 +-
|
|
.../sources/vmware/test_vmware_config_file.py | 68 ++++++++++++++-----
|
|
2 files changed, 52 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/cloudinit/sources/helpers/vmware/imc/config_nic.py b/cloudinit/sources/helpers/vmware/imc/config_nic.py
|
|
index b07214a2..254518af 100644
|
|
--- a/cloudinit/sources/helpers/vmware/imc/config_nic.py
|
|
+++ b/cloudinit/sources/helpers/vmware/imc/config_nic.py
|
|
@@ -207,7 +207,7 @@ class NicConfigurator:
|
|
"""
|
|
|
|
if not nic.staticIpv6:
|
|
- return ([], [])
|
|
+ return ([{"type": "dhcp6"}], [])
|
|
|
|
subnet_list = []
|
|
# Static Ipv6
|
|
diff --git a/tests/unittests/sources/vmware/test_vmware_config_file.py b/tests/unittests/sources/vmware/test_vmware_config_file.py
|
|
index fd4bb481..c1415934 100644
|
|
--- a/tests/unittests/sources/vmware/test_vmware_config_file.py
|
|
+++ b/tests/unittests/sources/vmware/test_vmware_config_file.py
|
|
@@ -241,27 +241,45 @@ class TestVmwareConfigFile(CiTestCase):
|
|
elif cfg.get("name") == nic2.get("name"):
|
|
nic2.update(cfg)
|
|
|
|
+ # Test NIC1
|
|
self.assertEqual("physical", nic1.get("type"), "type of NIC1")
|
|
self.assertEqual("NIC1", nic1.get("name"), "name of NIC1")
|
|
self.assertEqual(
|
|
"00:50:56:a6:8c:08", nic1.get("mac_address"), "mac address of NIC1"
|
|
)
|
|
subnets = nic1.get("subnets")
|
|
- self.assertEqual(1, len(subnets), "number of subnets for NIC1")
|
|
- subnet = subnets[0]
|
|
- self.assertEqual("dhcp", subnet.get("type"), "DHCP type for NIC1")
|
|
- self.assertEqual("auto", subnet.get("control"), "NIC1 Control type")
|
|
+ self.assertEqual(2, len(subnets), "number of subnets for NIC1")
|
|
+ subnet_ipv4 = subnets[0]
|
|
+ self.assertEqual(
|
|
+ "dhcp", subnet_ipv4.get("type"), "Ipv4 DHCP type for NIC1"
|
|
+ )
|
|
+ self.assertEqual(
|
|
+ "auto", subnet_ipv4.get("control"), "NIC1 Control type"
|
|
+ )
|
|
+ subnet_ipv6 = subnets[1]
|
|
+ self.assertEqual(
|
|
+ "dhcp6", subnet_ipv6.get("type"), "Ipv6 DHCP type for NIC1"
|
|
+ )
|
|
|
|
+ # Test NIC2
|
|
self.assertEqual("physical", nic2.get("type"), "type of NIC2")
|
|
self.assertEqual("NIC2", nic2.get("name"), "name of NIC2")
|
|
self.assertEqual(
|
|
"00:50:56:a6:5a:de", nic2.get("mac_address"), "mac address of NIC2"
|
|
)
|
|
subnets = nic2.get("subnets")
|
|
- self.assertEqual(1, len(subnets), "number of subnets for NIC2")
|
|
- subnet = subnets[0]
|
|
- self.assertEqual("dhcp", subnet.get("type"), "DHCP type for NIC2")
|
|
- self.assertEqual("auto", subnet.get("control"), "NIC2 Control type")
|
|
+ self.assertEqual(2, len(subnets), "number of subnets for NIC2")
|
|
+ subnet_ipv4 = subnets[0]
|
|
+ self.assertEqual(
|
|
+ "dhcp", subnet_ipv4.get("type"), "Ipv4 DHCP type for NIC2"
|
|
+ )
|
|
+ self.assertEqual(
|
|
+ "auto", subnet_ipv4.get("control"), "NIC2 Control type"
|
|
+ )
|
|
+ subnet_ipv6 = subnets[1]
|
|
+ self.assertEqual(
|
|
+ "dhcp6", subnet_ipv6.get("type"), "Ipv6 DHCP type for NIC2"
|
|
+ )
|
|
|
|
def test_get_nics_list_static(self):
|
|
"""Tests if NicConfigurator properly calculates network subnets
|
|
@@ -286,6 +304,7 @@ class TestVmwareConfigFile(CiTestCase):
|
|
elif cfg.get("name") == nic2.get("name"):
|
|
nic2.update(cfg)
|
|
|
|
+ # Test NIC1
|
|
self.assertEqual("physical", nic1.get("type"), "type of NIC1")
|
|
self.assertEqual("NIC1", nic1.get("name"), "name of NIC1")
|
|
self.assertEqual(
|
|
@@ -345,6 +364,7 @@ class TestVmwareConfigFile(CiTestCase):
|
|
else:
|
|
self.assertEqual(True, False, "invalid gateway %s" % (gateway))
|
|
|
|
+ # Test NIC2
|
|
self.assertEqual("physical", nic2.get("type"), "type of NIC2")
|
|
self.assertEqual("NIC2", nic2.get("name"), "name of NIC2")
|
|
self.assertEqual(
|
|
@@ -352,16 +372,18 @@ class TestVmwareConfigFile(CiTestCase):
|
|
)
|
|
|
|
subnets = nic2.get("subnets")
|
|
- self.assertEqual(1, len(subnets), "Number of subnets for NIC2")
|
|
+ self.assertEqual(2, len(subnets), "Number of subnets for NIC2")
|
|
|
|
- subnet = subnets[0]
|
|
- self.assertEqual("static", subnet.get("type"), "Subnet type")
|
|
+ subnet_ipv4 = subnets[0]
|
|
+ self.assertEqual("static", subnet_ipv4.get("type"), "Subnet type")
|
|
self.assertEqual(
|
|
- "192.168.6.102", subnet.get("address"), "Subnet address"
|
|
+ "192.168.6.102", subnet_ipv4.get("address"), "Subnet address"
|
|
)
|
|
self.assertEqual(
|
|
- "255.255.0.0", subnet.get("netmask"), "Subnet netmask"
|
|
+ "255.255.0.0", subnet_ipv4.get("netmask"), "Subnet netmask"
|
|
)
|
|
+ subnet_ipv6 = subnets[1]
|
|
+ self.assertEqual("dhcp6", subnet_ipv6.get("type"), "Subnet type")
|
|
|
|
def test_custom_script(self):
|
|
cf = ConfigFile("tests/data/vmware/cust-dhcp-2nic.cfg")
|
|
@@ -448,7 +470,10 @@ class TestVmwareNetConfig(CiTestCase):
|
|
"type": "static",
|
|
"address": "10.20.87.154",
|
|
"netmask": "255.255.252.0",
|
|
- }
|
|
+ },
|
|
+ {
|
|
+ "type": "dhcp6",
|
|
+ },
|
|
],
|
|
}
|
|
],
|
|
@@ -499,7 +524,10 @@ class TestVmwareNetConfig(CiTestCase):
|
|
"metric": 10000,
|
|
}
|
|
],
|
|
- }
|
|
+ },
|
|
+ {
|
|
+ "type": "dhcp6",
|
|
+ },
|
|
],
|
|
}
|
|
],
|
|
@@ -559,7 +587,10 @@ class TestVmwareNetConfig(CiTestCase):
|
|
"metric": 10000,
|
|
}
|
|
],
|
|
- }
|
|
+ },
|
|
+ {
|
|
+ "type": "dhcp6",
|
|
+ },
|
|
],
|
|
}
|
|
],
|
|
@@ -604,7 +635,10 @@ class TestVmwareNetConfig(CiTestCase):
|
|
"address": "10.20.87.154",
|
|
"netmask": "255.255.252.0",
|
|
"gateway": "10.20.87.253",
|
|
- }
|
|
+ },
|
|
+ {
|
|
+ "type": "dhcp6",
|
|
+ },
|
|
],
|
|
}
|
|
],
|
|
--
|
|
2.39.3
|
|
|