Make NTP minpoll and maxpoll config together

plugins/module_utils/network/sonic/argspec/ntp/ntp.py

@@ -67,6 +67,7 @@ def __init__(self, **kwargs):
                         'minpoll': {'type': 'int'},
                         'prefer': {'type': 'bool'}
                     },
+                    'required_together': [['minpoll', 'maxpoll']],
                     'type': 'list'
                 },
                 'source_interfaces': {

plugins/module_utils/network/sonic/config/ntp/ntp.py

@@ -160,6 +160,8 @@ def _state_merged(self, want, have):
 
         commands = diff
         requests = []
+
+        self.preprocess_merge_commands(commands, want)
         if commands:
             requests = self.get_merge_requests(commands, have)
 
@@ -252,6 +254,41 @@ def preprocess_want(self, want, state):
                     if 'prefer' in server and server['prefer'] is None:
                         server.pop('prefer')
 
+    def search_servers(self, svr_address, servers):
+
+        found_server = dict()
+        if servers is not None:
+            for server in servers:
+                if server['address'] == svr_address:
+                    found_server = server
+        return found_server
+
+    def preprocess_merge_commands(self, commands, want):
+
+        if 'servers' in commands and commands['servers'] is not None:
+            for server in commands['servers']:
+                if 'minpoll' in server and 'maxpoll' not in server:
+                    want_server = dict()
+                    if 'servers' in want:
+                        want_server = self.search_servers(server['address'], want['servers'])
+
+                    if want_server:
+                        server['maxpoll'] = want_server['maxpoll']
+                    else:
+                        err_msg = "Internal error with NTP server maxpoll configuration."
+                        self._module.fail_json(msg=err_msg, code=500)
+
+                if 'maxpoll' in server and 'minpoll' not in server:
+                    want_server = dict()
+                    if 'servers' in want:
+                        want_server = self.search_servers(server['address'], want['servers'])
+
+                    if want_server:
+                        server['minpoll'] = want_server['minpoll']
+                    else:
+                        err_msg = "Internal error with NTP server minpoll configuration."
+                        self._module.fail_json(msg=err_msg, code=500)
+
     def get_merge_requests(self, configs, have):
 
         requests = []

plugins/modules/sonic_ntp.py

@@ -67,6 +67,7 @@
         elements: dict
         description:
           - List of NTP servers.
+          - minpoll and maxpoll are required to be configured together.
         suboptions:
           address:
             type: str