diff --git a/classes/NewRest/Controllers/AkrrControllerProvider.php b/classes/Rest/Controllers/AkrrControllerProvider.php similarity index 81% rename from classes/NewRest/Controllers/AkrrControllerProvider.php rename to classes/Rest/Controllers/AkrrControllerProvider.php index a1dd12b..fbfa932 100644 --- a/classes/NewRest/Controllers/AkrrControllerProvider.php +++ b/classes/Rest/Controllers/AkrrControllerProvider.php @@ -1,6 +1,6 @@ get("$root/token", '\NewRest\Controllers\AkrrControllerProvider::getToken'); + ->get("$root/token", '\Rest\Controllers\AkrrControllerProvider::getToken'); $controller - ->get("$root/resources", '\NewRest\Controllers\AkrrControllerProvider::getResources'); + ->get("$root/resources", '\Rest\Controllers\AkrrControllerProvider::getResources'); $controller - ->get("$root/kernels", '\NewRest\Controllers\AkrrControllerProvider::getKernels'); + ->get("$root/kernels", '\Rest\Controllers\AkrrControllerProvider::getKernels'); $controller - ->get("$root/tasks/scheduled", '\NewRest\Controllers\AkrrControllerProvider::getTasks'); + ->get("$root/tasks/scheduled", '\Rest\Controllers\AkrrControllerProvider::getTasks'); $controller - ->post("$root/tasks/scheduled", '\NewRest\Controllers\AkrrControllerProvider::createTask'); + ->post("$root/tasks/scheduled", '\Rest\Controllers\AkrrControllerProvider::createTask'); $controller - ->put("$root/tasks/scheduled/{id}", '\NewRest\Controllers\AkrrControllerProvider::updateTask') + ->put("$root/tasks/scheduled/{id}", '\Rest\Controllers\AkrrControllerProvider::updateTask') ->convert('id', $idConverter); $controller - ->delete("$root/tasks/scheduled/{id}", '\NewRest\Controllers\AkrrControllerProvider::deleteTask') + ->delete("$root/tasks/scheduled/{id}", '\Rest\Controllers\AkrrControllerProvider::deleteTask') ->convert('id', $idConverter); $controller - ->get("$root/walltime", '\NewRest\Controllers\AkrrControllerProvider::getWalltime'); + ->get("$root/walltime", '\Rest\Controllers\AkrrControllerProvider::getWalltime'); $controller - ->post("$root/walltime", '\NewRest\Controllers\AkrrControllerProvider::createWalltime'); + ->post("$root/walltime", '\Rest\Controllers\AkrrControllerProvider::createWalltime'); $controller - ->put("$root/walltime", '\NewRest\Controllers\AkrrControllerProvider::updateWalltime'); + ->put("$root/walltime", '\Rest\Controllers\AkrrControllerProvider::updateWalltime'); $controller - ->delete("$root/walltime/{id}", '\NewRest\Controllers\AkrrControllerProvider::deleteWalltime') + ->delete("$root/walltime/{id}", '\Rest\Controllers\AkrrControllerProvider::deleteWalltime') ->convert('id', $idConverter); $controller - ->get("$root/tasks/active", '\NewRest\Controllers\AkrrControllerProvider::getActiveTasks'); + ->get("$root/tasks/active", '\Rest\Controllers\AkrrControllerProvider::getActiveTasks'); $controller - ->put("$root/tasks/active/{id}", '\NewRest\Controllers\AkrrControllerProvider::updateActiveTask') + ->put("$root/tasks/active/{id}", '\Rest\Controllers\AkrrControllerProvider::updateActiveTask') ->convert('id', $idConverter); $controller - ->delete("$root/tasks/active/{id}", '\NewRest\Controllers\AkrrControllerProvider::deleteActiveTask') + ->delete("$root/tasks/active/{id}", '\Rest\Controllers\AkrrControllerProvider::deleteActiveTask') ->convert('id', $idConverter); } @@ -102,8 +102,9 @@ public function getToken(Request $request, Application $app) { return $app ->json( - $this->_call($request, '/token', 'GET', false, false), - 200) + $this->call($request, '/token', 'GET', false, false), + 200 + ) ->setTtl(60); } @@ -128,8 +129,9 @@ public function getToken(Request $request, Application $app) public function getResources(Request $request, Application $app) { return $app->json( - $this->_call($request, '/resources'), - 200); + $this->call($request, '/resources'), + 200 + ); } /** @@ -154,8 +156,9 @@ public function getResources(Request $request, Application $app) public function getKernels(Request $request, Application $app) { return $app->json( - $this->_call($request, '/kernels'), - 200); + $this->call($request, '/kernels'), + 200 + ); } /** @@ -188,8 +191,9 @@ public function getKernels(Request $request, Application $app) public function getTasks(Request $request, Application $app) { return $app->json( - $this->_call($request, '/scheduled_tasks'), - 200); + $this->call($request, '/scheduled_tasks'), + 200 + ); } /** @@ -217,15 +221,16 @@ public function createTask(Request $request, Application $app) 'group_id' )); - $data = $this->_cleanUpData($data); + $data = $this->cleanUpData($data); $appKernel = $data['app_kernel']; unset($data['app_kernel']); $data['app'] = $appKernel; return $app->json( - $this->_call($request, '/scheduled_tasks', 'POST', $data), - 200); + $this->call($request, '/scheduled_tasks', 'POST', $data), + 200 + ); } /** @@ -250,11 +255,12 @@ public function updateTask(Request $request, Application $app, $id) 'repeat_in' )); - $data = $this->_cleanUpData($data); + $data = $this->cleanUpData($data); return $app->json( - $this->_call($request, "/scheduled_tasks/$id", 'POST', $data), - 200); + $this->call($request, "/scheduled_tasks/$id", 'POST', $data), + 200 + ); } /** @@ -273,8 +279,9 @@ public function deleteTask(Request $request, Application $app, $id) { return $app->json( - $this->_call($request, "/scheduled_tasks/$id", 'DELETE'), - 200); + $this->call($request, "/scheduled_tasks/$id", 'DELETE'), + 200 + ); } /** @@ -305,8 +312,9 @@ public function getWalltime(Request $request, Application $app) { return $app->json( - $this->_call($request, '/walltime'), - 200); + $this->call($request, '/walltime'), + 200 + ); } /** @@ -332,7 +340,7 @@ public function createWalltime(Request $request, Application $app) 'comments' )); - $data = $this->_cleanUpData($data); + $data = $this->cleanUpData($data); $resource = $data['resource']; $appKernel = $data['app_kernel']; @@ -340,8 +348,9 @@ public function createWalltime(Request $request, Application $app) unset($data['app_kernel']); return $app->json( - $this->_call($request, "/walltime/$resource/$appKernel", 'POST', $data), - 200); + $this->call($request, "/walltime/$resource/$appKernel", 'POST', $data), + 200 + ); } /** @@ -361,7 +370,7 @@ public function updateWalltime(Request $request, Application $app) 'comments' )); - $data = $this->_cleanUpData($data); + $data = $this->cleanUpData($data); $resource = $data['resource']; $appKernel = $data['app_kernel']; @@ -369,8 +378,9 @@ public function updateWalltime(Request $request, Application $app) unset($data['app_kernel']); return $app->json( - $this->_call($request, "/walltime/$resource/$appKernel", 'POST', $data), - 200); + $this->call($request, "/walltime/$resource/$appKernel", 'POST', $data), + 200 + ); } /** @@ -389,8 +399,9 @@ public function updateWalltime(Request $request, Application $app) public function deleteWalltime(Request $request, Application $app, $id) { return $app->json( - $this->_call($request, "/walltime/$id", 'DELETE'), - 200); + $this->call($request, "/walltime/$id", 'DELETE'), + 200 + ); } /** @@ -434,8 +445,9 @@ public function getActiveTasks(Request $request, Application $app) { return $app->json( - $this->_call($request, '/active_tasks'), - 200); + $this->call($request, '/active_tasks'), + 200 + ); } /** @@ -458,11 +470,12 @@ public function updateActiveTask(Request $request, Application $app, $id) 'next_check_time' )); - $data = $this->_cleanUpData($data); + $data = $this->cleanUpData($data); return $app->json( - $this->_call($request, "/active_tasks/$id", 'PUT', $data), - 200); + $this->call($request, "/active_tasks/$id", 'PUT', $data), + 200 + ); } /** @@ -481,8 +494,9 @@ public function updateActiveTask(Request $request, Application $app, $id) public function deleteActiveTask(Request $request, Application $app, $id) { return $app->json( - $this->_call($request, "/active_tasks/$id", 'DELETE'), - 200); + $this->call($request, "/active_tasks/$id", 'DELETE'), + 200 + ); } /** @@ -492,7 +506,7 @@ public function deleteActiveTask(Request $request, Application $app, $id) * @param array $data * @return array that was passed in, only "clean". */ - private function _cleanUpData(array $data) + private function cleanUpData(array $data) { if (isset($data)) { unset($data['token']); @@ -505,7 +519,7 @@ private function _cleanUpData(array $data) /** * A convenience method that reduces the amount of boilerplate required to wire up an end point in this controller. * It handles: token management and base url management ( aka. host, port and end point of the AKRR REST API ) - * before passing control on to the _callAPI method. + * before passing control on to the callAPI method. * * @param Request $request that will be used to gather the information required to complete the requested action. * @param string $path to the unique AKRR REST endpoint that is to be called. @@ -517,31 +531,37 @@ private function _cleanUpData(array $data) * @throws HttpInvalidParamException * @throws \Exception */ - private function _call(Request $request, $path, $method = 'GET', $data = null, $useToken = true) + private function call(Request $request, $path, $method = 'GET', $data = null, $useToken = true) { - if (!isset($path)) throw new HttpInvalidParamException('A path is required for the requested operation.'); - if (!isset($method)) throw new HttpInvalidParamException('A method is required for the requested operation.'); + if (!isset($path)) { + throw new HttpInvalidParamException('A path is required for the requested operation.'); + } + if (!isset($method)) { + throw new HttpInvalidParamException('A method is required for the requested operation.'); + } - $baseUrl = $this->_getUrl(); + $baseUrl = $this->getUrl(); $url = "$baseUrl$path"; if ($useToken) { if (!isset($this->token)) { - $results = $this->_call($request, '/token', 'GET', false, false); + $results = $this->call($request, '/token', 'GET', false, false); if (isset($results) && isset($results['data']) && isset($results['data']['token'])) { $this->token = $results['data']['token']; } } - if (!isset($this->token)) throw new HttpException('Unable to retrieve the required information. Unable to process request.'); + if (!isset($this->token)) { + throw new HttpException('Unable to retrieve the required information. Unable to process request.'); + } - $curlResult = $this->_callAPI($url, $this->token, null, $method, $data); + $curlResult = $this->callAPI($url, $this->token, null, $method, $data); } else { $username = \xd_utilities\getConfiguration('akrr', 'username'); $password = \xd_utilities\getConfiguration('akrr', 'password'); - $curlResult = $this->_callAPI($url, $username, $password, $method, $data, $useToken); + $curlResult = $this->callAPI($url, $username, $password, $method, $data, $useToken); } @@ -555,7 +575,7 @@ private function _call(Request $request, $path, $method = 'GET', $data = null, $ * @throws Exception if the settings file is not readable. * @throws \Exception if there is a problem retrieving data from the settings file. */ - private function _getUrl() + private function getUrl() { $host = \xd_utilities\getConfiguration('akrr', 'host'); $port = \xd_utilities\getConfiguration('akrr', 'port'); @@ -578,15 +598,15 @@ private function _getUrl() * authentication. * @return array */ - private function _callAPI( + private function callAPI( $path, $username, $password, $method = 'GET', $data = false, $useToken = true - ) - { + ) { + $url = $path; @@ -626,9 +646,9 @@ private function _callAPI( curl_setopt($curl, CURLOPT_USERPWD, sprintf("%s:%s", $username, $password)); } - curl_setopt($curl, CURLOPT_UNRESTRICTED_AUTH, TRUE); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE); + curl_setopt($curl, CURLOPT_UNRESTRICTED_AUTH, true); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); curl_setopt($curl, CURLOPT_URL, $url); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); @@ -656,6 +676,4 @@ private function _callAPI( return $result; } - - } diff --git a/classes/NewRest/Controllers/AppKernelControllerProvider.php b/classes/Rest/Controllers/AppKernelControllerProvider.php similarity index 87% rename from classes/NewRest/Controllers/AppKernelControllerProvider.php rename to classes/Rest/Controllers/AppKernelControllerProvider.php index 1e3d8a4..6ceaaa6 100644 --- a/classes/NewRest/Controllers/AppKernelControllerProvider.php +++ b/classes/Rest/Controllers/AppKernelControllerProvider.php @@ -1,5 +1,5 @@ prefix; - $controller->get("$root/details", '\NewRest\Controllers\AppKernelControllerProvider::getDetails'); - $controller->get("$root/datasets", '\NewRest\Controllers\AppKernelControllerProvider::getDatasets'); - $controller->get("$root/plots", '\NewRest\Controllers\AppKernelControllerProvider::getPlots'); - $controller->get("$root/control_regions", '\NewRest\Controllers\AppKernelControllerProvider::getControlRegions'); - $controller->post("$root/control_regions", '\NewRest\Controllers\AppKernelControllerProvider::createOrUpdateControlRegions') + $controller->get("$root/details", '\Rest\Controllers\AppKernelControllerProvider::getDetails'); + $controller->get("$root/datasets", '\Rest\Controllers\AppKernelControllerProvider::getDatasets'); + $controller->get("$root/plots", '\Rest\Controllers\AppKernelControllerProvider::getPlots'); + $controller->get("$root/control_regions", '\Rest\Controllers\AppKernelControllerProvider::getControlRegions'); + $controller->post("$root/control_regions", '\Rest\Controllers\AppKernelControllerProvider::createOrUpdateControlRegions') ->value('update', false); - $controller->put("$root/control_regions", '\NewRest\Controllers\AppKernelControllerProvider::createOrUpdateControlRegions') + $controller->put("$root/control_regions", '\Rest\Controllers\AppKernelControllerProvider::createOrUpdateControlRegions') ->value('update', true); - $controller->delete("$root/control_regions", '\NewRest\Controllers\AppKernelControllerProvider::deleteControlRegions'); + $controller->delete("$root/control_regions", '\Rest\Controllers\AppKernelControllerProvider::deleteControlRegions'); - $controller->get("$root/notifications", '\NewRest\Controllers\AppKernelControllerProvider::getNotifications'); - $controller->put("$root/notifications", '\NewRest\Controllers\AppKernelControllerProvider::putNotifications'); - $controller->get("$root/notifications/default", '\NewRest\Controllers\AppKernelControllerProvider::getDefaultNotifications'); - $controller->get("$root/notifications/send", '\NewRest\Controllers\AppKernelControllerProvider::sendNotification'); + $controller->get("$root/notifications", '\Rest\Controllers\AppKernelControllerProvider::getNotifications'); + $controller->put("$root/notifications", '\Rest\Controllers\AppKernelControllerProvider::putNotifications'); + $controller->get("$root/notifications/default", '\Rest\Controllers\AppKernelControllerProvider::getDefaultNotifications'); + $controller->get("$root/notifications/send", '\Rest\Controllers\AppKernelControllerProvider::sendNotification'); - $controller->get("$root/resources", '\NewRest\Controllers\AppKernelControllerProvider::getResources'); - $controller->get("$root/app_kernels", '\NewRest\Controllers\AppKernelControllerProvider::getAppKernels'); + $controller->get("$root/resources", '\Rest\Controllers\AppKernelControllerProvider::getResources'); + $controller->get("$root/app_kernels", '\Rest\Controllers\AppKernelControllerProvider::getAppKernels'); - $controller->get("$root/performance_map", '\NewRest\Controllers\AppKernelControllerProvider::getPerformanceMap'); - $controller->get("$root/success_rate", '\NewRest\Controllers\AppKernelControllerProvider::getAppKernelSuccessRate'); + $controller->get("$root/performance_map", '\Rest\Controllers\AppKernelControllerProvider::getPerformanceMap'); + $controller->get("$root/success_rate", '\Rest\Controllers\AppKernelControllerProvider::getAppKernelSuccessRate'); } /** @@ -108,18 +108,18 @@ public function getDetails(Request $request, Application $app) // Debug mode does not show metrics - $groupBy = (NULL !== $numProcUnits ? NULL - : (NULL !== $metricId ? "num_proc_units" - : (NULL !== $resourceId ? ($debugMode ? "num_proc_units" : "metric") - : (NULL !== $akId ? "resource" + $groupBy = (null !== $numProcUnits ? null + : (null !== $metricId ? "num_proc_units" + : (null !== $resourceId ? ($debugMode ? "num_proc_units" : "metric") + : (null !== $akId ? "resource" : "ak")))); $resource_first = $this->getBooleanParam($request, 'resource_first', false, false); if ($resource_first) { - $groupBy = (NULL !== $numProcUnits ? NULL - : (NULL !== $metricId ? "num_proc_units" - : (NULL !== $akId ? ($debugMode ? "num_proc_units" : "metric") - : (NULL !== $resourceId ? "ak" + $groupBy = (null !== $numProcUnits ? null + : (null !== $metricId ? "num_proc_units" + : (null !== $akId ? ($debugMode ? "num_proc_units" : "metric") + : (null !== $resourceId ? "ak" : "resource")))); } @@ -143,36 +143,39 @@ public function getDetails(Request $request, Application $app) } // Determine the node type. Debug mode does not show metrics - if ($resource_first) + if ($resource_first) { $nodeType = self::TREENODE_RESOURCE; - else + } else { $nodeType = self::TREENODE_APPKERNEL; + } - if (NULL !== $collected || NULL !== $instanceId) - $nodeType = NULL; - else if (($debugMode || NULL !== $metricId) && - NULL !== $resourceId && NULL !== $akId && NULL !== $numProcUnits - ) + if (null !== $collected || null !== $instanceId) { + $nodeType = null; + } elseif (($debugMode || null !== $metricId) && + null !== $resourceId && null !== $akId && null !== $numProcUnits + ) { $nodeType = self::TREENODE_INSTANCE; - else if (NULL !== $metricId && NULL !== $resourceId && NULL !== $akId) + } elseif (null !== $metricId && null !== $resourceId && null !== $akId) { $nodeType = self::TREENODE_UNITS; - else if (NULL !== $resourceId && NULL !== $akId) + } elseif (null !== $resourceId && null !== $akId) { $nodeType = ($debugMode ? self::TREENODE_UNITS : self::TREENODE_METRIC); - else { + } else { if ($resource_first) { - if (NULL !== $resourceId) + if (null !== $resourceId) { $nodeType = self::TREENODE_APPKERNEL; + } } else { - if (NULL !== $akId) + if (null !== $akId) { $nodeType = self::TREENODE_RESOURCE; + } } } // Load up the data - if (NULL !== $nodeType) { + if (null !== $nodeType) { $restrictions = array('ak' => $akId, 'resource' => $resourceId, 'metric' => $metricId, //AG 9/6/12 added to fix expand bug @@ -198,7 +201,7 @@ public function getDetails(Request $request, Application $app) 'resource_id' => $resourceId, 'num_units' => $numProcUnits, 'instance_id' => $instanceId); - $db->loadAppKernelInstanceInfo($akOptions, $ak, TRUE); + $db->loadAppKernelInstanceInfo($akOptions, $ak, true); $results[] = $ak->toHtml(); } @@ -292,23 +295,21 @@ public function getDatasets(Request $request, Application $app, $returnRawData = if ($format == 'json') //default format { return $app->json($results); - } else - if ($format == 'jsonstore') //not supported yet + } elseif ($format == 'jsonstore') //not supported yet { - } else - if ($format == 'xls' || $format == 'csv' || $format == 'xml') { - $title = 'data'; - $exportedDatas = array(); - foreach ($datasetList as $result) { - $exportedDatas[] = $result->export(); - $title = $result->akName . ': ' . $result->resourceName . ': ' . $result->metric; - } + } elseif ($format == 'xls' || $format == 'csv' || $format == 'xml') { + $title = 'data'; + $exportedDatas = array(); + foreach ($datasetList as $result) { + $exportedDatas[] = $result->export(); + $title = $result->akName . ': ' . $result->resourceName . ': ' . $result->metric; + } - $content = \DataWarehouse\ExportBuilder::export($exportedDatas, $format, $inline); + $content = \DataWarehouse\ExportBuilder::export($exportedDatas, $format, $inline); - return new Response($content['results'], Response::HTTP_OK, $content['headers']); - } + return new Response($content['results'], Response::HTTP_OK, $content['headers']); + } } /** @@ -398,11 +399,12 @@ public function getPlots(Request $request, Application $app) $resourceDescription = ''; $lastResult = new \AppKernel\Dataset('Empty App Kernel Dataset', -1, "", -1, "", -1, "", "", "", ""); $hc = new \DataWarehouse\Visualization\HighChartAppKernel($start_date, $end_date, $scale, $width, $height, $swap_xy); - $hc->setTitle($show_title ? 'Empty App Kernel Dataset' : NULL, $font_size); + $hc->setTitle($show_title ? 'Empty App Kernel Dataset' : null, $font_size); $hc->setLegend($legend_location, $font_size); $datasets = array(); - $hc->configure($datasets, + $hc->configure( + $datasets, $font_size, $limit, $offset, @@ -428,8 +430,9 @@ public function getPlots(Request $request, Application $app) foreach ($results as $result) { $num_proc_units_changed = false; - if ($show_num_proc_units_separately && $result->rawNumProcUnits != $lastResult->rawNumProcUnits) + if ($show_num_proc_units_separately && $result->rawNumProcUnits != $lastResult->rawNumProcUnits) { $num_proc_units_changed = true; + } if ($result->akName != $lastResult->akName || $result->resourceName != $lastResult->resourceName @@ -469,8 +472,8 @@ public function getPlots(Request $request, Application $app) } if ($format != 'params') { $hc = new \DataWarehouse\Visualization\HighChartAppKernel($start_date, $end_date, $scale, $width, $height, $swap_xy); - $hc->setTitle($show_title ? $result->metric : NULL, $font_size); - $hc->setSubtitle($show_title ? $result->resourceName : NULL, $font_size); + $hc->setTitle($show_title ? $result->metric : null, $font_size); + $hc->setSubtitle($show_title ? $result->resourceName : null, $font_size); $hc->setLegend($legend_location, $font_size); } } @@ -479,7 +482,8 @@ public function getPlots(Request $request, Application $app) if ($format != 'params') { $datasets = array($result); - $hc->configure($datasets, + $hc->configure( + $datasets, $font_size, $limit, $offset, @@ -540,30 +544,28 @@ public function getPlots(Request $request, Application $app) 'Content-Type' => 'application/javascript', ) ); - } else - if ($format == 'img_tag') { - foreach ($returnValue as $vis) { - return new Response( - $vis, - Response::HTTP_OK, - \DataWarehouse\ExportBuilder::getHeader($format) - ); - } - } else - if ($format == 'png' || $format == 'svg' || $format == 'pdf' || $format == 'png_inline') { - foreach ($returnValue as $vis) { - return new Response( - $vis, - Response::HTTP_OK, - \DataWarehouse\ExportBuilder::getHeader( - $format, - $inline, - 'ak_usage_' . $start_date . '_to_' . $end_date . '_' . $lastResult->resourceName . '_' . $lastResult->akName . '_' . $lastResult->metric - ) - ); - } + } elseif ($format == 'img_tag') { + foreach ($returnValue as $vis) { + return new Response( + $vis, + Response::HTTP_OK, + \DataWarehouse\ExportBuilder::getHeader($format) + ); + } + } elseif ($format == 'png' || $format == 'svg' || $format == 'pdf' || $format == 'png_inline') { + foreach ($returnValue as $vis) { + return new Response( + $vis, + Response::HTTP_OK, + \DataWarehouse\ExportBuilder::getHeader( + $format, + $inline, + 'ak_usage_' . $start_date . '_to_' . $end_date . '_' . $lastResult->resourceName . '_' . $lastResult->akName . '_' . $lastResult->metric + ) + ); + } - } + } } /** @@ -634,8 +636,17 @@ public function createOrUpdateControlRegions(Request $request, Application $app, $control_region_def_id = $this->getStringParam($request, 'control_region_def_id'); // Create or update the control regions. - $msg = $db->newControlRegions($resource_id, $ak_def_id, $control_region_type, - $startDateTime, $endDateTime, $n_points, $comment, $update, $control_region_def_id); + $msg = $db->newControlRegions( + $resource_id, + $ak_def_id, + $control_region_type, + $startDateTime, + $endDateTime, + $n_points, + $comment, + $update, + $control_region_def_id + ); // If successful, calculate controls. if ($msg['success']) { @@ -720,10 +731,12 @@ public function getNotifications(Request $request, Application $app) formatNotificationSettingsFromClient($curent_tmp_settings, true); - $sqlres = $pdo->query('SELECT user_id,send_report_daily,send_report_weekly,send_report_monthly,settings + $sqlres = $pdo->query( + 'SELECT user_id,send_report_daily,send_report_weekly,send_report_monthly,settings FROM mod_appkernel.report WHERE user_id=:user_id', - array(':user_id' => $user_id)); + array(':user_id' => $user_id) + ); if (count($sqlres) == 1) { $sqlres = $sqlres[0]; @@ -767,13 +780,16 @@ public function putNotifications(Request $request, Application $app) $send_report_weekly = ($curent_tmp_settings['weekly_report']['send_on_event'] === 'sendNever') ? (-$curent_tmp_settings['weekly_report']['send_on']) : ($curent_tmp_settings['weekly_report']['send_on']); $send_report_monthly = ($curent_tmp_settings['monthly_report']['send_on_event'] === 'sendNever') ? (-$curent_tmp_settings['monthly_report']['send_on']) : ($curent_tmp_settings['monthly_report']['send_on']); - $sqlres = $pdo->query('SELECT user_id,send_report_daily,send_report_weekly,send_report_monthly,settings + $sqlres = $pdo->query( + 'SELECT user_id,send_report_daily,send_report_weekly,send_report_monthly,settings FROM mod_appkernel.report WHERE user_id=:user_id', - array(':user_id' => $user_id)); + array(':user_id' => $user_id) + ); if (count($sqlres) == 0) { - $sqlres = $pdo->insert('INSERT INTO mod_appkernel.report (user_id,send_report_daily,send_report_weekly,send_report_monthly,settings) + $sqlres = $pdo->insert( + 'INSERT INTO mod_appkernel.report (user_id,send_report_daily,send_report_weekly,send_report_monthly,settings) VALUES (:user_id,:send_report_daily,:send_report_weekly,:send_report_monthly,:settings)', array( ':user_id' => $user_id, @@ -781,9 +797,11 @@ public function putNotifications(Request $request, Application $app) ':send_report_weekly' => $send_report_weekly, ':send_report_monthly' => $send_report_monthly, ':settings' => json_encode($curent_tmp_settings)//str_replace('"',"'",json_encode($curent_tmp_settings)) - )); + ) + ); } else { - $sqlres = $pdo->execute('UPDATE mod_appkernel.report + $sqlres = $pdo->execute( + 'UPDATE mod_appkernel.report SET send_report_daily=:send_report_daily,send_report_weekly=:send_report_weekly, send_report_monthly=:send_report_monthly,settings=:settings WHERE user_id=:user_id', @@ -793,7 +811,8 @@ public function putNotifications(Request $request, Application $app) ':send_report_weekly' => $send_report_weekly, ':send_report_monthly' => $send_report_monthly, ':settings' => json_encode($curent_tmp_settings)//str_replace('"',"'",json_encode($curent_tmp_settings)) - )); + ) + ); } $response['data'] = array(); $response['success'] = true; @@ -846,27 +865,29 @@ public function getPerformanceMap(Request $request, Application $app) try { $start_date = $this->getStringParam($request, 'start_date', false, null); - if ($start_date !== null) + if ($start_date !== null) { $start_date = new \DateTime($start_date); + } $end_date = $this->getStringParam($request, 'end_date', false, null); - if ($end_date !== null) + if ($end_date !== null) { $end_date = new \DateTime($end_date); + } $format = $this->getStringParam($request, 'format', true); - $resources = NULL; - $appKers = NULL; - $problemSizes = NULL; + $resources = null; + $appKers = null; + $problemSizes = null; if (count($resources) === 0) { - $resources = NULL; + $resources = null; } if (count($appKers) === 0) { - $appKers = NULL; + $appKers = null; } if (count($problemSizes) === 0) { - $problemSizes = NULL; + $problemSizes = null; } @@ -900,8 +921,9 @@ public function getPerformanceMap(Request $request, Application $app) $exportData['title'] = array('title' => 'App Kernels Performance Map (control threshold = ' . $controlThreshold . ' )'); $exportData['duration'] = array('from:' => $start_date, 'to' => $end_date); $exportData['headers'] = array('resource', 'appKer', 'problemSize'); - foreach ($rec_dates as $rec_date) + foreach ($rec_dates as $rec_date) { $exportData['headers'][] = $rec_date; + } $exportData['rows'] = array(); foreach ($response['response'] as $result) { @@ -910,8 +932,9 @@ public function getPerformanceMap(Request $request, Application $app) 'appKer' => $result['appKer'], 'problemSize' => $result['problemSize'] ); - foreach ($rec_dates as $rec_date) + foreach ($rec_dates as $rec_date) { $expRes[$rec_date] = $result[$rec_date]; + } $exportData['rows'][] = $expRes; } @@ -949,12 +972,14 @@ public function sendNotification(Request $request, Application $app) $report_type = $this->getStringParam($request, 'report_type', true); $start_date = $this->getStringParam($request, 'start_date', false, null); - if ($start_date !== null) + if ($start_date !== null) { $start_date = new \DateTime($start_date); + } $end_date = $this->getStringParam($request, 'end_date', false, null); - if ($end_date !== null) + if ($end_date !== null) { $end_date = new \DateTime($end_date); + } $report_param = $this->getStringParam($request, 'report_param', true); $report_param = json_decode($report_param, true); @@ -1005,10 +1030,12 @@ public function sendNotification(Request $request, Application $app) formatNotificationSettingsFromClient($curent_tmp_settings, true); - $sqlres = $pdo->query('SELECT user_id,send_report_daily,send_report_weekly,send_report_monthly,settings + $sqlres = $pdo->query( + 'SELECT user_id,send_report_daily,send_report_weekly,send_report_monthly,settings FROM mod_appkernel.report WHERE user_id=:user_id', - array(':user_id' => $user_id)); + array(':user_id' => $user_id) + ); if (count($sqlres) == 1) { $sqlres = $sqlres[0]; @@ -1041,14 +1068,20 @@ public function getResources(Request $request, Application $app) $user = $this->getUserFromRequest($request); - $allResources = $ak_db->getResources(date_format(date_sub(date_create(), date_interval_create_from_date_string("90 days")), 'Y-m-d'), + $allResources = $ak_db->getResources( + date_format(date_sub(date_create(), date_interval_create_from_date_string("90 days")), 'Y-m-d'), date_format(date_create(), 'Y-m-d'), - array(), array(), $user); + array(), + array(), + $user + ); $returnData = array(); foreach ($allResources as $resource) { - if ($resource->visible != 1) continue; + if ($resource->visible != 1) { + continue; + } $returnData[] = array( 'id' => $resource->id, @@ -1084,11 +1117,12 @@ public function getAppKernels(Request $request, Application $app) $returnData = array(); foreach ($all_app_kernels as $app_kernel) { //print_r($app_kernel); - if ($app_kernel->end_ts > $start_ts) + if ($app_kernel->end_ts > $start_ts) { $returnData[] = array('name' => $app_kernel->name, 'id' => 'app_kernel_' . $app_kernel->id, 'end_ts' => $app_kernel->end_ts ); + } } $response['response'] = $returnData; $response['success'] = true; @@ -1172,7 +1206,7 @@ private function createTreeNode($type, $record, $resource_first = false) $node['text'] = date("Y-m-d H:i:s", $record['collected']); $node['collected'] = $record['collected']; $node['num_proc_units'] = $record['num_units']; - $node['metric_id'] = (isset($record['metric_id']) ? $record['metric_id'] : NULL); + $node['metric_id'] = (isset($record['metric_id']) ? $record['metric_id'] : null); $node['resource_id'] = $record['resource_id']; $node['ak_id'] = $record['ak_def_id']; $node['instance_id'] = $record['instance_id']; @@ -1181,33 +1215,39 @@ private function createTreeNode($type, $record, $resource_first = false) $text = $record['num_units'] . " " . $record['processor_unit'] . ($record['num_units'] > 1 ? "s" : ""); $node['text'] = $text; $node['num_proc_units'] = $record['num_units']; - $node['metric_id'] = (isset($record['metric_id']) ? $record['metric_id'] : NULL); + $node['metric_id'] = (isset($record['metric_id']) ? $record['metric_id'] : null); $node['resource_id'] = $record['resource_id']; $node['ak_id'] = $record['ak_def_id']; break; case self::TREENODE_METRIC: $node['text'] = $record['metric']; - $node['metric_id'] = (isset($record['metric_id']) ? $record['metric_id'] : NULL); + $node['metric_id'] = (isset($record['metric_id']) ? $record['metric_id'] : null); $node['resource_id'] = $record['resource_id']; $node['ak_id'] = $record['ak_def_id']; break; case self::TREENODE_RESOURCE: $node['text'] = $record['resource']; $node['resource_id'] = $record['resource_id']; - if (!$resource_first) + if (!$resource_first) { $node['ak_id'] = $record['ak_def_id']; + } break; case self::TREENODE_APPKERNEL: $node['text'] = $record['ak_name'];/*.' '.date('Y-m-d',$record['start_ts']).' '.date('Y-m-d', $record['end_ts'])*/ $node['ak_id'] = $record['ak_def_id']; - if ($resource_first) + if ($resource_first) { $node['resource_id'] = $record['resource_id']; + } break; default: break; } - if (isset($record['start_ts'])) $node['start_ts'] = $record['start_ts']; - if (isset($record['end_ts'])) $node['end_ts'] = $record['end_ts']; + if (isset($record['start_ts'])) { + $node['start_ts'] = $record['start_ts']; + } + if (isset($record['end_ts'])) { + $node['end_ts'] = $record['end_ts']; + } return (object)$node; } @@ -1224,13 +1264,18 @@ private function nodeId($type, $record) { $id = array(); switch ($type) { + // comment describing why there is no break. case self::TREENODE_UNITS: array_unshift($id, $record['num_units']); + // comment describing why there is no break. case self::TREENODE_METRIC: - if (isset($record['metric_id'])) + if (isset($record['metric_id'])) { array_unshift($id, $record['metric_id']); + } + // comment describing why there is no break. case self::TREENODE_RESOURCE: array_unshift($id, $record['resource_id']); + // comment describing why there is no break. case self::TREENODE_APPKERNEL: array_unshift($id, $record['ak_def_id']); break; @@ -1288,8 +1333,9 @@ public function getAppKernelSuccessRate(Request $req, Application $app) $resources = explode(';', strtolower($raw_resources)); $resourceSelected = ''; - if (count($resources) == 1) + if (count($resources) == 1) { $resourceSelected = "AND resource='$resources[0]'"; + } $raw_appKers = $this->getStringParam($req, 'appKers'); $appKers = explode(';', strtolower($raw_appKers)); @@ -1341,16 +1387,19 @@ public function getAppKernelSuccessRate(Request $req, Application $app) $problemSize = explode('.', $row['reporternickname']); $problemSize = (int)$problemSize[count($problemSize) - 1]; - if (!array_key_exists($resource, $results)) + if (!array_key_exists($resource, $results)) { continue; - if (!array_key_exists($appKer, $results[$resource])) + } + if (!array_key_exists($appKer, $results[$resource])) { continue; + } - if (!array_key_exists($problemSize, $results[$resource][$appKer])) + if (!array_key_exists($problemSize, $results[$resource][$appKer])) { $results[$resource][$appKer][$problemSize] = array( "succ" => 0, "unsucc" => 0, ); + } $results[$resource][$appKer][$problemSize]["succ"] = (int)$row['total_tasks']; } //Count unsuccessfull Tasks @@ -1369,16 +1418,19 @@ public function getAppKernelSuccessRate(Request $req, Application $app) $problemSize = explode('.', $row['reporternickname']); $problemSize = (int)$problemSize[count($problemSize) - 1]; - if (!array_key_exists($resource, $results)) + if (!array_key_exists($resource, $results)) { continue; - if (!array_key_exists($appKer, $results[$resource])) + } + if (!array_key_exists($appKer, $results[$resource])) { continue; + } - if (!array_key_exists($problemSize, $results[$resource][$appKer])) + if (!array_key_exists($problemSize, $results[$resource][$appKer])) { $results[$resource][$appKer][$problemSize] = array( "succ" => 0, "unsucc" => 0, ); + } $results[$resource][$appKer][$problemSize]["unsucc"] = (int)$row['total_tasks']; //print "\tproblemSize:".$problemSize."\n"; } @@ -1392,15 +1444,17 @@ public function getAppKernelSuccessRate(Request $req, Application $app) $succ = 0; $resultsTMP = array(); foreach ($row2 as $problemSize => $row) { - if (!in_array($problemSize, $problemSizes)) + if (!in_array($problemSize, $problemSizes)) { continue; + } if ($showAppKer) { $unsuccessfull_tasks = ''; - if (!($showUnsuccessfulTasksDetails || $showSuccessfulTasksDetails)) + if (!($showUnsuccessfulTasksDetails || $showSuccessfulTasksDetails)) { $unsuccessfull_tasks = 'Select "Show Details of Unsuccessful Tasks" or "Show Details of Successful Tasks" options to see details on tasks'; + } if ($showUnsuccessfulTasksDetails) { if ((int)$row["unsucc"] > 0) { @@ -1418,14 +1472,16 @@ public function getAppKernelSuccessRate(Request $req, Application $app) $task_id = $row2['instance_id']; $unsuccessfull_tasks = $unsuccessfull_tasks . "#$task_id "; - if ($icount % 10 == 0) + if ($icount % 10 == 0) { $unsuccessfull_tasks = $unsuccessfull_tasks . '
'; + } $icount += 1; } $unsuccessfull_tasks = $unsuccessfull_tasks . '
'; //var_dump($sqlres); - } else + } else { $unsuccessfull_tasks = $unsuccessfull_tasks . 'There is no unsuccessful runs.
'; + } } if ($showSuccessfulTasksDetails) { if ((int)$row["succ"] > 0) { @@ -1443,12 +1499,14 @@ public function getAppKernelSuccessRate(Request $req, Application $app) $task_id = $row2['instance_id']; $unsuccessfull_tasks = $unsuccessfull_tasks . "#$task_id "; - if ($icount % 10 == 0) + if ($icount % 10 == 0) { $unsuccessfull_tasks = $unsuccessfull_tasks . '
'; + } $icount += 1; } - } else + } else { $unsuccessfull_tasks = $unsuccessfull_tasks . 'There is no successful runs.
'; + } } $resultsTMP[$problemSize] = array( "resource" => $resource, @@ -1469,8 +1527,9 @@ public function getAppKernelSuccessRate(Request $req, Application $app) //var_dump($resultsTMP); foreach ($problemSizes as $problemSize) { - if (array_key_exists($problemSize, $resultsTMP)) + if (array_key_exists($problemSize, $resultsTMP)) { $results2[] = $resultsTMP[$problemSize]; + } } if ($succ + $unsucc > 0) { diff --git a/configuration/rest.d/akrr.json b/configuration/rest.d/akrr.json index 8196200..80941dc 100644 --- a/configuration/rest.d/akrr.json +++ b/configuration/rest.d/akrr.json @@ -1,6 +1,6 @@ { "akrr": { "prefix": "akrr", - "controller": "NewRest\\Controllers\\AkrrControllerProvider" + "controller": "Rest\\Controllers\\AkrrControllerProvider" } } diff --git a/configuration/rest.d/app_kernel.json b/configuration/rest.d/app_kernel.json index 213aecf..1110dc2 100644 --- a/configuration/rest.d/app_kernel.json +++ b/configuration/rest.d/app_kernel.json @@ -1,6 +1,6 @@ { "app_kernels": { "prefix": "app_kernels", - "controller": "NewRest\\Controllers\\AppKernelControllerProvider" + "controller": "Rest\\Controllers\\AppKernelControllerProvider" } }