Fix DNS handling

Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
xapi-project · May 17, 2022 · 77ff359 · 77ff359
1 parent 2e91bb6
commit 77ff359
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/XSConsoleData.py b/XSConsoleData.py
@@ -912,9 +912,19 @@ def ReconfigureManagement(self, inPIF, inMode,  inIP,  inNetmask,  inGateway, in
             self.RequireSession()
             if inPIF['primary_address_type'].lower() == 'ipv4':
                 self.session.xenapi.PIF.reconfigure_ip(inPIF['opaqueref'],  inMode,  inIP,  inNetmask,  inGateway, FirstValue(inDNS, ''))
+                if inPIF['ipv6_configuration_mode'].lower() == 'static':
+                    # Update IPv6 DNS as well
+                    self.session.xenapi.PIF.reconfigure_ipv6(
+                        inPIF['opaqueref'], inPIF['ipv6_configuration_mode'], inPIF['IPv6'], inPIF['ipv6_gateway'], FirstValue(inDNS, '')
+                    )
             else:
                 inIPv6 = inIP + '/' + inNetmask
                 self.session.xenapi.PIF.reconfigure_ipv6(inPIF['opaqueref'],  inMode,  inIPv6,  inGateway, FirstValue(inDNS, ''))
+                if inPIF['ip_configuration_mode'].lower() == 'static':
+                    # Update IPv4 DNS as well
+                    self.session.xenapi.PIF.reconfigure_ip(
+                        inPIF['opaqueref'], inPIF['ip_configuration_mode'], inPIF['IP'], inPIF['netmask'], inPIF['gateway'], FirstValue(inDNS, '')
+                    )
             self.session.xenapi.host.management_reconfigure(inPIF['opaqueref'])
             status, output = commands.getstatusoutput('%s host-signal-networking-change' % (Config.Inst().XECLIPath()))
             if status != 0:
@@ -933,10 +943,8 @@ def DisableManagement(self):
             self.session.xenapi.host.management_disable()
             # Disable the PIF that the management interface was using
             for pif in self.derived.managementpifs([]):
-                if pif['primary_address_type'].lower() == 'ipv4':
-                    self.session.xenapi.PIF.reconfigure_ip(pif['opaqueref'], 'None','' ,'' ,'' ,'')
-                else:
-                    self.session.xenapi.PIF.reconfigure_ipv6(pif['opaqueref'], 'None','' ,'' ,'')
+                self.session.xenapi.PIF.reconfigure_ip(pif['opaqueref'], 'None','' ,'' ,'' ,'')
+                self.session.xenapi.PIF.reconfigure_ipv6(pif['opaqueref'], 'None','' ,'' ,'')
         finally:
             # Network reconfigured so this link is potentially no longer valid
             self.session = Auth.Inst().CloseSession(self.session)