diff --git a/api/v1/entries/hostheartbeat.php b/api/v1/entries/hostheartbeat.php index 1d54b4c9c2..100d5d0199 100644 --- a/api/v1/entries/hostheartbeat.php +++ b/api/v1/entries/hostheartbeat.php @@ -28,8 +28,8 @@ class hostHeartbeatEntry extends baseEntry /* Check param. */ $status = $this->requestBody->status; - $vms = $this->requestBody->Vms; - $zap = $this->requestBody->port; + $vms = !empty($this->requestBody->Vms) ? $this->requestBody->Vms : array(); + $zap = !empty($this->requestBody->port) ? $this->requestBody->port : 0; $now = helper::now(); if(!$status) return $this->sendError(400, 'Params error.'); @@ -37,7 +37,7 @@ class hostHeartbeatEntry extends baseEntry $conditionValue = $secret ? $secret : $token; $this->dao = $this->loadModel('common')->dao; - $hostInfo = $this->dao->select('id,tokenSN')->from(TABLE_ZAHOST) + $hostInfo = $this->dao->select('id,tokenSN,hostType,type')->from(TABLE_ZAHOST) ->beginIF($secret)->where('secret')->eq($secret)->fi() ->beginIF(!$secret)->where('tokenSN')->eq($token) ->andWhere('tokenTime')->gt($now)->fi() @@ -45,13 +45,15 @@ class hostHeartbeatEntry extends baseEntry if(empty($hostInfo->id)) { if(empty($token)) return $this->sendError(400, 'Secret error.'); - $hostInfo = $this->dao->select('id,tokenSN')->from(TABLE_ZAHOST) + $hostInfo = $this->dao->select('id,tokenSN,hostType,type')->from(TABLE_ZAHOST) ->where('oldTokenSN')->eq($token) ->andWhere('tokenTime')->gt(date(DT_DATETIME1, strtotime($now) - 30))->fi() ->fetch(); if(empty($hostInfo->id)) return $this->sendError(400, 'Secret error.'); } + $isPhysicsNode = $hostInfo->type == 'node' && $hostInfo->hostType == 'physics' ? true : false; + $host = new stdclass(); $host->status = $status; if($secret) @@ -69,7 +71,7 @@ class hostHeartbeatEntry extends baseEntry foreach($vms as $vm) { $heartbeat = strtotime(substr($vm->heartbeat, 0, 19)); - $vmData = array( + $vmData = array( 'vnc' => $vm->vncPortOnHost, 'zap' => $vm->agentPortOnHost, 'ztf' => $vm->ztfPortOnHost, @@ -80,14 +82,25 @@ class hostHeartbeatEntry extends baseEntry ); if(!$vm->sshPortOnHost) unset($vmData['ssh']); - if($heartbeat > 0) $vmData['heartbeat'] = date("Y-m-d H:i:s", $heartbeat); - $this->dao->update(TABLE_ZAHOST)->data($vmData)->where('mac')->eq($vm->macAddress)->exec(); + if($isPhysicsNode) + { + unset($vmData['extranet']); + $this->dao->update(TABLE_ZAHOST)->data($vmData)->where('id')->eq($hostInfo->id)->exec(); + } + else + { + $node = $this->loadModel('zanode')->getNodeByMac($vm->macAddress); + if(empty($node)) continue; + + if(in_array($node->status, array('restoring', 'creating_img', 'creating_snap'))) + $vmData->status = $vm->status = $node->status; + $this->dao->update(TABLE_ZAHOST)->data($vmData)->where('mac')->eq($vm->macAddress)->exec(); + } - if($vm->status == 'running') + if($vm->status == 'running' && !$isPhysicsNode) { - $node = $this->loadModel('zanode')->getNodeByMac($vm->macAddress); if(!empty($node)) { $snaps = $this->loadModel('zanode')->getSnapshotList($node->id); diff --git a/api/v1/entries/hostsubmit.php b/api/v1/entries/hostsubmit.php index 157d329ac1..00945ca704 100644 --- a/api/v1/entries/hostsubmit.php +++ b/api/v1/entries/hostsubmit.php @@ -31,6 +31,7 @@ class hostSubmitEntry extends baseEntry $image = new stdclass(); $task = $this->requestBody->task; $image->status = $this->requestBody->status; + $image->status == 'complete' && $image->status = "completed"; $this->dao = $this->loadModel('common')->dao; $id = $this->dao->select('id')->from(TABLE_ZAHOST) @@ -40,10 +41,11 @@ class hostSubmitEntry extends baseEntry if(!$id) return $this->sendError(400, 'Secret error.'); - $imageInfo = $this->dao->select('`status`,`from`', 'name')->from(TABLE_IMAGE) + $imageInfo = $this->dao->select('`status`,`from`,name,host')->from(TABLE_IMAGE) ->where('id')->eq($task) ->fetch(); if(empty($imageInfo)) return $this->sendSuccess(200, 'success'); + if($imageInfo->from == 'snapshot' && $imageInfo->status == 'restoring') { if(in_array($image->status, array('failed', 'completed'))) $image->status = $image->status == 'completed' ? 'restore_completed' : 'restore_failed'; @@ -59,6 +61,11 @@ class hostSubmitEntry extends baseEntry $this->dao->update(TABLE_IMAGE)->data($image)->where("id")->eq($task)->exec(); + if($imageInfo->from != 'zentao' && in_array($imageInfo->status, array('creating', 'restoring'))) + { + $this->dao->update(TABLE_ZAHOST)->data(array("status" => "wait"))->where("id")->eq($imageInfo->host)->exec(); + } + return $this->sendSuccess(200, 'success'); } } diff --git a/api/v1/entries/testcase.php b/api/v1/entries/testcase.php index 6d0c75cbde..e0a1bd7ab2 100644 --- a/api/v1/entries/testcase.php +++ b/api/v1/entries/testcase.php @@ -56,11 +56,16 @@ class testcaseEntry extends entry $stepType = array(); if(isset($this->requestBody->steps)) { - foreach($this->requestBody->steps as $step) + foreach($this->requestBody->steps as $key => $step) { + if(empty($step->type)) $step->type = 'step'; + if(!in_array($step->type, array('step', 'item', 'group'))) $step->type = 'step'; + + if($step->type == 'group' && (empty($this->requestBody->steps[$key + 1]->type) || $this->requestBody->steps[$key + 1]->type != 'item')) $step->type = 'step'; + $steps[] = $step->desc; $expects[] = $step->expect; - $stepType[] = 'item'; + $stepType[] = $step->type; } } diff --git a/api/v1/entries/testcases.php b/api/v1/entries/testcases.php index d4fcaab2a0..79d6d9cf51 100644 --- a/api/v1/entries/testcases.php +++ b/api/v1/entries/testcases.php @@ -23,8 +23,9 @@ class testcasesEntry extends entry if(empty($productID)) $productID = $this->param('product', 0); if(empty($productID)) return $this->sendError(400, 'Need product id.'); - $this->app->cookie->caseModule = 0; - $this->app->cookie->caseSuite = 0; + $this->app->cookie->caseModule = 0; + $this->app->cookie->caseSuite = 0; + $this->app->cookie->showAutoCase = 1; $type = $this->param('status', 'all'); $param = 0; @@ -36,7 +37,7 @@ class testcasesEntry extends entry } $control = $this->loadController('testcase', 'browse'); - $control->browse($productID, $this->param('branch', ''), $type, $param, $this->param('order', 'id_desc'), 0, $this->param('limit', 20), $this->param('page', 1)); + $control->browse($productID, $this->param('branch', ''), $type, $param, '', $this->param('order', 'id_desc'), 0, $this->param('limit', 20), $this->param('page', 1)); $data = $this->getData(); diff --git a/api/v1/entries/testsuite.php b/api/v1/entries/testsuite.php index ab6047a9d2..a06fa5711b 100644 --- a/api/v1/entries/testsuite.php +++ b/api/v1/entries/testsuite.php @@ -21,7 +21,7 @@ class testsuiteEntry extends entry public function get($testsuiteID) { $control = $this->loadController('testsuite', 'view'); - $control->view($testsuiteID, $this->param('version', 0)); + $control->view($testsuiteID, $this->param('order', 'id_desc'), 0, $this->param('limit', 20), $this->param('page', 1)); $data = $this->getData(); if(!$data or (isset($data->message) and $data->message == '404 Not found')) return $this->send404(); diff --git a/api/v1/entries/testsuites.php b/api/v1/entries/testsuites.php index 22012099fc..ece087dc4e 100644 --- a/api/v1/entries/testsuites.php +++ b/api/v1/entries/testsuites.php @@ -24,7 +24,7 @@ class testsuitesEntry extends entry if(empty($productID)) return $this->sendError(400, 'Need product id.'); $control = $this->loadController('testsuite', 'browse'); - $control->browse($productID, $this->param('order', 'id_desc'), 0, $this->param('limit', 20), $this->param('page', 1)); + $control->browse($productID, 'all', $this->param('order', 'id_desc'), 0, $this->param('limit', 20), $this->param('page', 1)); $data = $this->getData(); if(isset($data->status) and $data->status == 'success') diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php index 799b674608..a8f5b9d454 100644 --- a/lib/scm/gitlab.class.php +++ b/lib/scm/gitlab.class.php @@ -836,7 +836,7 @@ class gitlab return array(); } - if($httpCode == 500) return array(); + if($httpCode == 500 or $httpCode == 404) return array(); return json_decode($response); } } diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 10b8661ee9..8ce4751bff 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -489,7 +489,7 @@ $lang->devops->menu->set['subMenu']->repo = array('link' => "{$lang->devops $lang->devops->menu->set['subMenu']->gitlab = array('link' => 'GitLab|gitlab|browse', 'subModule' => 'gitlab'); $lang->devops->menu->set['subMenu']->gogs = array('link' => 'Gogs|gogs|browse', 'subModule' => 'gogs'); $lang->devops->menu->set['subMenu']->gitea = array('link' => 'Gitea|gitea|browse', 'subModule' => 'gitea'); -$lang->devops->menu->set['subMenu']->jenkins = array('link' => 'Jenkins|jenkins|browse', 'subModule' => ''); +$lang->devops->menu->set['subMenu']->jenkins = array('link' => 'Jenkins|jenkins|browse', 'subModule' => 'jenkins'); $lang->devops->menu->set['subMenu']->sonarqube = array('link' => 'SonarQube|sonarqube|browse', 'subModule' => 'sonarqube'); $lang->devops->menu->set['subMenu']->setrules = array('link' => "{$lang->devops->rules}|repo|setrules"); diff --git a/module/gitea/css/create.css b/module/gitea/css/create.css new file mode 100644 index 0000000000..807e1a132b --- /dev/null +++ b/module/gitea/css/create.css @@ -0,0 +1,2 @@ +.main-content>.center-block {max-width: 800px;} +#giteaForm table {width: 600px;} diff --git a/module/gitea/view/create.html.php b/module/gitea/view/create.html.php index a5a176aa6c..e42c7b0f33 100644 --- a/module/gitea/view/create.html.php +++ b/module/gitea/view/create.html.php @@ -22,7 +22,6 @@ gitea->name;?> - gitea->url;?> diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 33cfacfc41..a4fb4087c0 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -132,7 +132,7 @@ class gitlab extends control * @access public * @return void */ - public function bindUser($gitlabID) + public function bindUser($gitlabID, $type = 'all') { $userPairs = $this->loadModel('user')->getPairs('noclosed|noletter'); @@ -140,7 +140,7 @@ class gitlab extends control $user = $this->gitlab->apiGetCurrentUser($gitlab->url, $gitlab->token); if(!isset($user->is_admin) or !$user->is_admin) return print(js::alert($this->lang->gitlab->tokenLimit) . js::locate($this->createLink('gitlab', 'edit', array('gitlabID' => $gitlabID)))); - $zentaoUsers = $this->dao->select('account,email,realname')->from(TABLE_USER)->fetchAll('account'); + $zentaoUsers = $this->dao->select('account,email,realname')->from(TABLE_USER)->where('deleted')->eq('0')->fetchAll('account'); if($_POST) { @@ -188,11 +188,32 @@ class gitlab extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->server->http_referer)); } + $gitlabUsers = $this->gitlab->apiGetUsers($gitlabID); + $bindedUsers = $this->gitlab->getUserAccountIdPairs($gitlabID); + $matchedResult = $this->gitlab->getMatchedUsers($gitlabID, $gitlabUsers, $zentaoUsers); + $matchedResult = array_column(json_decode(json_encode($matchedResult), true), null, "email"); + + $gitlabUsers = array_filter($gitlabUsers, function($item) use($bindedUsers, $userPairs, $type) + { + if($type == 'all') return true; + + if(in_array($item->id, $bindedUsers)) + { + $zentaoAccount = isset($item->zentaoAccount) ? zget($userPairs, $item->zentaoAccount, '') : ''; + return $type == 'binded' ? !empty($zentaoAccount) : empty($zentaoAccount); + } + return $type == 'binded' ? false : true; + }); + $this->view->title = $this->lang->gitlab->bindUser; + $this->view->zentaoUsers = $zentaoUsers; $this->view->userPairs = $userPairs; - $this->view->gitlabUsers = $this->gitlab->apiGetUsers($gitlabID); - $this->view->bindedUsers = $this->gitlab->getUserAccountIdPairs($gitlabID); - $this->view->matchedResult = $this->gitlab->getMatchedUsers($gitlabID, $this->view->gitlabUsers, $zentaoUsers); + $this->view->type = $type; + $this->view->gitlabID = $gitlabID; + $this->view->gitlabUsers = $gitlabUsers; + $this->view->bindedUsers = $bindedUsers; + $this->view->matchedResult = $matchedResult; + $this->display(); } diff --git a/module/gitlab/css/common.css b/module/gitlab/css/common.css index ad50c2a1d2..d31a13a052 100644 --- a/module/gitlab/css/common.css +++ b/module/gitlab/css/common.css @@ -1,2 +1,9 @@ #publicTip {padding-left: 10px;} .table-form>tbody>tr>th {width: 110px;} +.gitlab-bind .btn-info{background-color: unset;color:unset;padding: 6px 6px;} +.gitlab-bind .btn-info.active{color: #2e7fff;background-color: rgba(239,239,239,.8); +border-color: rgba(0,0,0,0);} +.gitlab-bind-all{padding: 1px 6px;margin-left: 5px;border-radius: 10px;background: white;} +.img-circle {border-radius: 50%;} +.gitlab-account-desc{color: #9EA3B0;font-size: 12px;} +.gitlab-user-select .chosen-container{max-width: 200px;} \ No newline at end of file diff --git a/module/gitlab/css/create.css b/module/gitlab/css/create.css new file mode 100644 index 0000000000..09df31008b --- /dev/null +++ b/module/gitlab/css/create.css @@ -0,0 +1,2 @@ +.main-content>.center-block {max-width: 800px;} +#gitlabForm table {width: 600px;} diff --git a/module/gitlab/js/binduser.js b/module/gitlab/js/binduser.js new file mode 100644 index 0000000000..a4b6cc07c2 --- /dev/null +++ b/module/gitlab/js/binduser.js @@ -0,0 +1,11 @@ +$(document).ready(function() +{ + $('.gitlab-user-bind').change(function() + { + var user = zentaoUsers[$(this).val()]; + if(user !== undefined) + { + $(this).parent().parent().find('.email').text(user.email) + } + }); +}); \ No newline at end of file diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php index cf37e4bbec..bd77e7239d 100644 --- a/module/gitlab/lang/de.php +++ b/module/gitlab/lang/de.php @@ -5,7 +5,7 @@ $lang->gitlab->search = 'Search'; $lang->gitlab->create = 'Create GitLab'; $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'View GitLab'; -$lang->gitlab->bindUser = 'Bind User'; +$lang->gitlab->bindUser = 'Permission Setting'; $lang->gitlab->webhook = 'Webhook'; $lang->gitlab->bindProduct = "Import {$lang->productCommon}"; $lang->gitlab->importIssue = 'Import Issue'; @@ -13,9 +13,12 @@ $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; $lang->gitlab->gitlabAvatar = 'Avatar'; $lang->gitlab->gitlabAccount = 'GitLab Account'; -$lang->gitlab->gitlabEmail = 'Email'; +$lang->gitlab->gitlabEmail = 'GitLab User\'s Email'; +$lang->gitlab->zentaoEmail = 'Zentao User\'s Email'; $lang->gitlab->zentaoAccount = 'Zentao Account'; +$lang->gitlab->accountDesc = '(Automatically match users with the same email)'; $lang->gitlab->bindingStatus = 'Binding Status'; +$lang->gitlab->all = 'All'; $lang->gitlab->notBind = 'Not bind'; $lang->gitlab->binded = 'Binded'; $lang->gitlab->bindedError = 'The bound user has been deleted or modified. Please bind again.'; diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index cf37e4bbec..bd77e7239d 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -5,7 +5,7 @@ $lang->gitlab->search = 'Search'; $lang->gitlab->create = 'Create GitLab'; $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'View GitLab'; -$lang->gitlab->bindUser = 'Bind User'; +$lang->gitlab->bindUser = 'Permission Setting'; $lang->gitlab->webhook = 'Webhook'; $lang->gitlab->bindProduct = "Import {$lang->productCommon}"; $lang->gitlab->importIssue = 'Import Issue'; @@ -13,9 +13,12 @@ $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; $lang->gitlab->gitlabAvatar = 'Avatar'; $lang->gitlab->gitlabAccount = 'GitLab Account'; -$lang->gitlab->gitlabEmail = 'Email'; +$lang->gitlab->gitlabEmail = 'GitLab User\'s Email'; +$lang->gitlab->zentaoEmail = 'Zentao User\'s Email'; $lang->gitlab->zentaoAccount = 'Zentao Account'; +$lang->gitlab->accountDesc = '(Automatically match users with the same email)'; $lang->gitlab->bindingStatus = 'Binding Status'; +$lang->gitlab->all = 'All'; $lang->gitlab->notBind = 'Not bind'; $lang->gitlab->binded = 'Binded'; $lang->gitlab->bindedError = 'The bound user has been deleted or modified. Please bind again.'; diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php index cf37e4bbec..03a82ee249 100644 --- a/module/gitlab/lang/fr.php +++ b/module/gitlab/lang/fr.php @@ -5,7 +5,7 @@ $lang->gitlab->search = 'Search'; $lang->gitlab->create = 'Create GitLab'; $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'View GitLab'; -$lang->gitlab->bindUser = 'Bind User'; +$lang->gitlab->bindUser = 'Permission Setting'; $lang->gitlab->webhook = 'Webhook'; $lang->gitlab->bindProduct = "Import {$lang->productCommon}"; $lang->gitlab->importIssue = 'Import Issue'; @@ -13,9 +13,12 @@ $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; $lang->gitlab->gitlabAvatar = 'Avatar'; $lang->gitlab->gitlabAccount = 'GitLab Account'; -$lang->gitlab->gitlabEmail = 'Email'; +$lang->gitlab->gitlabEmail = 'GitLab User\'s Email'; +$lang->gitlab->zentaoEmail = 'Zentao User\'s Email'; $lang->gitlab->zentaoAccount = 'Zentao Account'; +$lang->gitlab->accountDesc = '(System will automatically match users with the same email address)'; $lang->gitlab->bindingStatus = 'Binding Status'; +$lang->gitlab->all = 'All'; $lang->gitlab->notBind = 'Not bind'; $lang->gitlab->binded = 'Binded'; $lang->gitlab->bindedError = 'The bound user has been deleted or modified. Please bind again.'; diff --git a/module/gitlab/lang/vi.php b/module/gitlab/lang/vi.php index f3b3b2d451..f858af5575 100644 --- a/module/gitlab/lang/vi.php +++ b/module/gitlab/lang/vi.php @@ -13,9 +13,12 @@ $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; $lang->gitlab->gitlabAvatar = 'Avatar'; $lang->gitlab->gitlabAccount = 'GitLab Account'; -$lang->gitlab->gitlabEmail = 'Email'; +$lang->gitlab->gitlabEmail = 'GitLab User\'s Email'; +$lang->gitlab->zentaoEmail = 'Zentao User\'s Email'; $lang->gitlab->zentaoAccount = 'Zentao Account'; +$lang->gitlab->accountDesc = '(System will automatically match users with the same email address)'; $lang->gitlab->bindingStatus = 'Binding Status'; +$lang->gitlab->all = 'All'; $lang->gitlab->notBind = 'Not bind'; $lang->gitlab->binded = 'Binded'; $lang->gitlab->bindedError = 'The bound user has been deleted or modified. Please bind again.'; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index 8483edf40c..0fba26cd7a 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -5,7 +5,7 @@ $lang->gitlab->search = '搜索'; $lang->gitlab->create = '添加GitLab'; $lang->gitlab->edit = '编辑GitLab'; $lang->gitlab->view = '查看GitLab'; -$lang->gitlab->bindUser = '绑定用户'; +$lang->gitlab->bindUser = '权限设置'; $lang->gitlab->webhook = 'Webhook'; $lang->gitlab->bindProduct = "关联{$lang->productCommon}"; $lang->gitlab->importIssue = '关联issue'; @@ -13,9 +13,12 @@ $lang->gitlab->delete = '删除GitLab'; $lang->gitlab->confirmDelete = '确认删除该GitLab吗？'; $lang->gitlab->gitlabAvatar = '头像'; $lang->gitlab->gitlabAccount = 'GitLab用户'; -$lang->gitlab->gitlabEmail = '邮箱'; +$lang->gitlab->gitlabEmail = 'GitLab用户邮箱'; +$lang->gitlab->zentaoEmail = '禅道用户邮箱'; $lang->gitlab->zentaoAccount = '禅道用户'; +$lang->gitlab->accountDesc = '(系统会将相同邮箱地址的用户自动匹配)'; $lang->gitlab->bindingStatus = '绑定状态'; +$lang->gitlab->all = '全部'; $lang->gitlab->notBind = '未绑定'; $lang->gitlab->binded = '已绑定'; $lang->gitlab->bindedError = '绑定的用户已删除或者已修改，请重新绑定'; diff --git a/module/gitlab/lang/zh-tw.php b/module/gitlab/lang/zh-tw.php index 3ceb69d896..81e5f2714f 100644 --- a/module/gitlab/lang/zh-tw.php +++ b/module/gitlab/lang/zh-tw.php @@ -13,7 +13,9 @@ $lang->gitlab->delete = '刪除GitLab'; $lang->gitlab->confirmDelete = '確認刪除該GitLab嗎？'; $lang->gitlab->gitlabAccount = 'GitLab用戶'; $lang->gitlab->zentaoAccount = '禪道用戶'; +$lang->gitlab->accountDesc = '(系統會將相同郵箱地址的用戶自動匹配)'; $lang->gitlab->bindingStatus = '綁定狀態'; +$lang->gitlab->all = '全部'; $lang->gitlab->binded = '已綁定'; $lang->gitlab->bindedError = '綁定的用戶已刪除或者已修改，請重新綁定'; $lang->gitlab->serverFail = '連接GitLab伺服器異常，請檢查GitLab伺服器。'; diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 8413708a3c..f83126aaaf 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -1034,6 +1034,28 @@ class gitlabModel extends model return $this->projects[$gitlabID][$projectID]; } + /** + * Multi get projects by repos. + * + * @param object $repos + * @access public + * @return void + */ + public function apiMultiGetProjects($repos) + { + $requests = array(); + foreach($repos as $id => $repo) + { + $requests[$id]['url'] = sprintf($this->getApiRoot($repo->serviceHost, false), "/projects/{$repo->serviceProject}"); + } + $this->app->loadClass('requests', true); + $results = requests::request_multiple($requests); + foreach($results as $id => $result) + { + if(!empty($result->body) and substr($result->body, 0, 1) == '{') $this->projects[$repos[$id]->serviceHost][$repos[$id]->serviceProject] = json_decode($result->body); + } + } + /** * Get single user by API. * diff --git a/module/gitlab/view/binduser.html.php b/module/gitlab/view/binduser.html.php index d06281144c..8c89ec2f27 100644 --- a/module/gitlab/view/binduser.html.php +++ b/module/gitlab/view/binduser.html.php @@ -11,19 +11,45 @@ */ ?> +createLink('gitlab', 'browse', ""); ?> +
-
-

gitlab->bindUser;?>

+
+ ' . $lang->goback, $browseLink, 'self', "data-app='{$app->tab}'", 'btn btn-secondary'); + + $allLink = $this->createLink('gitlab', 'binduser', "gitlabID={$gitlabID}&type=all"); + $bindedLink = $this->createLink('gitlab', 'binduser', "gitlabID={$gitlabID}&type=binded"); + $notBindLink = $this->createLink('gitlab', 'binduser', "gitlabID={$gitlabID}&type=notBind"); + if($type == 'all') + { + echo html::linkButton('' . $lang->gitlab->all . "" . count($gitlabUsers) . "", $allLink, 'self', "data-app='{$app->tab}'", 'btn btn-info active'); + echo html::linkButton('' . $lang->gitlab->notBind, $notBindLink, 'self', "data-app='{$app->tab}'", 'btn btn-info'); + echo html::linkButton('' . $lang->gitlab->binded, $bindedLink, 'self', "data-app='{$app->tab}'", 'btn btn-info'); + } + else if($type == 'binded') + { + echo html::linkButton('' . $lang->gitlab->all, $allLink, 'self', "data-app='{$app->tab}'", 'btn btn-info'); + echo html::linkButton('' . $lang->gitlab->notBind, $notBindLink, 'self', "data-app='{$app->tab}'", 'btn btn-info'); + echo html::linkButton('' . $lang->gitlab->binded . "" . count($gitlabUsers) . "", $bindedLink, 'self', "data-app='{$app->tab}'", 'btn btn-info active'); + } + else + { + echo html::linkButton('' . $lang->gitlab->all, $allLink, 'self', "data-app='{$app->tab}'", 'btn btn-info'); + echo html::linkButton('' . $lang->gitlab->notBind . "" . count($gitlabUsers) . "", $notBindLink, 'self', "data-app='{$app->tab}'", 'btn btn-info active'); + echo html::linkButton('' . $lang->gitlab->binded, $bindedLink, 'self', "data-app='{$app->tab}'", 'btn btn-info'); + } + ?>
- +
- - + + @@ -32,29 +58,27 @@ zentaoAccount)) continue;?> id]", $gitlabUser->realname);?> - - - - + + + zentaoAccount)) continue;?> id]", $gitlabUser->realname);?> - - + + diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php index 37dde0aabe..cb47b665e9 100644 --- a/module/gitlab/view/browse.html.php +++ b/module/gitlab/view/browse.html.php @@ -56,7 +56,7 @@ diff --git a/module/gitlab/view/create.html.php b/module/gitlab/view/create.html.php index 9df06b923e..4c34df003a 100644 --- a/module/gitlab/view/create.html.php +++ b/module/gitlab/view/create.html.php @@ -23,7 +23,6 @@ - diff --git a/module/gogs/css/create.css b/module/gogs/css/create.css new file mode 100644 index 0000000000..eca6cd5850 --- /dev/null +++ b/module/gogs/css/create.css @@ -0,0 +1,2 @@ +.main-content>.center-block {max-width: 800px;} +#gogsForm table {width: 600px;} diff --git a/module/gogs/view/create.html.php b/module/gogs/view/create.html.php index 62c109f8fd..eab94d08c6 100644 --- a/module/gogs/view/create.html.php +++ b/module/gogs/view/create.html.php @@ -22,7 +22,6 @@ - diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 07ee1b9322..f611112295 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1329,26 +1329,28 @@ $lang->resource->repo->linkStory = 'linkStory'; $lang->resource->repo->linkBug = 'linkBug'; $lang->resource->repo->linkTask = 'linkTask'; $lang->resource->repo->unlink = 'unlink'; +$lang->resource->repo->import = 'importAction'; -$lang->repo->methodOrder[5] = 'create'; -$lang->repo->methodOrder[10] = 'edit'; -$lang->repo->methodOrder[15] = 'delete'; -$lang->repo->methodOrder[20] = 'showSyncCommit'; -$lang->repo->methodOrder[25] = 'maintain'; -$lang->repo->methodOrder[30] = 'browse'; -$lang->repo->methodOrder[35] = 'view'; -$lang->repo->methodOrder[40] = 'diff'; -$lang->repo->methodOrder[45] = 'log'; -$lang->repo->methodOrder[50] = 'revision'; -$lang->repo->methodOrder[55] = 'blame'; -$lang->repo->methodOrder[60] = 'download'; -$lang->repo->methodOrder[65] = 'setRules'; -$lang->repo->methodOrder[70] = 'apiGetRepoByUrl'; -$lang->repo->methodOrder[75] = 'downloadCode'; -$lang->repo->methodOrder[80] = 'linkStory'; -$lang->repo->methodOrder[85] = 'linkBug'; -$lang->repo->methodOrder[90] = 'linkTask'; -$lang->repo->methodOrder[95] = 'unlink'; +$lang->repo->methodOrder[5] = 'create'; +$lang->repo->methodOrder[10] = 'edit'; +$lang->repo->methodOrder[15] = 'delete'; +$lang->repo->methodOrder[20] = 'showSyncCommit'; +$lang->repo->methodOrder[25] = 'maintain'; +$lang->repo->methodOrder[30] = 'browse'; +$lang->repo->methodOrder[35] = 'view'; +$lang->repo->methodOrder[40] = 'diff'; +$lang->repo->methodOrder[45] = 'log'; +$lang->repo->methodOrder[50] = 'revision'; +$lang->repo->methodOrder[55] = 'blame'; +$lang->repo->methodOrder[60] = 'download'; +$lang->repo->methodOrder[65] = 'setRules'; +$lang->repo->methodOrder[70] = 'apiGetRepoByUrl'; +$lang->repo->methodOrder[75] = 'downloadCode'; +$lang->repo->methodOrder[80] = 'linkStory'; +$lang->repo->methodOrder[85] = 'linkBug'; +$lang->repo->methodOrder[90] = 'linkTask'; +$lang->repo->methodOrder[95] = 'unlink'; +$lang->repo->methodOrder[100] = 'import'; $lang->resource->ci = new stdclass(); $lang->resource->ci->commitResult = 'commitResult'; diff --git a/module/jenkins/css/create.css b/module/jenkins/css/create.css new file mode 100644 index 0000000000..84a9608681 --- /dev/null +++ b/module/jenkins/css/create.css @@ -0,0 +1,2 @@ +.main-content>.center-block {max-width: 800px;} +#jenkinsForm table {width: 600px;} diff --git a/module/jenkins/view/create.html.php b/module/jenkins/view/create.html.php index 75e91d1574..ed065495dd 100644 --- a/module/jenkins/view/create.html.php +++ b/module/jenkins/view/create.html.php @@ -22,12 +22,10 @@ - - @@ -35,13 +33,11 @@ - - + - - + - diff --git a/module/testcase/control.php b/module/testcase/control.php index 71c7fa21d8..5708b96f92 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -2495,6 +2495,9 @@ class testcase extends control if(dao::isError()) return print(js::error(dao::getError())); + if(!empty($_POST['syncToZentao'])) + $this->zanode->syncCasesToZentao($_POST['scriptPath']); + $nodeID = $_POST['node']; $node = $this->zanode->getNodeByID($_POST['node']); diff --git a/module/testcase/css/automation.css b/module/testcase/css/automation.css new file mode 100644 index 0000000000..dc2b387672 --- /dev/null +++ b/module/testcase/css/automation.css @@ -0,0 +1 @@ +table a.refresh {border-color: white;} diff --git a/module/testcase/js/automation.js b/module/testcase/js/automation.js new file mode 100644 index 0000000000..29a66f56fc --- /dev/null +++ b/module/testcase/js/automation.js @@ -0,0 +1,8 @@ +function loadNodes() +{ + var nodeLink = createLink('zanode', 'ajaxGetNodes'); + $('#nodeIdBox').load(nodeLink, function() + { + $('#nodeIdBox').find('#node').picker(); + }); +} diff --git a/module/testcase/view/automation.html.php b/module/testcase/view/automation.html.php index 20a2d96b99..18ed3759e6 100644 --- a/module/testcase/view/automation.html.php +++ b/module/testcase/view/automation.html.php @@ -33,26 +33,31 @@ - - + + - + + + + + - + diff --git a/module/testtask/model.php b/module/testtask/model.php index ca2d2ad3b4..7d84ac6ba8 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1888,11 +1888,13 @@ class testtaskModel extends model $caseID = $case->id; $oldCase = $this->dao->select('*')->from(TABLE_CASE)->where('id')->eq($caseID)->fetch(); - $this->dao->update(TABLE_CASE)->data($case)->where('id')->eq($caseID)->exec(); - + $case->version = $oldCase->version; + $case->openedDate = $oldCase->openedDate; + $changes = common::createChanges($oldCase, $case); if($changes) { + $this->dao->update(TABLE_CASE)->data($case)->where('id')->eq($caseID)->exec(); $actionID = $this->action->create('case', $caseID, 'Edited'); $this->action->logHistory($actionID, $changes); } @@ -2329,7 +2331,7 @@ class testtaskModel extends model $caseStep = new stdclass(); $caseStep->type = 'step'; - $caseStep->desc = ''; + $caseStep->desc = $step->name; $caseStep->expect = $step->checkPoints[0]->expect; $case->steps[] = $caseStep; diff --git a/module/zahost/control.php b/module/zahost/control.php index 0e25e3911e..1af478abed 100644 --- a/module/zahost/control.php +++ b/module/zahost/control.php @@ -44,7 +44,7 @@ class zahost extends control $showFeature = false; $accounts = !empty($this->config->global->skipAutomation) ? $this->config->global->skipAutomation : ''; - if(strpos(",$accounts,", $this->app->user->account) === false) + if(strpos(",$accounts,", $this->app->user->account) === false) { $showFeature = true; $accounts .= ',' . $this->app->user->account; @@ -109,6 +109,7 @@ class zahost extends control } $viewLink = $this->createLink('zahost', 'view', "hostID=$hostID"); + if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'parent.loadHosts()')); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $viewLink)); } @@ -368,4 +369,16 @@ class zahost extends control return $this->send(array('result' => 'success', 'message' => '', 'data' => $serviceStatus)); } + + /** + * Ajax：get hosts. + * + * @access public + * @return void + */ + public function ajaxGetHosts() + { + $hostList = $this->zahost->getPairs(); + return print(html::select("parent", $hostList, '', "class='form-control chosen'")); + } } diff --git a/module/zahost/model.php b/module/zahost/model.php index 3aa0029f42..e147b70e06 100644 --- a/module/zahost/model.php +++ b/module/zahost/model.php @@ -193,7 +193,8 @@ class zahostModel extends model */ public function getImageList($hostID, $browseType = 'all', $param = 0, $orderBy = 'id', $pager = null) { - $imageList = json_decode(commonModel::http($this->config->zahost->imageListUrl, array(), array())); + $imageList = json_decode(commonModel::http($this->config->zahost->imageListUrl, array(), array())); + if(empty($imageList)) return array(); $downloadedImageList = $this->dao->select('*')->from(TABLE_IMAGE) ->where('host')->eq($hostID) diff --git a/module/zanode/config.php b/module/zanode/config.php index c8a81099d6..447e580967 100644 --- a/module/zanode/config.php +++ b/module/zanode/config.php @@ -3,7 +3,7 @@ $config->zanode->create = new stdClass(); $config->zanode->edit = new stdClass(); $config->zanode->createimage = new stdClass(); $config->zanode->create->requiredFields = 'name,host,image,cpu,memory,disk,osName'; -$config->zanode->create->physicsRequiredFields = 'name,extranet,cpu,memory,osName'; +$config->zanode->create->physicsRequiredFields = 'name,extranet,cpu,memory,osNamePhysics'; $config->zanode->edit->requiredFields = ''; $config->zanode->createimage->requiredFields = 'name'; @@ -12,7 +12,8 @@ $config->zanode->defaultAccount = 'z'; $config->zanode->defaultWinAccount = 'admin'; $config->zanode->defaultPwd = 'CQdliYQn6tKkoFhP'; -$config->zanode->initBash = 'curl -sSL https://pkg.qucheng.com/zenagent/zagent.sh | bash /dev/stdin -szvm -z%s'; +$config->zanode->initBash = 'curl -sSL https://pkg.qucheng.com/zenagent/zagent.sh | bash /dev/stdin -s zvm -k %s -z %s'; +$config->zanode->initPosh = 'Invoke-WebRequest -UseBasicParsing -Uri "https://pkg.qucheng.com/zenagent/zagent-vm.ps1" -OutFile "./install-zanget-vm.ps1"; &"./install-zanget-vm.ps1" -s %s -z %s'; $config->zanode->os = new stdClass(); @@ -51,3 +52,33 @@ $config->zanode->editor->create = array('id' => 'desc', 'tools' => 'simpleT $config->zanode->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools'); $config->zanode->editor->createimage = array('id' => 'desc', 'tools' => 'simpleTools'); $config->zanode->editor->view = array('id' => 'comment,lastComment', 'tools' => 'simpleTools'); + +$config->zanode->osType = array('linux' => 'Linux', 'windows' => 'Microsoft Windows'); + +$config->zanode->linuxList[''] = ''; +$config->zanode->linuxList['centOS65'] = 'CentOS 6.5'; +$config->zanode->linuxList['centOS66'] = 'CentOS 6.6'; +$config->zanode->linuxList['centOS67'] = 'CentOS 6.7'; +$config->zanode->linuxList['centOS70'] = 'CentOS 7.0'; +$config->zanode->linuxList['centOS71'] = 'CentOS 7.1'; +$config->zanode->linuxList['centOS79'] = 'CentOS 7.9'; + +$config->zanode->linuxList['ubuntu1404'] = 'Ubuntu 14.04'; +$config->zanode->linuxList['ubuntu1604'] = 'Ubuntu 16.04'; +$config->zanode->linuxList['ubuntu1804'] = 'Ubuntu 18.04'; +$config->zanode->linuxList['ubuntu2004'] = 'Ubuntu 20.04'; + +$config->zanode->linuxList['debianBullseye'] = 'Debian Bullseye'; +$config->zanode->linuxList['debianBuster'] = 'Debian Buster'; + +$config->zanode->windowsList[''] = ''; +$config->zanode->windowsList['win10'] = 'Windows 10'; +$config->zanode->windowsList['winserver08x64'] = 'Windows Server2008 x64'; +$config->zanode->windowsList['winserver12'] = 'Windows Server2012'; +$config->zanode->windowsList['winserver16'] = 'Windows Server2016'; + +$config->zanode->versionToOs[''] = ''; +$config->zanode->versionToOs['win10'] = 'windows'; +$config->zanode->versionToOs['winserver08x64'] = 'windows'; +$config->zanode->versionToOs['winserver12'] = 'windows'; +$config->zanode->versionToOs['winserver16'] = 'windows'; \ No newline at end of file diff --git a/module/zanode/control.php b/module/zanode/control.php index 7360defed1..b403c4e337 100644 --- a/module/zanode/control.php +++ b/module/zanode/control.php @@ -161,17 +161,16 @@ class zanode extends control $node = $this->zanode->getNodeByID($id); $vnc = $this->zanode->getVncUrl($node); - /* Add action log. */ - // if(!empty($vnc->token)) $this->loadModel('action')->create('zanode', $id, 'getVNC'); - - $this->view->url = $node->ip . ":" . $node->hzap; - $this->view->host = !empty($vnc->hostIP) ? $vnc->hostIP:''; - $this->view->token = !empty($vnc->token) ? $vnc->token:''; - $this->view->title = $this->lang->zanode->view; - $this->view->zanode = $node; + $this->view->url = $node->ip . ":" . $node->hzap; + $this->view->host = !empty($vnc->hostIP) ? $vnc->hostIP:''; + $this->view->token = !empty($vnc->token) ? $vnc->token:''; + $this->view->title = $this->lang->zanode->view; + $this->view->zanode = $node; $this->view->snapshotList = $this->zanode->getSnapshotList($id); - $this->view->actions = $this->loadModel('action')->getList('zanode', $id); - $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->initBash = sprintf(zget($this->config->zanode->versionToOs, $node->osName, '') != '' ? $this->config->zanode->initPosh : $this->config->zanode->initBash, $node->secret, getWebRoot(true)); + $this->view->actions = $this->loadModel('action')->getList('zanode', $id); + $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->display(); } @@ -564,8 +563,9 @@ class zanode extends control if ($node->status != 'running') { $serviceStatus['ZenAgent'] = "unknown"; - $serviceStatus['ZTF'] = "unknown"; + $serviceStatus['ZTF'] = "unknown"; } + $node->status = $node->status == 'online' ? 'ready' : $node->status; $serviceStatus['node'] = $node->status; return $this->send(array('result' => 'success', 'message' => '', 'data' => $serviceStatus)); @@ -626,4 +626,16 @@ class zanode extends control return $this->send(array('result' => 'success', 'message' => 'success')); } } + + /** + * Ajax：get nodes. + * + * @access public + * @return void + */ + public function ajaxGetNodes() + { + $nodeList = $this->zanode->getPairs(); + return print(html::select("node", $nodeList, '', "class='form-control picker-select'")); + } } diff --git a/module/zanode/css/browse.css b/module/zanode/css/browse.css index 648be7123d..64b697e35c 100644 --- a/module/zanode/css/browse.css +++ b/module/zanode/css/browse.css @@ -1,9 +1,12 @@ .c-id {width: 70px;} .c-memory{width: 100px;} -.c-status {width: 70px;} +.c-status {width: 90px;} .c-cpu, .c-host {width: 100px;} .c-ip{width: 150px;} .c-os, .c-type {width: 120px;} .desktop, .createImage{margin-right: 4px;} #helpTab .icon-help {line-height: unset;} #bysearchTab {margin-right: 0px;} + +.c-actions a img{position: relative; left: -80px; filter: drop-shadow(#18a6fd 80px 0); width: 18px;} +.c-actions a.disabled img {filter: drop-shadow(#313c52 80px 0);} diff --git a/module/zanode/css/browsesnapshot.css b/module/zanode/css/browsesnapshot.css index d5033bef8f..583507c6a8 100644 --- a/module/zanode/css/browsesnapshot.css +++ b/module/zanode/css/browsesnapshot.css @@ -1,4 +1,5 @@ #main{min-width: 0!important;padding:0!important;} +#main .container{padding:0!important;} body{background-color: #fff!important;} .c-createdBy {width: 100px;} diff --git a/module/zanode/css/common.css b/module/zanode/css/common.css index 1ef909a85b..8190cc895c 100644 --- a/module/zanode/css/common.css +++ b/module/zanode/css/common.css @@ -1 +1,3 @@ .icon-help{line-height: 34px;} +#osNamePhysicsContainer{display: flex;} +#osNamePhysicsContainer select{margin-right: 5px;} \ No newline at end of file diff --git a/module/zanode/css/view.css b/module/zanode/css/view.css index 66481a016a..14980da02f 100644 --- a/module/zanode/css/view.css +++ b/module/zanode/css/view.css @@ -7,14 +7,16 @@ .zanode-mt-8{margin-top: 8px;} .zanode-status-text{margin-left: 10px;font:small-caption;color:#838a9d;} .zanode-status-text i{color:#18a6fd} -.status-notice{margin-top: 8px;margin-left: 18px;line-height: 28px;} +.status-notice{margin-top: 16px;line-height: 28px;} .status-notice a{color: #2463c7;} .service-status a{color: #2463c7;} -.service-status{margin-top: 10px;} +.service-status{margin-top: 5px;} .vnc-detail{height: 60vh;min-height: 550px;} .vnc-mask{width: 100%;height:100%;background-color: rgba(0,0,0,0);position: absolute;z-index: 1;} .checkStatus{color: #313c52;} .node-not-wrap{white-space: nowrap;} .btn-info {background-color: unset;} .btn.disabled i {color: #fff;} -#serviceContent{min-height: 120px;} +.btn-toolbar a img{margin-bottom: 2px;} +.zanode-init{padding:15px;background: #f4f5f7;margin:10px 0;} +.btn-snap-create{height: 30px;} diff --git a/module/zanode/js/create.js b/module/zanode/js/create.js index bd96c2ca22..efad795dbe 100644 --- a/module/zanode/js/create.js +++ b/module/zanode/js/create.js @@ -1,12 +1,18 @@ -function zahostType() +/** + * Change zanode type. + * + * @access public + * @return void + */ +function zanodeType() { - if($('#type').val() == 'physics') + if($('#hostType').val() == 'physics') { $('#parent').closest('tr').hide(); $('#image').closest('tr').hide(); $('#extranet').closest('tr').removeClass('hidden'); $('#osName').addClass('hidden'); - $('#osNamePhysics').removeClass('hidden'); + $('#osNamePhysicsContainer').removeClass('hidden'); } else { @@ -14,6 +20,48 @@ function zahostType() $('#image').closest('tr').show(); $('#extranet').closest('tr').addClass('hidden'); $('#osName').removeClass('hidden'); - $('#osNamePhysics').addClass('hidden'); + $('#osNamePhysicsContainer').addClass('hidden'); } } + +/** + * Load hosts. + * + * @access public + * @return void + */ +function loadHosts() +{ + var hostLink = createLink('zahost', 'ajaxGetHosts'); + $('#hostIdBox').load(hostLink, function() + { + $('#hostIdBox').find('#parent').chosen(); + }); +} + +$(function() +{ + $('#osNamePhysicsPre').on('change', function() + { + console.log($(this).val()) + if($(this).val() == 'linux') + { + $('#osNamePhysics').empty(); + for(var i in linuxList) + { + console.log(linuxList[i]) + $('#osNamePhysics').append('') + } + } + else + { + $('#osNamePhysics').empty(); + for(var i in windowsList) + { + console.log(windowsList[i]) + $('#osNamePhysics').append('') + } + } + $('#osNamePhysics').trigger('chosen:updated'); + }) +}) \ No newline at end of file diff --git a/module/zanode/js/view.js b/module/zanode/js/view.js index d46022f99f..59059bd739 100644 --- a/module/zanode/js/view.js +++ b/module/zanode/js/view.js @@ -36,7 +36,14 @@ function checkServiceStatus(){ { if(resultData.data[key] == 'unknown') { - $('.ztf-status').text(zanodeLang.init.unknown) + if(hostType == 'physics') + { + $('.ztf-status').text(zanodeLang.init.not_install) + } + else + { + $('.ztf-status').text(zanodeLang.init.unknown) + } } else { @@ -47,7 +54,7 @@ function checkServiceStatus(){ } else if(key == "node") { - if(nodeStatus != resultData.data[key] && resultData.data[key]) + if(resultData.data[key] && zanodeLang.statusList[nodeStatus] != zanodeLang.statusList[resultData.data[key]]) { window.location.reload(); } @@ -88,14 +95,14 @@ function checkServiceStatus(){ if(!isSuccess) { - // $('.init-fail').show(); + $('.init-fail').show(); $('.init-success').hide(); } else { clearInterval(checkInterval) $('.init-success').show(); - // $('.init-fail').hide(); + $('.init-fail').hide(); } setTimeout(function() { $('#serviceContent').removeClass('loading'); @@ -161,6 +168,28 @@ $('.btn-pwd-copy').live('click', function() }, 2000) }) +$('.btn-init-copy').live('click', function() +{ + var copyText = $('#initBash'); + copyText.show(); + copyText .select(); + document.execCommand("Copy"); + copyText.hide(); + $('.btn-init-copy').tooltip({ + trigger: 'click', + placement: 'top', + title: zanodeLang.copied, + tipClass: 'tooltip-success' + }); + + $(this).tooltip('show'); + var that = this; + setTimeout(function() + { + $(that).tooltip('hide') + }, 2000) +}) + $('.btn-pwd-show').live('click', function() { var pwd = $('#pwd-copy').text(); @@ -188,6 +217,9 @@ $('#jumpManual').click(function() $(function(){ $('#checkServiceStatus').trigger("click") + if(hostType == 'physics'){ + return; + } checkInterval = setInterval(() => { intervalTimes++; if(intervalTimes > 300) diff --git a/module/zanode/lang/de.php b/module/zanode/lang/de.php index a3f4e4e192..6ccea2777f 100644 --- a/module/zanode/lang/de.php +++ b/module/zanode/lang/de.php @@ -22,6 +22,7 @@ $lang->zanode->getVNC = 'Remote management'; $lang->zanode->all = 'All'; $lang->zanode->byQuery = 'Search'; $lang->zanode->osName = 'System'; +$lang->zanode->osNamePhysics = 'System'; $lang->zanode->image = 'VM Image'; $lang->zanode->imageName = 'Image Name'; $lang->zanode->name = 'Name'; @@ -29,7 +30,8 @@ $lang->zanode->start = 'Start After Created'; $lang->zanode->hostName = 'Host Name'; $lang->zanode->host = $lang->zanode->hostName; $lang->zanode->extranet = 'IP/Domain'; -$lang->zanode->sshAddress = 'SSH Command'; +$lang->zanode->sshCommand = 'SSH Command'; +$lang->zanode->sshAddress = 'SSH Address'; $lang->zanode->osArch = 'Arch'; $lang->zanode->cpuCores = 'CPU'; $lang->zanode->defaultUser = 'Default Account Name'; @@ -53,6 +55,7 @@ $lang->zanode->confirmRestore = "The ZenAgent Node will be restored to this sna $lang->zanode->actionSuccess = 'Success'; $lang->zanode->deleted = "Deleted"; $lang->zanode->scriptPath = "Script path"; +$lang->zanode->syncToZentao = "Sync cases in the directory to Zentao"; $lang->zanode->shell = "Shell"; $lang->zanode->automation = "Automation"; $lang->zanode->install = "Install"; @@ -63,6 +66,9 @@ $lang->zanode->manual = 'Manual'; $lang->zanode->initializing = 'Initializing'; $lang->zanode->showPwd = 'Show Password'; $lang->zanode->hidePwd = 'Hide Password'; +$lang->zanode->baseInfo = 'Basic information'; +$lang->zanode->cpuUnit = 'CORE'; +$lang->zanode->IP = 'Extranet Address'; $lang->zanode->typeList['node'] = 'Virtual machine'; $lang->zanode->typeList['physics'] = 'Physical machine'; @@ -72,6 +78,7 @@ $lang->automation->scriptPath = $lang->zanode->scriptPath; $lang->automation->node = $lang->zanode->common; $lang->zanode->notFoundAgent = 'No Agent service is found'; +$lang->zanode->busy = 'This Node is %s, please wait for the operation to complete.'; $lang->zanode->createVmFail = 'Failed to create a ZenAgent Node'; $lang->zanode->noVncPort = 'Failed to get vnc port'; $lang->zanode->nameValid = "The name can only be letters, numbers, '-', '_', '.', and cannot start with a symbol"; @@ -134,6 +141,8 @@ $lang->zanode->statusList['destroy_fail'] = 'Destroy Fail'; $lang->zanode->statusList['wait'] = 'Initializing'; $lang->zanode->statusList['online'] = 'Online'; $lang->zanode->statusList['restoring'] = 'Restoring'; +$lang->zanode->statusList['creating_snap'] = 'Creating Snapshot'; +$lang->zanode->statusList['creating_img'] = 'Creating Image'; $lang->zanode->initNotice = "Succeeded. Please initialize the execution node or return to the list."; $lang->zanode->initButton = "Initialize"; @@ -148,9 +157,9 @@ $lang->zanode->init->ready = "Ready"; $lang->zanode->init->next = "Next"; $lang->zanode->init->button = "Go To Settings"; -$lang->zanode->init->initSuccessNoticeTitle = "The service is ready, and it takes two steps to execute the automated test on the execution node:
1. Configure the automated test running environment according to the %s
2. Go to %s"; -$lang->zanode->init->initFailNoticeTitle = "Initialization failed, check the init script execution log and try the following two solutions:"; -$lang->zanode->init->initFailNoticeDesc = "1. Re-execute the script
2. Review the initialization FAQ"; +$lang->zanode->init->initSuccessNoticeTitle = "The service is ready, and it takes two steps to execute the automated test on the execution node:
1. Configure the automated test running environment according to the %s
2. Go to %s"; +$lang->zanode->init->initFailNotice = "Fail，Execute the installation service command on the node or See Help."; +$lang->zanode->init->initFailNoticeOnPhysics = "The service has not been installed yet, please check the service status after executing the following command on the execution node。See Help"; $lang->zanode->init->serviceStatus = array( "ZenAgent" => 'not_install', diff --git a/module/zanode/lang/en.php b/module/zanode/lang/en.php index 6ea6e5acbd..a4d1e9b20e 100644 --- a/module/zanode/lang/en.php +++ b/module/zanode/lang/en.php @@ -22,6 +22,7 @@ $lang->zanode->getVNC = 'Remote management'; $lang->zanode->all = 'All'; $lang->zanode->byQuery = 'Search'; $lang->zanode->osName = 'System'; +$lang->zanode->osNamePhysics = 'System'; $lang->zanode->image = 'VM Image'; $lang->zanode->imageName = 'Image Name'; $lang->zanode->name = 'Name'; @@ -29,7 +30,8 @@ $lang->zanode->start = 'Start After Created'; $lang->zanode->hostName = 'Host Name'; $lang->zanode->host = $lang->zanode->hostName; $lang->zanode->extranet = 'IP/Domain'; -$lang->zanode->sshAddress = 'SSH Command'; +$lang->zanode->sshCommand = 'SSH Command'; +$lang->zanode->sshAddress = 'SSH Address'; $lang->zanode->osArch = 'Arch'; $lang->zanode->cpuCores = 'CPU'; $lang->zanode->defaultUser = 'Default Account Name'; @@ -53,6 +55,7 @@ $lang->zanode->confirmRestore = "The ZenAgent Node will be restored to this sna $lang->zanode->actionSuccess = 'Success'; $lang->zanode->deleted = "Deleted"; $lang->zanode->scriptPath = "Script path"; +$lang->zanode->syncToZentao = "Sync cases in the directory to Zentao"; $lang->zanode->shell = "Shell"; $lang->zanode->automation = "Automation"; $lang->zanode->install = "Install"; @@ -63,6 +66,9 @@ $lang->zanode->manual = 'Manual'; $lang->zanode->initializing = 'Initializing'; $lang->zanode->showPwd = 'Show Password'; $lang->zanode->hidePwd = 'Hide Password'; +$lang->zanode->baseInfo = 'Basic information'; +$lang->zanode->cpuUnit = 'CORE'; +$lang->zanode->IP = 'Extranet Address'; $lang->zanode->typeList['node'] = 'Virtual machine'; $lang->zanode->typeList['physics'] = 'Physical machine'; @@ -72,6 +78,7 @@ $lang->automation->scriptPath = $lang->zanode->scriptPath; $lang->automation->node = $lang->zanode->common; $lang->zanode->notFoundAgent = 'No Agent service is found'; +$lang->zanode->busy = 'This Node is %s, please wait for the operation to complete.'; $lang->zanode->createVmFail = 'Failed to create a ZenAgent Node'; $lang->zanode->noVncPort = 'Failed to get vnc port'; $lang->zanode->nameValid = "The name can only be letters, numbers, '-', '_', '.', and cannot start with a symbol"; @@ -134,6 +141,8 @@ $lang->zanode->statusList['destroy_fail'] = 'Destroy Fail'; $lang->zanode->statusList['wait'] = 'Initializing'; $lang->zanode->statusList['online'] = 'Online'; $lang->zanode->statusList['restoring'] = 'Restoring'; +$lang->zanode->statusList['creating_snap'] = 'Creating Snapshot'; +$lang->zanode->statusList['creating_img'] = 'Creating Image'; $lang->zanode->initNotice = "Succeeded. Please initialize the execution node or return to the list."; $lang->zanode->initButton = "Initialize"; @@ -148,9 +157,9 @@ $lang->zanode->init->ready = "Ready"; $lang->zanode->init->next = "Next"; $lang->zanode->init->button = "Go To Settings"; -$lang->zanode->init->initSuccessNoticeTitle = "The service is ready, and it takes two steps to execute the automated test on the execution node:
1. Configure the automated test running environment according to the %s
2. Go to %s"; -$lang->zanode->init->initFailNoticeTitle = "Initialization failed, check the init script execution log and try the following two solutions:"; -$lang->zanode->init->initFailNoticeDesc = "1. Re-execute the script
2. Review the initialization FAQ"; +$lang->zanode->init->initSuccessNoticeTitle = "The service is ready, and it takes two steps to execute the automated test on the execution node:
1. Configure the automated test running environment according to the %s
2. Go to %s"; +$lang->zanode->init->initFailNotice = "Fail，Execute the installation service command on the node or See Help."; +$lang->zanode->init->initFailNoticeOnPhysics = "The service has not been installed yet, please check the service status after executing the following command on the execution node。See Help"; $lang->zanode->init->serviceStatus = array( "ZenAgent" => 'not_install', diff --git a/module/zanode/lang/fr.php b/module/zanode/lang/fr.php index a3f4e4e192..6ccea2777f 100644 --- a/module/zanode/lang/fr.php +++ b/module/zanode/lang/fr.php @@ -22,6 +22,7 @@ $lang->zanode->getVNC = 'Remote management'; $lang->zanode->all = 'All'; $lang->zanode->byQuery = 'Search'; $lang->zanode->osName = 'System'; +$lang->zanode->osNamePhysics = 'System'; $lang->zanode->image = 'VM Image'; $lang->zanode->imageName = 'Image Name'; $lang->zanode->name = 'Name'; @@ -29,7 +30,8 @@ $lang->zanode->start = 'Start After Created'; $lang->zanode->hostName = 'Host Name'; $lang->zanode->host = $lang->zanode->hostName; $lang->zanode->extranet = 'IP/Domain'; -$lang->zanode->sshAddress = 'SSH Command'; +$lang->zanode->sshCommand = 'SSH Command'; +$lang->zanode->sshAddress = 'SSH Address'; $lang->zanode->osArch = 'Arch'; $lang->zanode->cpuCores = 'CPU'; $lang->zanode->defaultUser = 'Default Account Name'; @@ -53,6 +55,7 @@ $lang->zanode->confirmRestore = "The ZenAgent Node will be restored to this sna $lang->zanode->actionSuccess = 'Success'; $lang->zanode->deleted = "Deleted"; $lang->zanode->scriptPath = "Script path"; +$lang->zanode->syncToZentao = "Sync cases in the directory to Zentao"; $lang->zanode->shell = "Shell"; $lang->zanode->automation = "Automation"; $lang->zanode->install = "Install"; @@ -63,6 +66,9 @@ $lang->zanode->manual = 'Manual'; $lang->zanode->initializing = 'Initializing'; $lang->zanode->showPwd = 'Show Password'; $lang->zanode->hidePwd = 'Hide Password'; +$lang->zanode->baseInfo = 'Basic information'; +$lang->zanode->cpuUnit = 'CORE'; +$lang->zanode->IP = 'Extranet Address'; $lang->zanode->typeList['node'] = 'Virtual machine'; $lang->zanode->typeList['physics'] = 'Physical machine'; @@ -72,6 +78,7 @@ $lang->automation->scriptPath = $lang->zanode->scriptPath; $lang->automation->node = $lang->zanode->common; $lang->zanode->notFoundAgent = 'No Agent service is found'; +$lang->zanode->busy = 'This Node is %s, please wait for the operation to complete.'; $lang->zanode->createVmFail = 'Failed to create a ZenAgent Node'; $lang->zanode->noVncPort = 'Failed to get vnc port'; $lang->zanode->nameValid = "The name can only be letters, numbers, '-', '_', '.', and cannot start with a symbol"; @@ -134,6 +141,8 @@ $lang->zanode->statusList['destroy_fail'] = 'Destroy Fail'; $lang->zanode->statusList['wait'] = 'Initializing'; $lang->zanode->statusList['online'] = 'Online'; $lang->zanode->statusList['restoring'] = 'Restoring'; +$lang->zanode->statusList['creating_snap'] = 'Creating Snapshot'; +$lang->zanode->statusList['creating_img'] = 'Creating Image'; $lang->zanode->initNotice = "Succeeded. Please initialize the execution node or return to the list."; $lang->zanode->initButton = "Initialize"; @@ -148,9 +157,9 @@ $lang->zanode->init->ready = "Ready"; $lang->zanode->init->next = "Next"; $lang->zanode->init->button = "Go To Settings"; -$lang->zanode->init->initSuccessNoticeTitle = "The service is ready, and it takes two steps to execute the automated test on the execution node:
1. Configure the automated test running environment according to the %s
2. Go to %s"; -$lang->zanode->init->initFailNoticeTitle = "Initialization failed, check the init script execution log and try the following two solutions:"; -$lang->zanode->init->initFailNoticeDesc = "1. Re-execute the script
2. Review the initialization FAQ"; +$lang->zanode->init->initSuccessNoticeTitle = "The service is ready, and it takes two steps to execute the automated test on the execution node:
1. Configure the automated test running environment according to the %s
2. Go to %s"; +$lang->zanode->init->initFailNotice = "Fail，Execute the installation service command on the node or See Help."; +$lang->zanode->init->initFailNoticeOnPhysics = "The service has not been installed yet, please check the service status after executing the following command on the execution node。See Help"; $lang->zanode->init->serviceStatus = array( "ZenAgent" => 'not_install', diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php index 8e0215ced4..5a89b72e9a 100644 --- a/module/zanode/lang/zh-cn.php +++ b/module/zanode/lang/zh-cn.php @@ -22,6 +22,7 @@ $lang->zanode->getVNC = '远程'; $lang->zanode->all = '全部'; $lang->zanode->byQuery = '搜索'; $lang->zanode->osName = '操作系统'; +$lang->zanode->osNamePhysics = '操作系统'; $lang->zanode->image = '镜像'; $lang->zanode->imageName = '镜像名称'; $lang->zanode->name = '名称'; @@ -29,7 +30,8 @@ $lang->zanode->start = '创建后自动开启'; $lang->zanode->hostName = '所属宿主机'; $lang->zanode->host = $lang->zanode->hostName; $lang->zanode->extranet = 'IP/域名'; -$lang->zanode->sshAddress = 'SSH命令'; +$lang->zanode->sshCommand = 'SSH命令'; +$lang->zanode->sshAddress = 'SSH地址'; $lang->zanode->osArch = '架构'; $lang->zanode->cpuCores = 'CPU'; $lang->zanode->defaultUser = '默认用户'; @@ -53,6 +55,7 @@ $lang->zanode->confirmRestore = "执行节点将会还原至此快照状态， $lang->zanode->actionSuccess = '操作成功'; $lang->zanode->deleted = "已删除"; $lang->zanode->scriptPath = "脚本目录"; +$lang->zanode->syncToZentao = "同步脚本信息到禅道"; $lang->zanode->shell = "shell命令"; $lang->zanode->automation = "自动化设置"; $lang->zanode->install = "安装"; @@ -63,6 +66,9 @@ $lang->zanode->manual = '手册'; $lang->zanode->initializing = '初始化中'; $lang->zanode->showPwd = '显示密码'; $lang->zanode->hidePwd = '隐藏密码'; +$lang->zanode->baseInfo = '基础信息'; +$lang->zanode->cpuUnit = '核'; +$lang->zanode->IP = 'IP/域名'; $lang->zanode->typeList['node'] = '虚拟机'; $lang->zanode->typeList['physics'] = '物理机'; @@ -72,6 +78,7 @@ $lang->automation->scriptPath = $lang->zanode->scriptPath; $lang->automation->node = $lang->zanode->common; $lang->zanode->notFoundAgent = '没有发现Agent服务'; +$lang->zanode->busy = '节点正在%s, 请等待操作完成'; $lang->zanode->createVmFail = '创建执行节点失败'; $lang->zanode->noVncPort = '无法获取执行节点端口'; $lang->zanode->nameValid = "名称只能是字母、数字，'-'，'_'，'.'，且不能以符号开头"; @@ -121,19 +128,21 @@ $lang->zanode->apiError['notRunning'] = '请检查执行节点状态'; $lang->zanode->publicList[0] = '不共享'; $lang->zanode->publicList[1] = '共享'; -$lang->zanode->statusList['created'] = '已创建'; -$lang->zanode->statusList['launch'] = '运行中'; -$lang->zanode->statusList['ready'] = '运行中'; -$lang->zanode->statusList['running'] = '运行中'; -$lang->zanode->statusList['suspend'] = '休眠'; -$lang->zanode->statusList['offline'] = '下线'; -$lang->zanode->statusList['destroy'] = '已销毁'; -$lang->zanode->statusList['shutoff'] = '已关机'; -$lang->zanode->statusList['shutodown'] = '已关机'; -$lang->zanode->statusList['destroy_fail'] = '销毁失败'; -$lang->zanode->statusList['wait'] = '初始化中'; -$lang->zanode->statusList['online'] = '已上架'; -$lang->zanode->statusList['restoring'] = '还原中'; +$lang->zanode->statusList['created'] = '已创建'; +$lang->zanode->statusList['launch'] = '运行中'; +$lang->zanode->statusList['ready'] = '运行中'; +$lang->zanode->statusList['running'] = '运行中'; +$lang->zanode->statusList['suspend'] = '休眠'; +$lang->zanode->statusList['offline'] = '下线'; +$lang->zanode->statusList['destroy'] = '已销毁'; +$lang->zanode->statusList['shutoff'] = '已关机'; +$lang->zanode->statusList['shutodown'] = '已关机'; +$lang->zanode->statusList['destroy_fail'] = '销毁失败'; +$lang->zanode->statusList['wait'] = '初始化中'; +$lang->zanode->statusList['online'] = '运行中'; +$lang->zanode->statusList['restoring'] = '还原中'; +$lang->zanode->statusList['creating_snap'] = '创建快照中'; +$lang->zanode->statusList['creating_img'] = '导出镜像中'; $lang->zanode->initNotice = "保存成功，请初始化执行节点或返回列表。"; $lang->zanode->initButton = "去初始化"; @@ -148,9 +157,9 @@ $lang->zanode->init->ready = "已就绪"; $lang->zanode->init->next = "下一步"; $lang->zanode->init->button = "去设置"; -$lang->zanode->init->initSuccessNoticeTitle = "服务已就绪，还需两步即可在执行节点上执行自动化测试：
1、根据%s配置自动化测试运行环境。
2、进行%s"; -$lang->zanode->init->initFailNoticeTitle = "初始化失败，请查看初始化脚本执行日志并尝试以下两种解决方案："; -$lang->zanode->init->initFailNoticeDesc = "1、 重新执行脚本
2、 查看初始化常见问题"; +$lang->zanode->init->initSuccessNoticeTitle = "服务已就绪，还需两步即可在执行节点上执行自动化测试：
1、根据%s配置自动化测试运行环境。
2、进行%s"; +$lang->zanode->init->initFailNotice = "服务未就绪，在执行节点上执行安装服务命令或查看帮助."; +$lang->zanode->init->initFailNoticeOnPhysics = "服务还没有安装，请在执行节点执行以下命令后检测服务状态。查看帮助"; $lang->zanode->init->serviceStatus = array( "ZenAgent" => 'not_install', diff --git a/module/zanode/model.php b/module/zanode/model.php index 313eb4d24b..592c7b1ea8 100644 --- a/module/zanode/model.php +++ b/module/zanode/model.php @@ -12,16 +12,19 @@ class zanodemodel extends model { - const STATUS_CREATED = 'created'; - const STATUS_LAUNCH = 'launch'; - const STATUS_FAIL_CREATE = 'vm_fail_create'; - const STATUS_RUNNING = 'running'; - const STATUS_SHUTOFF = 'shutoff'; - const STATUS_BUSY = 'busy'; - const STATUS_READY = 'ready'; - const STATUS_UNKNOWN = 'unknown'; - const STATUS_DESTROY = 'destroy'; - const STATUS_DESTROY_FAIL = 'vim_destroy_fail'; + const STATUS_CREATED = 'created'; + const STATUS_LAUNCH = 'launch'; + const STATUS_FAIL_CREATE = 'vm_fail_create'; + const STATUS_RUNNING = 'running'; + const STATUS_SHUTOFF = 'shutoff'; + const STATUS_BUSY = 'busy'; + const STATUS_READY = 'ready'; + const STATUS_UNKNOWN = 'unknown'; + const STATUS_DESTROY = 'destroy'; + const STATUS_RESTORING = 'restoring'; + const STATUS_CREATING_SNAP = 'creating_snap'; + const STATUS_CREATING_IMG = 'creating_img'; + const STATUS_DESTROY_FAIL = 'vim_destroy_fail'; const KVM_CREATE_PATH = '/api/v1/kvm/create'; const KVM_TOKEN_PATH = '/api/v1/virtual/getVncToken'; @@ -54,17 +57,29 @@ class zanodemodel extends model public function create() { $data = fixer::input('post') - ->setIF($this->post->type == 'physics', 'parent', 0) - ->setIF($this->post->type == 'physics', 'osName', $this->post->osNamePhysics) - ->remove('osNamePhysics') + ->setIF($this->post->hostType == 'physics', 'parent', 0) + ->setIF($this->post->hostType == 'physics', 'osName', $this->post->osNamePhysics) ->get(); + $data->type = "node"; + + if($data->hostType == 'physics') + { + $data->secret = md5($data->name . time()); + $data->status = "offline"; + } + else + { + $data->hostType = ''; + } + /* Batch check fields. */ $this->dao->update(TABLE_ZAHOST)->data($data) - ->batchCheck($data->type == 'node' ? $this->config->zanode->create->requiredFields : $this->config->zanode->create->physicsRequiredFields, 'notempty'); + ->batchCheck($data->hostType != 'physics' ? $this->config->zanode->create->requiredFields : $this->config->zanode->create->physicsRequiredFields, 'notempty'); if(dao::isError()) return false; + unset($data->osNamePhysics); if(!preg_match("/^(?!_)(?!-)(?!\.)[a-zA-Z0-9\_\.\-]+$/", $data->name)) { dao::$errors[] = $this->lang->zanode->nameValid; @@ -72,10 +87,10 @@ class zanodemodel extends model } /* If name already exists return error. */ - $node = $this->dao->select('*')->from(TABLE_ZAHOST)->where('name')->eq($data->name)->andWhere('type')->in('node,physics')->fetch(); + $node = $this->dao->select('*')->from(TABLE_ZAHOST)->where('name')->eq($data->name)->andWhere('type')->eq('node')->fetch(); if($node) return dao::$errors[] = $this->lang->zanode->nameUnique; - if($data->type == 'physics') + if($data->hostType == 'physics') { $ping = $this->loadModel('zahost')->checkAddress($data->extranet); if(!$ping) @@ -181,7 +196,12 @@ class zanodemodel extends model $result = json_decode(commonModel::http($agnetUrl . static::KVM_EXPORT_PATH, json_encode($param,JSON_NUMERIC_CHECK), null, array("Authorization:$node->tokenSN"))); - if(!empty($result) and $result->code == 'success') return $newID; + + if(!empty($result) and $result->code == 'success') + { + $this->dao->update(TABLE_HOST)->set('status')->eq(static::STATUS_CREATING_IMG)->where('id')->eq($node->id)->exec(); + return $newID; + } $this->dao->delete()->from(TABLE_IMAGE)->where('id')->eq($newID)->exec(); return false; @@ -239,11 +259,14 @@ class zanodemodel extends model if(!empty($result) and $result->code == 'success') { $this->loadModel('action')->create('zanode', $zanodeID, 'createdSnapshot', '', $data->name); + $this->dao->update(TABLE_HOST)->set('status')->eq(static::STATUS_CREATING_SNAP)->where('id')->eq($node->id)->exec(); + return $newID; } $this->dao->delete()->from(TABLE_IMAGE)->where('id')->eq($newID)->exec(); dao::$errors[] = (!empty($result) and !empty($result->msg)) ? $result->msg : $this->app->lang->fail; + return false; } @@ -286,11 +309,14 @@ class zanodemodel extends model if(!empty($result) and $result->code == 'success') { + $this->dao->update(TABLE_HOST)->set('status')->eq(static::STATUS_CREATING_SNAP)->where('id')->eq($node->id)->exec(); + return $newID; } $this->dao->delete()->from(TABLE_IMAGE)->where('id')->eq($newID)->exec(); dao::$errors[] = (!empty($result) and !empty($result->msg)) ? $result->msg : $this->app->lang->fail; + return false; } @@ -415,6 +441,11 @@ class zanodemodel extends model { $node = $this->getNodeByID($id); + if(in_array($node->status, array('restoring', 'creating_img', 'creating_snap'))) + { + return sprintf($this->lang->zanode->busy, $this->lang->zanode->statusList[$node->status]); + } + /* Prepare create params. */ $agnetUrl = 'http://' . $node->ip . ':' . $node->hzap; $path = '/api/v1/kvm/' . $node->name . '/' . $type; @@ -450,7 +481,7 @@ class zanodemodel extends model { $node = $this->getNodeByID($id); - if($node) + if($node && $node->hostType != 'physics') { $req = array( 'name' => $node->name ); $agnetUrl = 'http://' . $node->ip . ':' . $node->hzap; @@ -570,11 +601,11 @@ class zanodemodel extends model $query = str_replace('`hostID`', 't2.`id`', $query); } - $list = $this->dao->select("t1.*, t2.name as hostName, if(t1.type='node', t2.extranet, t1.extranet) extranet,if(t1.type='node', t3.osName, t1.osName) osName")->from(TABLE_ZAHOST)->alias('t1') + $list = $this->dao->select("t1.*, t2.name as hostName, if(t1.hostType='', t2.extranet, t1.extranet) extranet,if(t1.hostType='', t3.osName, t1.osName) osName")->from(TABLE_ZAHOST)->alias('t1') ->leftJoin(TABLE_ZAHOST)->alias('t2')->on('t1.parent = t2.id') ->leftJoin(TABLE_IMAGE)->alias('t3')->on('t3.id = t1.image') ->where('t1.deleted')->eq(0) - ->andWhere("((t1.type = 'node' and t2.type = 'zahost') or t1.type = 'physics')") + ->andWhere("t1.type = 'node'") ->beginIF($query)->andWhere($query)->fi() ->orderBy($orderBy) ->page($pager) @@ -587,7 +618,9 @@ class zanodemodel extends model foreach($list as $l) { - $host = zget($hosts, $l->parent); + $host = $l->hostType == '' ? zget($hosts, $l->parent) : clone $l; + $host->status = in_array($host->status, array('running', 'ready')) ? "online" : $host->status; + if($l->status == 'running' || $l->status == 'ready') { if(empty($host)) @@ -598,13 +631,13 @@ class zanodemodel extends model if($host->status != 'online' || time() - strtotime($host->heartbeat) > 60) { - $l->status = self::STATUS_SHUTOFF; + $l->status = $l->hostType == '' ? 'wait' : 'offline'; continue; } if(time() - strtotime($l->heartbeat) > 60) { - $l->status = 'wait'; + $l->status = $l->hostType == '' ? 'wait' : 'offline'; } } } @@ -622,7 +655,7 @@ class zanodemodel extends model { return $this->dao->select('*')->from(TABLE_ZAHOST) ->where('deleted')->eq(0) - ->andWhere("type")->eq('node') + ->andWhere("type")->in('node,physics') ->orderBy($orderBy) ->fetchAll('id'); } @@ -638,7 +671,7 @@ class zanodemodel extends model { return $this->dao->select('*')->from(TABLE_ZAHOST) ->where('deleted')->eq(0) - ->andWhere("type")->eq('node') + ->andWhere("type")->in('node,physics') ->orderBy($orderBy) ->fetchPairs('id', 'name'); } @@ -654,6 +687,8 @@ class zanodemodel extends model */ public function getListByHost($hostID, $orderBy = 'id_desc') { + if(!$hostID) return array(); + $list = $this->dao->select('id, name, vnc, cpuCores, memory, diskSize, osName, status, heartbeat')->from(TABLE_ZAHOST) ->where('deleted')->eq(0) ->andWhere("parent")->eq($hostID) @@ -786,15 +821,17 @@ class zanodemodel extends model */ public function getNodeByID($id) { - $node = $this->dao->select("t1.*, t2.name as hostName, t2.extranet as ip,t2.zap as hzap,if(t1.type='node', t3.osName, t1.osName) osName, t2.tokenSN as tokenSN, t2.secret as secret")->from(TABLE_ZAHOST) + $node = $this->dao->select("t1.*, t2.name as hostName, if(t1.hostType='', t2.extranet, t1.extranet) ip,t2.zap as hzap,if(t1.hostType='', t3.osName, t1.osName) osName, if(t1.hostType='', t2.tokenSN, t1.tokenSN) tokenSN, if(t1.hostType='', t2.secret, t1.secret) secret")->from(TABLE_ZAHOST) ->alias('t1') ->leftJoin(TABLE_ZAHOST)->alias('t2')->on('t1.parent = t2.id') ->leftJoin(TABLE_IMAGE)->alias('t3')->on('t3.id = t1.image') ->where('t1.id')->eq($id) ->fetch(); - $host = $this->loadModel("zahost")->getByID($node->type == 'node' ? $node->parent : $node->id); - if($node->status == 'running' || $node->status == 'ready') + $host = $node->hostType == '' ? $this->loadModel("zahost")->getByID($node->parent) : clone $node; + $host->status = in_array($host->status, array('running', 'ready')) ? "online" : $host->status; + + if($node->status == 'running' || $node->status == 'ready' || $node->status == 'online') { if(empty($host) || $host->status != 'online') { @@ -802,7 +839,7 @@ class zanodemodel extends model } elseif(time() - strtotime($node->heartbeat) > 60) { - $node->status = 'wait'; + $node->status = $node->hostType == '' ? 'wait' : 'offline'; } } @@ -820,8 +857,11 @@ class zanodemodel extends model $node = $this->dao->select('*')->from(TABLE_ZAHOST) ->where('mac')->eq($mac) ->fetch(); + if(empty($node)) return $node; + + $host = $node->hostType == '' ? $this->loadModel("zahost")->getByID($node->parent) : $node; + $host->status = in_array($host->status, array('running', 'ready')) ? "online" : $host->status; - $host = $this->loadModel("zahost")->getByID($node->parent); if($node->status == 'running' || $node->status == 'ready') { if(empty($host) || $host->status != 'online') @@ -1048,6 +1088,7 @@ class zanodemodel extends model { $now = helper::now(); $data = fixer::input('post') + ->remove('syncToZentao') ->setDefault('createdBy', $this->app->user->account) ->setDefault('createdDate', $now) ->setDefault('node', 0) @@ -1098,4 +1139,14 @@ class zanodemodel extends model return dao::$errors = $this->lang->zanode->runTimeout; } } + + /** + * Sync cases in dir to zentao. + * + * @access public + * @return void + */ + public function syncCasesToZentao($path) + { + } } diff --git a/module/zanode/view/browse.html.php b/module/zanode/view/browse.html.php index e586757bfa..fdae12124b 100644 --- a/module/zanode/view/browse.html.php +++ b/module/zanode/view/browse.html.php @@ -53,7 +53,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -80,26 +80,26 @@
gitlab->gitlabAvatar;?> gitlab->gitlabAccount;?> gitlab->gitlabEmail;?>gitlab->zentaoAccount;?>gitlab->zentaoEmail;?>gitlab->zentaoAccount;?> gitlab->bindingStatus;?>
avatar, "height=40");?> - realname;?> -
- account;?> + 		+ avatar, "height=20 width=20 class='img-circle'");?> + realname . '@' . $gitlabUser->account;?> email;?>id]", $userPairs, '', "class='form-control select chosen'" );?>gitlab->notBind;?>id]", $userPairs, '', "class='form-control select chosen gitlab-user-bind'" );?>' . $lang->gitlab->notBind . '';?>
avatar, "height=40");?> - realname;?> -
- account;?> + avatar, "height=20 width=20 class='img-circle'");?> + realname . '@' . $gitlabUser->account;?> 		email;?>id]", $userPairs, $gitlabUser->zentaoAccount, "class='form-control select chosen'" );?>id]", $userPairs, $gitlabUser->zentaoAccount, "class='form-control select chosen gitlab-user-bind'" );?> id, $bindedUsers)):?> zentaoAccount, '');?> @@ -64,7 +88,7 @@ ' . $lang->gitlab->bindedError . '';?> - gitlab->notBind;?> + ' . $lang->gitlab->notBind . '';?>
gitlab->name;?> gitlab->placeholder->name}'");?>
gitlab->url;?>
gogs->name;?>
gogs->url;?>
jenkins->name; ?>
jenkins->url; ?>
jenkins->account;?>
jenkins->token;?>jenkins->tokenFirst;?>jenkins->tokenFirst}'");?>
jenkins->password;?>jenkins->tips;?>jenkins->tips}'");?>
diff --git a/module/repo/control.php b/module/repo/control.php index 32ea458c9f..2ccba4bfd8 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -139,7 +139,7 @@ class repo extends control $this->app->loadLang('action'); - if($this->app->tab == 'project') + if($this->app->tab == 'project' or $this->app->tab == 'execution') { $products = $this->loadModel('product')->getProductPairsByProject($objectID); } @@ -154,7 +154,7 @@ class repo extends control $this->view->users = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted|noclosed'); $this->view->products = $products; $this->view->projects = $this->loadModel('product')->getProjectPairsByProductIDList(array_keys($products)); - $this->view->relatedProjects = $this->app->tab == 'project' ? array($objectID) : array(); + $this->view->relatedProjects = ($this->app->tab == 'project' or $this->app->tab == 'execution') ? array($objectID) : array(); $this->view->serviceHosts = $this->loadModel('gitlab')->getPairs(); $this->view->objectID = $objectID; @@ -1382,6 +1382,50 @@ class repo extends control return $this->send(array('result' => 'success', 'revision' => $revision)); } + /** + * Import repos. + * + * @param int $server + * @access public + * @return void + */ + public function import($server = 0) + { + if($_POST) + { + $this->repo->batchCreate(); + + if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->repo->createLink('maintain'))); + } + + $gitlabList = $this->loadModel('gitlab')->getList(); + $gitlab = empty($server) ? array_shift($gitlabList) : $this->gitlab->getById($server); + + $repoList = array(); + if(!empty($gitlab)) + { + $repoList = $this->gitlab->apiGetProjects($gitlab->id); + $existRepoList = $this->dao->select('serviceProject,name')->from(TABLE_REPO) + ->where('SCM')->eq(ucfirst($gitlab->type)) + ->andWhere('serviceHost')->eq($gitlab->id) + ->fetchPairs(); + foreach($repoList as $key => $repo) + { + if(isset($existRepoList[$repo->id])) unset($repoList[$key]); + } + } + + $products = $this->loadModel('product')->getPairs('', 0, '', 'all'); + + $this->view->gitlabPairs = $this->gitlab->getPairs(); + $this->view->products = $products; + $this->view->projects = $this->product->getProjectPairsByProductIDList(array_keys($products)); + $this->view->gitlab = $gitlab; + $this->view->repoList = array_values($repoList); + $this->display(); + } + /** * Ajax sync comment. * @@ -1705,12 +1749,19 @@ class repo extends control ->setDefault('projects', array()) ->get(); + $productIds = $postData->products; + if(empty($productIds)) + { + $products = $this->loadModel('product')->getPairs('', 0, '', 'all'); + $productIds = array_keys($products); + } /* Get all projects that can be accessed. */ - $accessProjects = $this->loadModel('product')->getProjectPairsByProductIDList($postData->products); + $accessProjects = $this->loadModel('product')->getProjectPairsByProductIDList($productIds); $selectedProjects = array_intersect(array_keys($accessProjects), $postData->projects); - return print (html::select('projects[]', $accessProjects, $selectedProjects, "class='form-control chosen' multiple")); + $name = isset($postData->number) ? "projects[{$postData->number}][]" : 'projects[]'; + return print (html::select($name, $accessProjects, $selectedProjects, "class='form-control chosen' multiple")); } /** diff --git a/module/repo/css/browse.css b/module/repo/css/browse.css index 9a157205eb..6cdbbf2e4d 100644 --- a/module/repo/css/browse.css +++ b/module/repo/css/browse.css @@ -13,6 +13,7 @@ #dropMenuRepo > div.table-row > div > div > ul > li > div {padding-left: 20px;} #dropMenuRepo > div.table-row > div > div > ul > li > ul {padding-left: 10px;} #repoList .hide-in-search .hidden {display: block !important; visibility: inherit !important;} +#mainMenu .btn-limit {max-width: unset !important;} #branchList {line-height: 25px;} #branchList .hide-in-search, #branchList .tree ul {padding-left: 20px;} diff --git a/module/repo/css/import.css b/module/repo/css/import.css new file mode 100644 index 0000000000..3b68af13d0 --- /dev/null +++ b/module/repo/css/import.css @@ -0,0 +1,8 @@ +#repoList td.form-actions {padding: 7px;} +#repoList td.form-actions a {line-height: 18px;} + +.main-table .table {cursor: default;} +.main-table thead>tr {border-bottom: none; height: 45px;} +.main-table tbody>tr {border-bottom: none; height: 42px;} +.icon-close {cursor: pointer;} +a.btn-active-text {line-height: 19px;} diff --git a/module/repo/js/import.js b/module/repo/js/import.js new file mode 100644 index 0000000000..cb3fa9e895 --- /dev/null +++ b/module/repo/js/import.js @@ -0,0 +1,53 @@ +/** + * Delete the project. + * + * @param object $icon + * @access public + * @return void + */ +function delItem(icon) +{ + $(icon).closest('tr').remove(); + checkItem(); +} + +/** + * Check the project. + * + * @access public + * @return void + */ +function checkItem() +{ + if(!$("#repoList tbody tr").length) $("#submit").prop('disabled', true); +} + +$(function() +{ + checkItem(); + + $(document).on('change', '[id^=product]', function() + { + var i = $(this).attr('id').replace(/[^0-9]/ig, ''); + var projects = $('#projects' + i).val(); + var products = $(this).val(); + $.post(createLink('repo', 'ajaxProjectsOfProducts'), {products, projects, 'number':i}, function(response) + { + $('#projectContainer' + i).html('').append(response); + $('#projects' + i).chosen().trigger("chosen:updated"); + }); + }); + +}); + +/** + * Change server. + * + * @access public + * @return void + */ +function selectServer() +{ + var server = $('#servers').val(); + window.location.href = createLink('repo', 'import', 'server=' + server); +} diff --git a/module/repo/lang/de.php b/module/repo/lang/de.php index 73f4cc4a63..90d9276f33 100644 --- a/module/repo/lang/de.php +++ b/module/repo/lang/de.php @@ -46,6 +46,11 @@ $lang->repo->httpClone = 'Clone with HTTP'; $lang->repo->cloneUrl = 'Clone URL'; $lang->repo->linkTask = 'Link Task'; $lang->repo->unlinkedTasks = 'Unlinked Tasks'; +$lang->repo->importAction = 'Import Repo'; +$lang->repo->import = 'Import'; +$lang->repo->importName = 'Name after import'; +$lang->repo->importServer = 'Please select a server'; +$lang->repo->gitlabList = 'Gitlab Repo'; $lang->repo->submit = 'Submit'; $lang->repo->cancel = 'Cancel'; diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php index 2c2c3b9d26..7d3a299d1b 100644 --- a/module/repo/lang/en.php +++ b/module/repo/lang/en.php @@ -46,6 +46,11 @@ $lang->repo->httpClone = 'Clone with HTTP'; $lang->repo->cloneUrl = 'Clone URL'; $lang->repo->linkTask = 'Link Task'; $lang->repo->unlinkedTasks = 'Unlinked Tasks'; +$lang->repo->importAction = 'Import Repo'; +$lang->repo->import = 'Import'; +$lang->repo->importName = 'Name after import'; +$lang->repo->importServer = 'Please select a server'; +$lang->repo->gitlabList = 'Gitlab Repo'; $lang->repo->submit = 'Submit'; $lang->repo->cancel = 'Cancel'; diff --git a/module/repo/lang/fr.php b/module/repo/lang/fr.php index 3fe607091f..4a1f2a0c11 100644 --- a/module/repo/lang/fr.php +++ b/module/repo/lang/fr.php @@ -46,6 +46,11 @@ $lang->repo->httpClone = 'Clone with HTTP'; $lang->repo->cloneUrl = 'Clone URL'; $lang->repo->linkTask = 'Link Task'; $lang->repo->unlinkedTasks = 'Unlinked Tasks'; +$lang->repo->importAction = 'Import Repo'; +$lang->repo->import = 'Import'; +$lang->repo->importName = 'Name after import'; +$lang->repo->importServer = 'Please select a server'; +$lang->repo->gitlabList = 'Gitlab Repo'; $lang->repo->submit = 'Soumettre'; $lang->repo->cancel = 'Annuler'; diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php index 42654aa451..3f5db6da02 100644 --- a/module/repo/lang/zh-cn.php +++ b/module/repo/lang/zh-cn.php @@ -32,7 +32,7 @@ $lang->repo->blameTmpl = '第 %line 行代码相关信息 $lang->repo->notRelated = '暂时没有关联禅道对象'; $lang->repo->browseAction = '浏览代码库'; -$lang->repo->createAction = '创建代码库'; +$lang->repo->createAction = '添加代码库'; $lang->repo->editAction = '编辑代码库'; $lang->repo->diffAction = '版本对比'; $lang->repo->downloadAction = '下载代码库文件'; @@ -46,6 +46,11 @@ $lang->repo->httpClone = '使用HTTP克隆'; $lang->repo->cloneUrl = '克隆地址'; $lang->repo->linkTask = '关联任务'; $lang->repo->unlinkedTasks = '未关联任务'; +$lang->repo->importAction = '导入代码库'; +$lang->repo->import = '导入'; +$lang->repo->importName = '导入后的名称'; +$lang->repo->importServer = '请选择服务器'; +$lang->repo->gitlabList = 'Gitlab代码库'; $lang->repo->submit = '提交'; $lang->repo->cancel = '取消'; diff --git a/module/repo/model.php b/module/repo/model.php index 1495a87fd5..dc05448961 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -120,6 +120,16 @@ class repoModel extends model ->page($pager) ->fetchAll('id'); + if($getCodePath) + { + $gitlabRepos = array(); + foreach($repos as $repo) + { + if($repo->SCM == 'Gitlab') $gitlabRepos[$repo->id] = $repo; + } + $this->loadModel('gitlab')->apiMultiGetProjects($gitlabRepos); + } + /* Get products. */ $productIdList = $this->loadModel('product')->getProductIDByProject($projectID, false); foreach($repos as $i => $repo) @@ -244,6 +254,67 @@ class repoModel extends model return $repoID; } + /** + * Batch create repos. + * + * @access public + * @return bool + */ + public function batchCreate() + { + $repos = fixer::input('post')->get(); + + $dataAry = array(); + foreach($repos as $key => $val) + { + if(strpos($key, 'serviceProject') === 0) + { + $i = substr($key, 14); + if(empty($repos->{'product' . $i})) dao::$errors['product' . $i][] = sprintf($this->lang->error->notempty, $this->lang->repo->product); + if(empty($repos->{'name' . $i})) dao::$errors['name' . $i][] = sprintf($this->lang->error->notempty, $this->lang->repo->name); + + if(!empty($repos->{'product' . $i}) and !empty($repos->{'name' . $i})) $dataAry[] = array('serviceProject' => $repos->{'serviceProject' . $i}, 'product' => implode(',', $repos->{'product' . $i}), 'name' => $repos->{'name' . $i}, 'projects' => empty($repos->projects[$i]) ? '' : implode(',', $repos->projects[$i])); + } + } + if(dao::isError()) return false; + + foreach($dataAry as $data) + { + $repo = new stdclass(); + $repo->serviceHost = $repos->serviceHost; + $repo->serviceProject = $data['serviceProject']; + $repo->product = $data['product']; + $repo->name = $data['name']; + $repo->projects = $data['projects']; + $repo->SCM = 'Gitlab'; + $repo->encoding = 'utf-8'; + $repo->encrypt = 'base64'; + + $this->dao->insert(TABLE_REPO)->data($repo) + ->batchCheck($this->config->repo->create->requiredFields, 'notempty') + ->check('serviceHost,serviceProject', 'notempty') + ->check('name', 'unique', "`SCM` = '{$repo->SCM}'") + ->check('serviceProject', 'unique', "`SCM` = '{$repo->SCM}' and `serviceHost` = '{$repo->serviceHost}'") + ->autoCheck() + ->exec(); + + if(dao::isError()) return false; + + $repoID = $this->dao->lastInsertID(); + + if($repo->SCM == 'Gitlab') + { + /* Add webhook. */ + $repo = $this->getRepoByID($repoID); + $this->loadModel('gitlab')->addPushWebhook($repo); + } + + $actionID = $this->loadModel('action')->create('repo', $repoID, 'created'); + } + + return true; + } + /** * Update a repo. * diff --git a/module/repo/view/import.html.php b/module/repo/view/import.html.php new file mode 100644 index 0000000000..cc1fe06a60 --- /dev/null +++ b/module/repo/view/import.html.php @@ -0,0 +1,65 @@ + + * @package repo + * @version $Id$ + * @link http://www.zentao.net + */ +?> + + +
+ + id);?> + + + + + + + + + + + + $repo): ?> + + + + + + + + + + + + + + +
repo->gitlabList;?>repo->importName;?>repo->product;?>repo->projects;?>
+ id);?> + name_with_namespace;?> + + name, "class='form-control'");?> +
+ repo->import); ?> + + app->tab == 'devops') echo html::a(inlink('maintain', ""), $lang->goback, '', 'class="btn btn-wide"');?> + +
+ +
+ diff --git a/module/repo/view/maintain.html.php b/module/repo/view/maintain.html.php index 0351fe1171..c22c59515e 100644 --- a/module/repo/view/maintain.html.php +++ b/module/repo/view/maintain.html.php @@ -16,7 +16,8 @@ createLink('repo', 'maintain'), "{$lang->repo->maintain}", '', "class='btn btn-link btn-active-text'");?>
- " . $this->lang->repo->create, '', "class='btn btn-primary'");?> + " . $this->lang->repo->importAction, '', "class='btn btn-link'");?> + " . $this->lang->repo->createAction, '', "class='btn btn-primary'");?>
diff --git a/module/sonarqube/css/create.css b/module/sonarqube/css/create.css index 22cf991723..bf9498be54 100644 --- a/module/sonarqube/css/create.css +++ b/module/sonarqube/css/create.css @@ -1,2 +1,4 @@ .table-form .c-name {width: 130px;} .table-form .c-input {width: 650px;} +.main-content>.center-block {max-width: 900px;} +#sonarqubeForm table {width: 700px;} diff --git a/module/sonarqube/view/create.html.php b/module/sonarqube/view/create.html.php index 2aa74e49d2..35988a653b 100644 --- a/module/sonarqube/view/create.html.php +++ b/module/sonarqube/view/create.html.php @@ -22,7 +22,6 @@
sonarqube->name;?> sonarqube->placeholder->name}'");?>
sonarqube->url;?>
zanode->common;?>node) ? $automation->node : '', "class='form-control picker-select'");?>node) ? $automation->node : '', "class='form-control picker-select'");?> + createLink('zanode', 'create'), $lang->zanode->create, '', "class='text-primary' target='_blank'");?> + ", '', "class='btn btn-icon refresh' data-toggle='tooltip' title='{$lang->refresh}' onclick='loadNodes()'");?> +
zanode->scriptPath;?> scriptPath) ? $automation->scriptPath : '', "class='form-control'");?>scriptPath) ? $automation->scriptPath : '', "class='form-control' placeholder='{$lang->zanode->scriptTips}'");?> -
$lang->zanode->syncToZentao), '');?>
zanode->shell;?> shell) ? $automation->shell : '', "rows='6' class='form-control'");?>shell) ? $automation->shell : '', "rows='6' class='form-control' placeholder='{$lang->zanode->shellTips}'");?> -
idAB); ?> zanode->name); ?>zahost->type); ?> zanode->extranet); ?> zanode->cpuCores); ?> zanode->memory); ?>
id; ?> inlink('view', "id=$node->id"), $node->name, '', ""); ?>hostType == 'physics' ? $this->lang->zanode->typeList['physics'] : $this->lang->zanode->typeList['node']; ?> extranet; ?> zanode->os->cpuCores, $node->cpuCores); ?> memory . $this->lang->zahost->unitList['GB']; ?> zanode->suspend}' target='hiddenwin'"; - $suspendAttr .= $node->type == 'physics' || $node->status != 'running' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmSuspend}\")==false) return false;'"; + $suspendAttr .= $node->hostType == 'physics' || $node->status != 'running' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmSuspend}\")==false) return false;'"; $resumeAttr = "title='{$lang->zanode->resume}' target='hiddenwin'"; - $resumeAttr .= $node->type == 'physics' || $node->status == 'running' || $node->status == 'wait' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmResume}\")==false) return false;'"; + $resumeAttr .= $node->hostType == 'physics' || $node->status == 'running' || $node->status == 'wait' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmResume}\")==false) return false;'"; $rebootAttr = "title='{$lang->zanode->reboot}' target='hiddenwin'"; - $rebootAttr .= $node->type == 'physics' || $node->status == 'shutoff' || $node->status == 'wait' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmReboot}\")==false) return false;'"; + $rebootAttr .= $node->hostType == 'physics' || in_array($node->status, array('wait', 'creating_img', 'creating_snap', 'restoring', 'shutoff')) ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmReboot}\")==false) return false;'"; $closeAttr = "title='{$lang->zanode->shutdown}'"; - $closeAttr .= $node->type == 'physics' || $node->status == 'wait' ? ' class="btn disabled"' : ' class="btn iframe"'; + $closeAttr .= $node->hostType == 'physics' || in_array($node->status, array('wait', 'creating_img', 'creating_snap', 'restoring')) ? ' class="btn disabled"' : ' class="btn iframe"'; $startAttr = "title='{$lang->zanode->boot}'"; - $startAttr .= $node->type == 'physics' || $node->status == 'wait' ? ' class="btn disabled"' : ' class="btn iframe"'; + $startAttr .= $node->hostType == 'physics' || in_array($node->status, array('wait', 'creating_img', 'creating_snap', 'restoring')) ? ' class="btn disabled"' : ' class="btn iframe"'; $snapshotAttr = "title='{$lang->zanode->createSnapshot}'"; - $snapshotAttr .= $node->type == 'physics' || $node->status != 'running' ? ' class="btn disabled"' : ' class="btn iframe"'; + $snapshotAttr .= $node->hostType == 'physics' || $node->status != 'running' ? ' class="btn disabled"' : ' class="btn iframe"'; - $imageAttr = $node->status != 'running' ? ' class="btn btn-action iframe createImage disabled"' : ' class="btn btn-action iframe createImage"'; + $imageAttr = $node->hostType == 'physics' || $node->status != 'running' && $node->status != 'creating_img' ? ' class="btn btn-action iframe createImage disabled"' : ' class="btn btn-action iframe createImage"'; - common::printLink('zanode', 'getVNC', "id={$node->id}", " ", (in_array($node->status ,array('running', 'launch', 'wait')) ? '_blank' : ''), "title='{$lang->zanode->getVNC}' class='btn desktop " . (in_array($node->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", ''); + common::printLink('zanode', 'getVNC', "id={$node->id}", " ", (in_array($node->status ,array('running', 'launch', 'wait')) ? '_blank' : ''), "title='{$lang->zanode->getVNC}' class='btn desktop " . ($node->hostType == '' && in_array($node->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", ''); if($node->status == "suspend") { common::printLink('zanode', 'resume', "zanodeID={$node->id}", " ", '', $resumeAttr); @@ -119,7 +119,7 @@ } common::printLink('zanode', 'reboot', "zanodeID={$node->id}", " ", '', $rebootAttr); - common::printLink('zanode', 'createSnapshot', "zanodeID={$node->id}", " ", '', $snapshotAttr, true, true); + common::printLink('zanode', 'createSnapshot', "zanodeID={$node->id}", " ", '', $snapshotAttr, true, true); if(common::hasPriv('zanode', 'createImage') or common::hasPriv('zanode', 'destroy')) { diff --git a/module/zanode/view/create.html.php b/module/zanode/view/create.html.php index 19f1a570df..67829d80d7 100644 --- a/module/zanode/view/create.html.php +++ b/module/zanode/view/create.html.php @@ -13,6 +13,8 @@ getModuleRoot() . 'common/view/kindeditor.html.php';?> +zanode->linuxList);?> +zanode->windowsList);?>
@@ -22,15 +24,15 @@
- + - + - - + + @@ -71,8 +73,10 @@ diff --git a/module/zanode/view/edit.html.php b/module/zanode/view/edit.html.php index e733b205a0..603cc39b6a 100644 --- a/module/zanode/view/edit.html.php +++ b/module/zanode/view/edit.html.php @@ -21,7 +21,7 @@
zahost->type;?>zanode->typeList, 'virtual', "class='form-control chosen' onchange='zahostType()'")?>zanode->typeList, 'virtual', "class='form-control chosen' onchange='zanodeType()'")?>
zanode->hostName;?>createLink('zahost', 'create', array(), '', true), $lang->zahost->create, '', "class='text-primary iframe'");?>
zanode->name;?>
zanode->osName;?> - - + +
- type == 'node'):?> + hostType != 'physics'):?> @@ -29,17 +29,17 @@ - + - type == 'node'):?> + hostType != 'physics'):?> - + @@ -69,7 +69,7 @@ - + diff --git a/module/zanode/view/view.html.php b/module/zanode/view/view.html.php index 9a9c9ad15c..57e56571cb 100644 --- a/module/zanode/view/view.html.php +++ b/module/zanode/view/view.html.php @@ -21,11 +21,13 @@ id) ?> zanode); ?> status); ?> +hostType); ?> -session->zanodeList ? $this->session->zanodeList : $this->createLink('zanode', 'browse', ""); ?> +session->zanodeList ? $this->session->zanodeList : $this->createLink('zanode', 'browse', "");?> id}&orderBy=%s"; $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccount : $config->zanode->defaultAccount; +$ssh = $zanode->hostType == 'physics' ? ('ssh ' . $zanode->extranet) : ($zanode->ssh ? 'ssh ' . $account . '@' . $zanode->ip . ' -p ' . $zanode->ssh : ''); ?>
zanode->hostName;?> name, "class='form-control' readonly='readonly'");?>
zanode->name;?>name, "class='form-control' placeholder=\"{$lang->zanode->nameValid}\" readonly='readonly'");?>name, "class='form-control' placeholder=\"{$lang->zanode->nameValid}\" " . ($zanode->hostType != 'physics' ? "readonly='readonly'" : ''));?>
zanode->image;?> name, "class='form-control' readonly='readonly'");?>
zahost->IP;?>zanode->IP;?> extranet, "class='form-control' readonly='readonly'");?>
zanode->osName;?>osName, "class='form-control' readonly='readonly'")?>hostType != 'physics' ? $zanode->osName : zget($config->zanode->linuxList, $zanode->osName, zget($config->zanode->windowsList, $zanode->osName)), "class='form-control' readonly='readonly'")?>
zanode->desc ?>