COnfig for orchestra

Benjamin Renard
1 parent e5e0bb74
Showing 7 changed files with 100 additions and 51 deletions Show diff stats
config/AMDAIntegrationConfig.php
config/current.env.template
src/InputOutput/IHMImpl/MachineLearning/IHMMachineLearningClass.php
src/InputOutput/IHMImpl/Process/IHMInputOutputGetInfoProcessClass.php
src/Request/Config/OrchestraConfigClass.php
src/Request/OrchestraRequestImpl/OrchestraRequestClass.php
src/Request/OrchestraRequestImpl/OrchestraRequestDataClass.php
@@ -40,6 +40,10 @@ define(&#39;TOOLS_BASE_DIR&#39;, $config[&#39;TOOLS_BASE_DIR&#39;]);
 define('KERNEL_BUILD_TYPE', $config['KERNEL_BUILD_TYPE']);
 define('AMDA_KERNEL_DIR', $config['AMDA_KERNEL_DIR']);
 define('IHM_SRC_DIR', $config['IHM_SRC_DIR']);
+define('ORCHESTRA_HOST', $config['ORCHESTRA_HOST']);
+define('ORCHESTRA_PORT', $config['ORCHESTRA_PORT']);
+define('ORCHESTRA_ADMIN_IPS', $config['ORCHESTRA_ADMIN_IPS']);
+
 define('GCC_BASE_DIR', TOOLS_BASE_DIR.'/gcc/4.7.2/rtf');
 define('BOOST_BASE_DIR', TOOLS_BASE_DIR.'/gcc/4.7.2/boost');
@@ -16,3 +16,7 @@ AMDA_KERNEL_DIR=&#39;{:AMDA_KERNEL_DIR:}&#39;
 ;Path to AMDA_IHM base dir
 IHM_SRC_DIR='{:IHM_SRC_DIR:}'
+;Config for ORCHESTRA
+ORCHESTRA_HOST='{:ORCHESTRA_HOST:}'
+ORCHESTRA_PORT='{:ORCHESTRA_PORT:}'
+ORCHESTRA_ADMIN_IPS='{:ORCHESTRA_ADMIN_IPS:}'
 \ No newline at end of file
@@ -31,11 +31,12 @@ class IHMMachineLearningClass implements InputOutputInterface
 		$processData = new OrchestraRequestDataClass();
-		$processData->setHost('http://172.17.0.1');
-		$processData->setPort('5000');
 		$processData->setBatchEnable(FALSE);
 		switch ($input->mode) {
+			case 'configinfo':
+				$processData->setRequestType(OrchestraRequestTypeEnum::CONFIGINFO);
+				break;
 			case 'moduleslist':
 				$processData->setRequestType(OrchestraRequestTypeEnum::MODULESLIST);
 				break;
@@ -144,7 +145,7 @@ class IHMMachineLearningClass implements InputOutputInterface
 			case ProcessStatusEnumClass::ERROR :
 			case ProcessStatusEnumClass::RUNNING :
 			case ProcessStatusEnumClass::DONE :
-				return $this->jobsManager->addJob(
+				return  $this->jobsManager->addJob(
 					$this->input,
 					$data->getId(),
 					$this->workingDirName,
@@ -153,11 +154,11 @@ class IHMMachineLearningClass implements InputOutputInterface
 					$data->getOrchestraResult(),
 					$data->getErrorCode(),
 					$data->getExecTime());
-                        default :
-                                return array(
-                                'success' => false,
-                                'message'   => 'Unknown Process Status');
-                }
+            default :
+                return array(
+                    'success' => false,
+                    'message'   => 'Unknown Process Status');
+        }
 	}
 } 
