Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust execution node browse.

Browse Source
This commit is contained in:
liyuchun
2022-09-21 13:47:19 +08:00
parent 2616fc1038
commit 77ea27d40f
7 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/executionnode/model.php
+7 -5
View File
@@ -87,7 +87,7 @@ class executionnodemodel extends model
dao::$errors[] = $this->lang->executionnode->notFoundAgent;
return false;
}
if($result->code != 200)
if($result->code != 1)
{
dao::$errors[] = $this->lang->executionnode->createVmFail;
return false;
@@ -97,7 +97,7 @@ class executionnodemodel extends model
$data->templateID = $data->templateID;
$data->hostID = $host->id;
$data->macAddress = $macAddress;
$data->status = static::STATUS_RUNNING;
$data->status = static::STATUS_LAUNCH;
$data->createdBy = $this->app->user->account;
$data->createdDate = helper::now();
$data->osCategory = $vmTemplate->osCategory;
@@ -138,7 +138,7 @@ class executionnodemodel extends model
$data = json_decode($result, true);
if(empty($data)) return $this->lang->executionnode->notFoundAgent;
if($data['code'] != 200) return $data['message'];
if($data['code'] != 1) return zget($this->lang->executionnode->apiError, $data['code'], $data['msg']);
if($type != 'reboot')
{
@@ -173,7 +173,7 @@ class executionnodemodel extends model
$data = json_decode($result, true);
if(empty($data)) return $this->lang->executionnode->notFoundAgent;
if($data['code'] != 200) return $data['message'];
if($data['code'] != 1) return zget($this->lang->executionnode->apiError, $data['code'], $data['msg']);
}
/* delete execution node. */
@@ -299,6 +299,8 @@ class executionnodemodel extends model
$query = str_replace('`osVersion`', 't4.`osVersion`', $query);
}
$orderBy = str_replace('osVersion', 't4.osVersion', $orderBy);
return $this->dao->select('t1.*, t3.name as hostName, t2.publicIP as hostIP,t4.osVersion')->from(TABLE_VM)->alias('t1')
->leftJoin(TABLE_ZAHOST)->alias('t2')->on('t1.hostID = t2.id')
->leftJoin(TABLE_ASSET)->alias('t3')->on('t3.id = t2.assetID')
@@ -510,7 +512,7 @@ class executionnodemodel extends model
$agnetUrl = 'http://' . $host->publicIP . ':' . $host->agentPort . static::KVM_TOKEN_PATH;
$result = json_decode(commonModel::http("$agnetUrl?port={$vm->vncPort}"));
if(empty($result) or $result->code != 200) return false;
if(empty($result) or $result->code != 1) return false;
$returnData = new stdClass();
$returnData->hostIP = $host->publicIP;