Remove heart beat related part from framework and setup script

Author: amat27

hpcframework.py

@@ -39,8 +39,7 @@ def run(self):
             except KeyboardInterrupt:
                 print('Stop requested by user, stopping framework....')
 
-    def __init__(self, script_path, setup_path, headnode, ssl_thumbprint, client_cert, framework_uri, listen_port,
-                 node_group=""):
+    def __init__(self, script_path, setup_path, headnode, ssl_thumbprint, client_cert, node_group=""):
         logging.basicConfig()
         self.logger = logging_aux.init_logger_aux("hpcframework", "hpcframework.log")
         # signal.signal(signal.SIGINT, signal.SIG_IGN)
@@ -50,8 +49,6 @@ def __init__(self, script_path, setup_path, headnode, ssl_thumbprint, client_cer
         self.setup_path = setup_path
         self.headnode = headnode
         self.ssl_thumbprint = ssl_thumbprint
-        self.framework_uri = framework_uri
-        self.listen_port = listen_port
         self.node_group = node_group
         self.hpc_client = HpcRestClient(client_cert)
         self.heartbeat_table = hpc_cluster_manager.HpcClusterManager(self.hpc_client, node_group=self.node_group)
@@ -93,7 +90,6 @@ def shutdown(self):
         self.driver.tearDown()
         self.mesos_client.stop = True
         self.stop = True
-        self.heartbeat_server.stop()
 
     def subscribed(self, driver):
         self.logger.warn('SUBSCRIBED')
@@ -187,7 +183,6 @@ def accept_offer(self, offer):
             'command': {'value':
                             'powershell -File ' + self.script_path + " -setupPath " + self.setup_path +
                             " -headnode " + self.headnode + " -sslthumbprint " + self.ssl_thumbprint +
-                            " -frameworkUri " + self.framework_uri + " -port " + str(self.listen_port) +
                             " > setupscript.log"}
         }
         self.logger.debug("Sending command:\n{}".format(task['command']['value']))
@@ -213,16 +208,13 @@ def _kill_task_by_hostname(self, hostname):
     parser = argparse.ArgumentParser(description="HPC Pack Mesos framework")
     parser.add_argument("-g", "--node_group", default="",
                         help="The node group in which we need to perform grow-shrink.")
-    parser.add_argument("-p", "--listen_port", default=8088, type=int,
-                        help="The port to which Mesos slave heart beat will send back")
     parser.add_argument("script_path", help="Path of HPC Pack Mesos slave setup script (e.g. setupscript.ps1)")
     parser.add_argument("setup_path", help="Path of HPC Pack setup executable (e.g. setup.exe)")
     parser.add_argument("headnode", help="Hostname of HPC Pack cluster head node")
     parser.add_argument("ssl_thumbprint",
                         help="Thumbprint of certificate which will be used in installation and communication with HPC "
                              "Pack cluster")
     parser.add_argument("client_cert", help=".pem file of client cert used for HPC Management REST API authentication")
-    parser.add_argument("heartbeat_uri", help="Base URI of heart beat server of HPC Pack Mesos framework")
     args = parser.parse_args()
 
     print "Input arguments:"
@@ -231,11 +223,9 @@ def _kill_task_by_hostname(self, hostname):
     print "headnode: " + args.headnode
     print "ssl_thumbprint: " + args.ssl_thumbprint
     print "client_cert: " + args.client_cert
-    print "heartbeat_uri: " + args.heartbeat_uri
-    print "listen_port: " + str(args.listen_port)
     if args.node_group != "":
         print "node_group: " + args.node_group
 
     hpcpack_framework = HpcpackFramwork(args.script_path, args.setup_path, args.headnode, args.ssl_thumbprint,
-                                        args.client_cert, args.heartbeat_uri, args.listen_port, args.node_group)
+                                        args.client_cert, args.node_group)
     hpcpack_framework.start()

hpcframework_unittest.py

@@ -56,7 +56,7 @@ def create_mock_mesos_offer(cpus, max_cores, is_windows, hostname):
 
 class HpcFrameworkUnitTest(unittest.TestCase):
     def setUp(self):
-        self.hpcpackFramework = hpcframework.HpcpackFramwork("", "", "", "", "", "", 0, "")
+        self.hpcpackFramework = hpcframework.HpcpackFramwork("", "", "", "", "", "")
 
     @patch('hpcframework.HpcpackFramwork.decline_offer')
     @patch('hpcframework.HpcpackFramwork.accept_offer')

setupscript.ps1

@@ -1,4 +1,4 @@
-param ([string]$setupPath = "C:\HPCPack2016\setup.exe", [string]$headnode = "", [string]$sslthumbprint = "", [string]$frameworkUri = "localhost", [string]$port = "8088")
+param ([string]$setupPath = "C:\HPCPack2016\setup.exe", [string]$headnode = "", [string]$sslthumbprint = "")
 
 $createdMutex = ""
 $mutex = New-Object -TypeName system.threading.mutex($true, "Global\HpcMesos", [ref]$CreatedMutex)
@@ -19,7 +19,6 @@ schtasks /run /tn mesoshpcdaemon
 
 $setupPath
 $setupProc = Start-Process $setupPath -ArgumentList "-unattend -computenode:$headnode -sslthumbprint:$sslthumbprint" -PassThru
-#$setupProc = Start-Process "C:\HPCPack2016\private.20180308.251b491.release.debug\release.debug\setup.exe" -ArgumentList "-unattend -computenode:mesoswinagent -sslthumbprint:0386B1198B956BBAAA4154153B6CA1F44B6D1016" -PassThru
 $setupProc.WaitForExit()
 
 Write-Output "Set CCP_ env vars and registry"
@@ -53,10 +52,6 @@ sc.exe start HpcNodeManager
 sc.exe start HpcSoaDiagMon
 sc.exe start HpcBroker
 
-$heartBeatParams = @{ "hostname" = hostname } | ConvertTo-Json
-$url = "http://" + $frameworkUri + ":" + $port
-$url
-
 while ($true)
 {
     try
@@ -67,9 +62,6 @@ while ($true)
             Write-Output "Daemon script not found. Restart."
             schtasks /run /tn mesoshpcdaemon
         }
-
-        Write-Output "Send HeartBeat to"  $url
-        Invoke-WebRequest -Method Post $url -Body $heartBeatParams
     }
     catch
     {