Merge branch 'client-auth'

# Conflicts:
#	.idea/inspectionProfiles/Project_Default.xml

Author: amat27

.idea/inspectionProfiles/Project_Default.xml

@@ -40,7 +40,7 @@ def run(self):
             except KeyboardInterrupt:
                 print('Stop requested by user, stopping framework....')
 
-    def __init__(self, script_path="", setup_path="", headnode="", ssl_thumbprint="", framework_uri="", node_group=""):
+    def __init__(self, script_path, setup_path, headnode, ssl_thumbprint, client_cert, framework_uri, node_group=""):
         logging.basicConfig()
         self.logger = logging_aux.init_logger_aux("hpcframework", "hpcframework.log")
         # signal.signal(signal.SIGINT, signal.SIG_IGN)
@@ -52,7 +52,7 @@ def __init__(self, script_path="", setup_path="", headnode="", ssl_thumbprint=""
         self.ssl_thumbprint = ssl_thumbprint
         self.framework_uri = framework_uri
         self.node_group = node_group
-        self.hpc_client = HpcRestClient()
+        self.hpc_client = HpcRestClient(client_cert)
         self.heartbeat_table = hpc_cluster_manager.HpcClusterManager(self.hpc_client, node_group=self.node_group)
         self.heartbeat_table.subscribe_node_closed_callback(lambda l: map(self._kill_task_by_hostname, l))
         self.heartbeat_table.start()
@@ -216,8 +216,9 @@ def _kill_task_by_hostname(self, hostname):
     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 installtion and communication with HPC "
+                        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()
 

hpcframework.py

@@ -47,9 +47,11 @@ class HpcRestClient(object):
     NODE_STATUS_NODE_HEALTH_UNAPPROVED_VALUE = "Unapproved"
     NODE_STATUS_NODE_GROUP_KEY = "Groups"
 
-    def __init__(self, hostname="localhost"):
+    def __init__(self, pem, hostname="localhost"):
+        # type: (str) -> None
         self.hostname = hostname
         self.logger = logging_aux.init_logger_aux("hpcframework.restclient", 'hpcframework.restclient.log')
+        self._pem = pem
 
     def _log_error(self, function_name, res):
         self.logger.error("{}: status_code:{} content:{}".format(function_name, res.status_code, res.content))
@@ -61,7 +63,7 @@ def _log_info(self, function_name, res):
     def _get(self, function_name, function_route, params):
         headers = {"Content-Type": "application/json"}
         url = function_route.format(self.hostname)
-        res = requests.get(url, headers=headers, verify=False, params=params)
+        res = requests.get(url, headers=headers, verify=False, params=params, cert=self._pem)
         try:
             res.raise_for_status()
             self._log_info(function_name, res)
@@ -73,7 +75,7 @@ def _get(self, function_name, function_route, params):
     def _post(self, function_name, function_route, data):
         headers = {"Content-Type": "application/json"}
         url = function_route.format(self.hostname)
-        res = requests.post(url, data=data, headers=headers, verify=False)
+        res = requests.post(url, data=data, headers=headers, verify=False, cert=self._pem)
         try:
             res.raise_for_status()
             self._log_info(function_name, res)
@@ -85,7 +87,7 @@ def _post(self, function_name, function_route, data):
     # Starts auto-scale api
     def get_grow_decision(self, node_group_name=""):
         url = self.GROW_DECISION_API_ROUTE.format(self.hostname)
-        res = requests.post(url, verify=False)
+        res = requests.post(url, verify=False, cert=self._pem, timeout=15)
         if res.ok:
             self.logger.info(res.content)
             grow_decision_dict = {k.upper(): v for k, v in json.loads(res.content).items()}
@@ -100,6 +102,7 @@ def get_grow_decision(self, node_group_name=""):
             self.logger.error("status_code:{} content:{}".format(res.status_code, res.content))
 
     def check_nodes_idle(self, nodes):
+        # type: (list[str]) -> list[IdleNode]
         data = json.dumps(nodes)
         res = self._post(self.check_nodes_idle.__name__, self.CHECK_NODES_IDLE_ROUTE, data)
         jobjs = json.loads(res.content)
@@ -155,10 +158,10 @@ def add_node_to_node_group(self, group_name, node_names):
 
 
 if __name__ == '__main__':
-    client = HpcRestClient()
+    client = HpcRestClient(r"E:\Certs\testhpcfull.pem")
     ans = client.get_grow_decision()
     print ans.cores_to_grow
-    print client.check_nodes_idle(json.dumps(['mesoswinjd']))
+    print client.check_nodes_idle(['mesoswinjd'])
 
     print client.list_node_groups("MESOS")
     print client.add_node_group("Mesos", "Node Group for Compute nodes from Mesos")