option to start hpo with different port

Signed-off-by: kusumachalasani <[email protected]>

Author: kusumachalasani

deploy_hpo.sh

@@ -36,6 +36,7 @@ hpo_ns=""
 # docker: loop timeout is turned off by default
 timeout=-1
 service_type="both"
+service_port="8085"
 
 # source the helpers script
 source ${SCRIPTS_DIR}/cluster-helpers.sh
@@ -70,7 +71,7 @@ function check_cluster_type() {
 	esac
 }
 
-VALID_ARGS=$(getopt -o ac:d:o:n:strb --long non_interactive,cluster_type:,configmaps:,container_image:,namespace:,start,terminate,rest,both -- "$@")
+VALID_ARGS=$(getopt -o ac:d:o:n:p:strb --long non_interactive,cluster_type:,configmaps:,container_image:,namespace:,start,terminate,rest,both,port: -- "$@")
 if [[ $? -ne 0 ]]; then
 	usage
 	exit 1;
@@ -102,6 +103,10 @@ while [ : ]; do
 		hpo_ns="$2"
 		shift 2
 		;;
+	-p | --port)
+                service_port="$2"
+                shift 2
+                ;;
 	-s | --start)
 		setup=1
 		shift
@@ -142,7 +147,7 @@ SERVICE_STATUS_DOCKER=$(${CONTAINER_RUNTIME} ps | grep hpo_docker_container)
 # Call the proper setup function based on the cluster_type
 if [ ${setup} == 1 ]; then
 	if [ ${cluster_type} = "native" ]; then
-		${cluster_type}_start ${service_type}
+		${cluster_type}_start ${service_type} ${service_port}
 	elif [ ${cluster_type} = "operate-first" ]; then
 		echo
 		echo "Info: Access HPO at ${Op_first_URL}"

scripts/cluster-helpers.sh

@@ -93,9 +93,9 @@ function native_start() {
 	cp experiment.html experiment_torestore.html
 
 	if [ "$1" = "REST" ]; then
-		python3 -u src/service.py "REST"
+		python3 -u src/service.py "REST" "$2"
 	else
-		python3 -u src/service.py "BOTH"
+		python3 -u src/service.py "BOTH" "$2"
 	fi
 }
 

src/rest_service.py

@@ -322,11 +322,12 @@ def get_search_create_study(search_space_json, operation):
 			return response
 
 
-def main():
-	server = HTTPServer((HPOSupportedTypes.SERVER_HOSTNAME, HPOSupportedTypes.SERVER_PORT), HTTPRequestHandler)
-	logger.info("Access REST Service at http://%s:%s" % ("localhost", HPOSupportedTypes.SERVER_PORT))
-	server.serve_forever()
+def main(server_port=8085):
+    hpo_instance = HPOSupportedTypes(server_port=server_port)
+    server = HTTPServer((HPOSupportedTypes.SERVER_HOSTNAME,  hpo_instance.SERVER_PORT), HTTPRequestHandler)
+    logger.info("Access REST Service at http://%s:%s" % ("localhost",  hpo_instance.SERVER_PORT))
+    server.serve_forever()
 
 
 if __name__ == '__main__':
-	main()
+    main(server_port=8085)

src/service.py

@@ -29,14 +29,16 @@ def signal_handler(sig, frame):
 
 def main():
 
-    logger.info('Starting HPO service')
-    if ( len(sys.argv) == 1 ) or ( len(sys.argv) == 2 and sys.argv[1] == "BOTH" ):
+    if ( len(sys.argv) == 1 ) or ( len(sys.argv) == 2 and sys.argv[1] == "BOTH" ) or ( len(sys.argv) == 3 and sys.argv[1] == "BOTH" ):
         import grpc_service
         gRPCservice = threading.Thread(target=grpc_service.serve)
         gRPCservice.daemon = True
         gRPCservice.start()
-
-    restService = threading.Thread(target=rest_service.main)
+    if (sys.argv[2] != ''):
+        server_port = int(sys.argv[2])
+    else:
+        server_port=8085
+    restService = threading.Thread(target=rest_service.main, args=(server_port,))
     restService.daemon = True
     restService.start()
 

src/utils.py

@@ -28,10 +28,14 @@ class HPOSupportedTypes:
     N_JOBS = 1
     N_TRIALS = 10
     SERVER_HOSTNAME = "0.0.0.0"
-    SERVER_PORT = 8092
+    #SERVER_PORT = 8085
     API_ENDPOINT = "/experiment_trials"
     CONTENT_TYPE = "application/json"
 
+    def __init__(self, server_port=None):
+        if server_port is not None:
+            self.SERVER_PORT = server_port
+
 
 class HPOErrorConstants:
     INVALID_OPERATION = "Invalid Operation value!"