CP-308543 Use xenapi to manage timezone and NTP

xenapi host.set_timezone to config the timezone of the host.
host.set_ntp_mode to manage the NTP. The NTP mode mapping
to xsconsole is:
DHCP - dhcp
Factory - default
Custom - manual
Disabled - none
host.set_ntp_custom_servers to configure the NTP servers
that used in Custom mode.

Signed-off-by: Changlei Li <changlei.li@cloud.com>

Author: changlei-li

XSConsoleConstants.py

@@ -1,7 +1,8 @@
 # Default NTP domains are <int>.[centos|xenserver].pool.ntp.org
 CENTOS_NTP_POOL_DOMAIN = "centos.pool.ntp.org"
-DEFAULT_NTP_DOMAINS = [CENTOS_NTP_POOL_DOMAIN, "xenserver.pool.ntp.org"]
+XENSERVER_NTP_POOL_DOMAIN = "xenserver.pool.ntp.org"
+DEFAULT_NTP_DOMAINS = [CENTOS_NTP_POOL_DOMAIN, XENSERVER_NTP_POOL_DOMAIN]
 
 NUM_DEFAULT_NTP_SERVERS = 4
 
-DEFAULT_NTP_SERVERS = ["%d.%s" % (i, CENTOS_NTP_POOL_DOMAIN) for i in range(NUM_DEFAULT_NTP_SERVERS)]
+DEFAULT_NTP_SERVERS = ["%d.%s" % (i, XENSERVER_NTP_POOL_DOMAIN) for i in range(NUM_DEFAULT_NTP_SERVERS)]

XSConsoleData.py

@@ -570,100 +570,27 @@ def SaveToSysconfig(self):
             if file is not None: file.close()
             self.UpdateFromSysconfig()
 
-    def SaveToNTPConf(self):
-        # Double-check authentication
+    def SetNTPMode(self, inMode):
         Auth.Inst().AssertAuthenticated()
+        self.RequireSession()
+        self.session.xenapi.host.set_ntp_mode(self.host.opaqueref(), inMode)
 
-        try:
-            with open("/etc/chrony.conf", "w") as confFile:
-                for other in self.ntp.othercontents([]):
-                    confFile.write(other + "\n")
-                for server in self.ntp.servers([]):
-                    confFile.write("server " + server + " iburst\n")
-        finally:
-            self.UpdateFromNTPConf()
-
-        # Force chronyd to update the time
-        if self.data['ntp']['method'] != "Disabled":
-            # Prompt chrony to update the time immediately
-            getoutput("chronyc makestep")
-            # Write the system time (set by the single shot NTP) to the HW clock
-            getoutput("hwclock -w")
-
-    def AddDHCPNTP(self):
-        # Double-check authentication
+    def SetNTPManualServers(self, inServers):
         Auth.Inst().AssertAuthenticated()