-<?php
-
-/**
- * @class IHMInputOutputGetInfoProcessClass
- * @brief Class that's implement an InputOutputInterface used to treat a get info process request
- * @details
- */
+<?php
+
+/**
+ * @class IHMInputOutputGetInfoProcessClass
+ * @brief Class that's implement an InputOutputInterface used to treat a get info process request
+ * @details
+ */
 class IHMInputOutputGetInfoProcessClass implements InputOutputInterface
 {
 	protected $jobsManager       = null;
 	protected $paramsData        = null;
-
-	/*
-	 * @brief Constructor
+
+	/*
+	 * @brief Constructor
 	*/
 	function __construct()
 	{
 		$this->jobsManager      = new IHMJobsManagerClass();
 	}
-
-	/*
-	 * @brief translate input data from IHM client to AMDA_Integration module for a get info process request
+
+	/*
+	 * @brief translate input data from IHM client to AMDA_Integration module for a get info process request
 	*/
 	public function getInputData($input,$function,$requestId="")
 	{
@@ -36,9 +36,9 @@ class IHMInputOutputGetInfoProcessClass implements InputOutputInterface
 		return $this->paramsData;
 	}
-
-	/*
-	 * @brief translate output data from AMDA_Integration module to IHM client for a get info process request
+
+	/*
+	 * @brief translate output data from AMDA_Integration module to IHM client for a get info process request
 	*/
 	public function getOutput($data)
 	{
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @class OrchestraConfigClass
+ * @brief Class that's contain all specific configuration of the orchestra module
+ * @details
+ */
+class OrchestraConfigClass
+{
+	public static function getHost()
+	{
+		if (defined('ORCHESTRA_HOST'))
+			return ORCHESTRA_HOST;
+		return "";
+	}
+	
+	public static function getPort()
+	{
+		if (defined('ORCHESTRA_PORT'))
+			return ORCHESTRA_PORT;
+		return "";
+	}
+
+	public static function getAdminIps()
+	{
+		if (defined('ORCHESTRA_ADMIN_IPS'))
+			return explode(',', ORCHESTRA_ADMIN_IPS);
+		return array();
+	}
+}
+
+?>
@@ -6,6 +6,9 @@
  */
 class OrchestraRequestClass extends ProcessRequestClass
 {
+	private $host = "";
+	private $port = "";
+
 	/*
 	 * @brief Init a process request of type "run"
 	 */
@@ -14,10 +17,36 @@ class OrchestraRequestClass extends ProcessRequestClass
 		if (!isset($this->requestData))
 			return false;
-		$orchestraClient = new OrchestraClient($this->requestData->getHost().":".$this->requestData->getPort());
+		$this->host = OrchestraConfigClass::getHost();
+		$this->port = OrchestraConfigClass::getPort();
+		if (empty($this->host)) {
+			$this->requestData->setLastErrorMessage('Missing orchestra host definition');
+			return false;
+		}
+		$orchestraEntryPoint = $this->host;
+		if (!empty($this->port)) {
+			$orchestraEntryPoint .= ":".$this->port;
+		}
+
+		$orchestraClient = new OrchestraClient($orchestraEntryPoint);
 		$params = $this->requestData->getParams();
 		switch ($this->requestData->getRequestType()) {
+			case OrchestraRequestTypeEnum::CONFIGINFO:
+				if (in_array(getenv("REMOTE_ADDR"), OrchestraConfigClass::getAdminIps())) {
+					$result = array(
+						'success' => TRUE,
+						'entrypoint' => $orchestraEntryPoint
+					);
+				}
+				else {
+					$result = array(
+						'success' => FALSE,
+						'message' => 'Forbidden'
+					);
+				}
+				$this->requestData->setOrchestraResult($result);
+				break;
 			case OrchestraRequestTypeEnum::MODULESLIST:
 				$result = $orchestraClient->getModules();
 				$this->requestData->setOrchestraResult($result);
@@ -77,7 +106,7 @@ class OrchestraRequestClass extends ProcessRequestClass
 		// Generate a PHP script to run request (to be able to "detach" process for the batch mode)
 		$php_script  = '<?php'.PHP_EOL;
 		$php_script .= 'require_once("'.$clientPath.'");'.PHP_EOL;
-		$php_script .= '$client = new OrchestraClient("'.$this->requestData->getHost().':'.$this->requestData->getPort().'");'.PHP_EOL;
+		$php_script .= '$client = new OrchestraClient("'.$this->host.':'.$this->port.'");'.PHP_EOL;
 		$php_script .= '$params = array(';
 		$first_param = TRUE;
 		foreach ($params as $key => $value) {
@@ -3,10 +3,11 @@
 abstract class OrchestraRequestTypeEnum
 {
 	const UNKNOWN       = "";
+	const CONFIGINFO    = "CONFIGINFO";
 	const MODULESLIST   = "MODULESLIST";
-        const MODULEINFO    = "MODULEINFO";
-        const PREDICTION    = "PREDICTION";
-        const FITTING       = "FITTING";
+    const MODULEINFO    = "MODULEINFO";
+    const PREDICTION    = "PREDICTION";
+    const FITTING       = "FITTING";
 	const GETRESULT     = "GETRESULT";
 }
@@ -17,32 +18,10 @@ abstract class OrchestraRequestTypeEnum
  */
 class OrchestraRequestDataClass extends ProcessRequestDataClass
 {
-	private $host            = "http://127.0.0.1";
-	private $port            = "5000";
 	private $type            = OrchestraRequestTypeEnum::UNKNOWN;
 	private $params          = array();
 	private $orchestraResult = NULL;
-	public function getHost()
-	{
-		return $this->host;
-	}
-
-	public function setHost($host)
-	{
-		$this->host = $host;
-	}
-
-	public function getPort()
-	{
-		return $this->port;
-	}
-
-	public function setPort($port)
-	{
-		$this->port = $port;
-	}
-
 	public function getRequestType()
 	{
 		return $this->type;