-
-        oldPermissions = os.stat("/etc/dhcp/dhclient.d/chrony.sh").st_mode
-        newPermissions = oldPermissions | (stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
-        os.chmod("/etc/dhcp/dhclient.d/chrony.sh", newPermissions)
-
-        interfaces = self.GetDHClientInterfaces()
-        for interface in interfaces:
-            ntpServer = self.GetDHCPNTPServer(interface)
-
-            with open("/run/chrony-dhcp/%s.sources" % interface, "w") as chronyFile:
-                chronyFile.write("server %s iburst prefer\n" % ntpServer)
-
-        # Ensure chrony is enabled
-        self.EnableService("chronyd")
-        self.EnableService("chrony-wait")
+        self.RequireSession()
+        self.session.xenapi.host.set_ntp_custom_servers(self.host.opaqueref(), inServers)
 
     def ResetDefaultNTPServers(self):
         # Double-check authentication
         Auth.Inst().AssertAuthenticated()
         Data.Inst().NTPServersSet(DEFAULT_NTP_SERVERS)
 
-    def GetDHClientInterfaces(self):
-        try:
-            leases = [filename for filename in os.listdir("/var/lib/xcp") if "leases" in filename]
-        except OSError:
-            return []
-
-        pattern = "dhclient-(.*).leases"
-        interfaces = []
-        for dhclientFile in leases:
-            match = re.match(pattern, dhclientFile)
-            if match:
-                interfaces.append(match.group(1))
-
-        return interfaces
-
-    def GetDHCPNTPServer(self, interface):
-        expectedLeaseFile = "/var/lib/xcp/dhclient-%s.leases" % interface
-        if not os.path.isfile(expectedLeaseFile):
-            return None
-
-        with open(expectedLeaseFile, "r") as leaseFile:
-            data = leaseFile.read().splitlines()
-
-        ntpServerLines = [line for line in data if "ntp-servers" in line]
-
-        # Extract <ip-addr> from "  option ntp-servers <ip-addr>;"
-        try:
-            ntpServer = ntpServerLines[-1].split()[-1][:-1]
-        except:
-            ntpServer = None
-
-        return ntpServer
-
-    def RemoveDHCPNTP(self):
-        # Double-check authentication
-        Auth.Inst().AssertAuthenticated()
-
-        oldPermissions = os.stat("/etc/dhcp/dhclient.d/chrony.sh").st_mode
-        newPermissions = oldPermissions & ~(stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
-        os.chmod("/etc/dhcp/dhclient.d/chrony.sh", newPermissions)
-
-        getstatusoutput("rm -f /run/chrony-dhcp/*.sources")
-
     def SetTimeManually(self, date):
         # Double-check authentication
         Auth.Inst().AssertAuthenticated()
 
         self.NTPServersSet([])
-        self.RemoveDHCPNTP()
-        self.SaveToNTPConf()
+        self.SetNTPMode('Disabled')
 
         self.DisableService("chrony-wait")
         self.DisableService("chronyd")
@@ -923,22 +850,9 @@ def UpdateFromTimezone(self):
             file.close()
 
     def TimezoneSet(self, inTimezone):
-        localtimeFile = '/etc/localtime'
-        if os.path.isfile(localtimeFile):
-            os.remove(localtimeFile)
-        os.symlink(self.timezones.cities({})[inTimezone], localtimeFile)
-
-        file = open('/etc/timezone', 'w')
-        file.write(inTimezone+"\n")
-        file.close()
-
-        if os.path.exists('/etc/sysconfig/clock'):
-            cfg = SimpleConfigFile()
-            cfg.read('/etc/sysconfig/clock')
-            cfg.info["ZONE"] = inTimezone
-            cfg.write('/etc/sysconfig/clock')
-
-        time.tzset()
+        Auth.Inst().AssertAuthenticated()
+        self.RequireSession()
+        self.session.xenapi.host.set_timezone(self.host.opaqueref(), inTimezone)
 
     def CurrentTimeString(self):
         return getoutput('/bin/date -R')
@@ -1099,10 +1013,12 @@ def DisableManagement(self):
             self.session = Auth.Inst().CloseSession(self.session)
 
     def AdjustNTPForStaticNetwork(self):
-        self.RemoveDHCPNTP()
         if not self.data['ntp']['servers']: # No NTP servers after removing DHCP
             self.ResetDefaultNTPServers()
-            self.SaveToNTPConf()
+            self.SetNTPMode('Factory')
+        else:
+            self.SetNTPManualServers(self.data['ntp']['servers'])
+            self.SetNTPMode('Custom')
 
     def LocalHostEnable(self):
         Auth.Inst().AssertAuthenticatedOrPasswordUnset()

plugins-base/XSFeatureNTP.py

@@ -232,15 +232,13 @@ def HandleInitialChoice(self, inChoice):  # type: (str) -> None
                 Layout.Inst().PopDialogue()
                 Layout.Inst().TransientBanner(Lang("Enabling DHCP NTP Server..."))
                 data.NTPServersSet([])
-                data.AddDHCPNTP()
-                self.Commit(Lang("DHCP NTP Time Synchronization Enabled"))
+                self.Commit(Lang("DHCP NTP Time Synchronization Enabled"), inChoice)
 
             elif inChoice == "DEFAULT":
                 Layout.Inst().PopDialogue()
                 Layout.Inst().TransientBanner(Lang("Enabling Default NTP Servers..."))
                 data.ResetDefaultNTPServers()
-                data.RemoveDHCPNTP()
-                self.Commit(Lang("Default NTP Time Synchronization Enabled"))
+                self.Commit(Lang("Default NTP Time Synchronization Enabled"), inChoice)
 
             elif inChoice == "MANUAL":
                 self.ChangeState("MANUAL")
@@ -269,7 +267,7 @@ def HandleManualChoice(self, inChoice):
                 Layout.Inst().PopDialogue()
                 Layout.Inst().TransientBanner(Lang("Removing All NTP Servers..."))
                 data.NTPServersSet([])
-                self.Commit(Lang("All server entries deleted"))
+                self.Commit(Lang("All server entries deleted"), "MANUAL")
 
         except Exception as e:
             Layout.Inst().PushDialogue(InfoDialogue( Lang("Operation Failed"), Lang(e)))
@@ -291,7 +289,7 @@ def HandleRemoveChoice(self, inChoice):
 
         del servers[inChoice]
         data.NTPServersSet(servers)
-        self.Commit(Lang("NTP server %s deleted" % thisServer))
+        self.Commit(Lang("NTP server %s deleted" % thisServer), "MANUAL")
         data.Update()
 
     def HandleKey(self, inKey):
@@ -343,10 +341,9 @@ def HandleKeyNONE(self, inKey):
 
                 Layout.Inst().TransientBanner(Lang("Setting Time..."))
                 data = Data.Inst()
-                data.RemoveDHCPNTP()
                 data.SetTimeManually(date)
 
-                self.Commit(Lang("Time Set Manually"), restartChronyd=False)
+                self.Commit(Lang("Time Set Manually"), "NONE")
             except Exception as e:
                 Layout.Inst().PushDialogue(InfoDialogue(Lang(e)))
 
@@ -377,12 +374,11 @@ def HandleKeyADD(self, inKey):
                 IPUtils.AssertValidNetworkName(inputValues['name'])
 
                 data=Data.Inst()
-                data.RemoveDHCPNTP()
 
                 servers = data.ntp.servers([])
                 servers.append(inputValues['name'])
                 data.NTPServersSet(servers)
-                self.Commit(Lang("NTP server")+" "+inputValues['name']+" "+Lang("added"))
+                self.Commit(Lang("NTP server")+" "+inputValues['name']+" "+Lang("added"), "MANUAL")
             except Exception as e:
                 Layout.Inst().PushDialogue(InfoDialogue(Lang(e)))
 
@@ -395,13 +391,22 @@ def HandleKeyADD(self, inKey):
     def HandleKeyREMOVE(self, inKey):
         return self.removeMenu.HandleKey(inKey)
 
-    def Commit(self, inMessage, restartChronyd=True):
+    def Commit(self, inMessage, inChoice):
         data=Data.Inst()
         try:
-            data.SaveToNTPConf()
-            if restartChronyd:
-                Layout.Inst().TransientBanner(Lang("Restarting NTP daemon with new configuration..."))
-                data.RestartService('chronyd')
+            ntpmode_map = {
+                "DHCP": "DHCP",
+                "DEFAULT": "Factory",
+                "MANUAL": "Custom",
+                "NONE": "Disabled"
+            }
+            mode = ntpmode_map.get(inChoice)
+            if mode is None:
+                raise ValueError("Unknown NTP choice: {}".format(inChoice))
+            if inChoice == "MANUAL":
+                data.SetNTPManualServers(data.ntp.servers([]))
+
+            data.SetNTPMode(mode)
             Layout.Inst().PushDialogue(InfoDialogue( inMessage))
         except Exception as e:
             Layout.Inst().PushDialogue(InfoDialogue( Lang("Update failed: ")+Lang(e)))