Skip to content

fix: mci Server Info 표시 오류 및 nodeGroupSize 필드명 오류 수정 #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MZC-CSC merged 5 commits into from
Jul 6, 2026
Merged

fix: mci Server Info 표시 오류 및 nodeGroupSize 필드명 오류 수정 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b9af3d4
fix(mci): VM Server Info 항목 표시 오류 수정
yh-noh Jun 26, 2026
df8657d
Merge branch 'm-cmp:develop' into develop
MZC-CSC Jul 1, 2026
d20be4d
Merge pull request #210 from MZC-CSC/fix-web-vm-serverinfo
MZC-CSC Jul 1, 2026
23d4408
fix(mci): nodeGroupSize 필드명 오류로 VM 대수 지정 무시되는 문제 수정
yh-noh Jul 6, 2026
78ea34c
Merge pull request #211 from MZC-CSC/fix-web-nodegroupsize-mismatch
MZC-CSC Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions front/assets/js/common/api/services/mci_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ export async function mciDynamicReview(mciName, mciDesc, Express_Server_Config_A
specId: config.commonSpec,
imageId: config.commonImage,
name: config.name,
subGroupSize: parseInt(config.subGroupSize) || 1,
nodeGroupSize: parseInt(config.subGroupSize) || 1,
connectionName: config.connectionName,
description: config.description,
rootDiskSize: (config.rootDiskSize !== "" && config.rootDiskSize !== undefined) ? parseInt(config.rootDiskSize) : 0,
Expand Down Expand Up @@ -274,7 +274,7 @@ export async function mciDynamic(mciName, mciDesc, Express_Server_Config_Arr, ns
specId: config.commonSpec,
imageId: config.commonImage,
name: config.name,
subGroupSize: parseInt(config.subGroupSize) || 1,
nodeGroupSize: parseInt(config.subGroupSize) || 1,
connectionName: config.connectionName,
description: config.description,
rootDiskSize: (config.rootDiskSize !== "" && config.rootDiskSize !== undefined) ? parseInt(config.rootDiskSize) : 0,
Expand Down Expand Up @@ -332,7 +332,7 @@ export async function vmDynamic(mciId, nsId, Express_Server_Config_Arr) {
"description": obj.description,
// "label": "",
"name": obj.name,
"subGroupSize": parseInt(obj.subGroupSize) || 1,
"nodeGroupSize": parseInt(obj.subGroupSize) || 1,
"rootDiskSize": (obj.rootDiskSize !== "" && obj.rootDiskSize !== undefined) ? parseInt(obj.rootDiskSize) : 0,
"rootDiskType": obj.rootDiskType,
}
Expand Down
46 changes: 23 additions & 23 deletions front/assets/js/pages/operation/manage/mci.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,8 +1100,8 @@ export async function vmDetailInfo(vmId) {
var operatingSystem = "Ubuntu";

// Architecture 정보만 추출
var architecture = ""
if (data.addtionalDetails && Array.isArray(data.addtionalDetails)) {
var architecture = data.image?.osType || data.image?.osArchitecture || ""
if (!architecture && data.addtionalDetails && Array.isArray(data.addtionalDetails)) {
var archDetail = data.addtionalDetails.find(detail => detail.key === "Architecture")
if (archDetail) {
architecture = archDetail.value
Expand Down Expand Up @@ -1137,8 +1137,8 @@ export async function vmDetailInfo(vmId) {
$("#server_info_csp").text(providerName)

// Row 2: Region, Zone, Config Name
var region = data.region.Region
var zone = data.region.Zone
var region = data.region?.region ?? data.region?.Region ?? ''
var zone = data.region?.zone ?? data.region?.Zone ?? ''
var connectionName = data.connectionName
$("#server_info_region").text(region)
$("#server_info_zone").text(zone)
Expand Down Expand Up @@ -1177,11 +1177,11 @@ export async function vmDetailInfo(vmId) {
// $("#server_detail_view_private_ip").text(data.privateIP)
$("#server_detail_view_image_id").text(imageId)
$("#server_detail_view_os").text(operatingSystem);
$("#server_detail_view_user_id_pass").text(data.vmUserAccount + "/ *** ")
$("#server_detail_view_user_id_pass").text(data.nodeUserName ? data.nodeUserName + ' / ***' : (data.vmUserAccount ? data.vmUserAccount + ' / ***' : '-'))

var region = data.region.Region
var region = data.region?.region ?? data.region?.Region ?? ''

var zone = data.region.Zone
var zone = data.region?.zone ?? data.region?.Zone ?? ''

// connection tab
var connectionName = data.connectionName
Expand Down Expand Up @@ -1212,11 +1212,11 @@ export async function vmDetailInfo(vmId) {
var vmDetail = data.cspViewVmDetail;
// var vmDetailKeyValueList = vmDetail.KeyValueList
var addtionalDetails = data.addtionalDetails
var architecture = "";
var architecture = data.image?.osType || data.image?.osArchitecture || "";
var vpcId = ""
var subnetId = ""

if (addtionalDetails) {
if (!architecture && addtionalDetails) {
for (var i = 0; i < addtionalDetails.length; i++) {
if (addtionalDetails[i].key === "Architecture") {
architecture = addtionalDetails[i].value;
Expand All @@ -1239,9 +1239,9 @@ export async function vmDetailInfo(vmId) {
$("#server_detail_view_subnet_id").text(subnetId + "(" + subnetSystemId + ")")
$("#server_detail_view_eth").text(eth)
$("#server_detail_view_root_device_type").text(data.rootDiskType);
$("#server_detail_view_root_device").text(data.rootDeviceName);
$("#server_detail_view_root_device").text(data.RootDeviceName ?? data.rootDeviceName ?? '');
$("#server_detail_view_keypair_name").text(data.sshKeyId)
$("#server_detail_view_access_id_pass").text(data.vmUserName + "/ *** ")
$("#server_detail_view_access_id_pass").text(data.vmUserName ? data.vmUserName + ' / ***' : '-')


// server spec
Expand Down Expand Up @@ -1391,11 +1391,11 @@ export async function subGroup_vmDetailInfo(vmId) {
// $("#server_detail_view_private_ip").text(data.privateIP)
$("#subgroup_server_detail_view_image_id").text(imageId)
$("#subgroup_server_detail_view_os").text(operatingSystem);
$("#subgroup_server_detail_view_user_id_pass").text(data.vmUserAccount + "/ *** ")
$("#subgroup_server_detail_view_user_id_pass").text(data.nodeUserName ? data.nodeUserName + ' / ***' : (data.vmUserAccount ? data.vmUserAccount + ' / ***' : '-'))

var region = data.region.Region
var region = data.region?.region ?? data.region?.Region ?? ''

var zone = data.region.Zone
var zone = data.region?.zone ?? data.region?.Zone ?? ''

// connection tab
var connectionName = data.connectionName
Expand Down Expand Up @@ -1426,11 +1426,11 @@ export async function subGroup_vmDetailInfo(vmId) {
var vmDetail = data.cspViewVmDetail;
// var vmDetailKeyValueList = vmDetail.KeyValueList
var addtionalDetails = data.addtionalDetails
var architecture = "";
var architecture = data.image?.osType || data.image?.osArchitecture || "";
var vpcId = ""
var subnetId = ""

if (addtionalDetails) {
if (!architecture && addtionalDetails) {
for (var i = 0; i < addtionalDetails.length; i++) {
if (addtionalDetails[i].key === "Architecture") {
architecture = addtionalDetails[i].value;
Expand All @@ -1453,9 +1453,9 @@ export async function subGroup_vmDetailInfo(vmId) {
$("#subgroup_server_detail_view_subnet_id").text(subnetId + "(" + subnetSystemId + ")")
$("#subgroup_server_detail_view_eth").text(eth)
$("#subgroup_server_detail_view_root_device_type").text(data.rootDiskType);
$("#subgroup_server_detail_view_root_device").text(data.rootDeviceName);
$("#subgroup_server_detail_view_root_device").text(data.RootDeviceName ?? data.rootDeviceName ?? '');
$("#subgroup_server_detail_view_keypair_name").text(data.sshKeyId)
$("#subgroup_server_detail_view_access_id_pass").text(data.vmUserName + "/ *** ")
$("#subgroup_server_detail_view_access_id_pass").text(data.vmUserName ? data.vmUserName + ' / ***' : '-')


// server spec
Expand Down Expand Up @@ -2607,7 +2607,7 @@ function transformPolicyResponse(resp) {
actionType = '',
placementAlgo = '',
postCommand = {},
vmDynamicReq = {}
nodeGroupDynamicReq = {}
} = autoAction;

const {
Expand All @@ -2621,8 +2621,8 @@ function transformPolicyResponse(resp) {
description: vmDescription = '',
label = {},
name: vmName = '',
subGroupSize = ''
} = vmDynamicReq;
nodeGroupSize: subGroupSize = ''
} = nodeGroupDynamicReq;

// API 응답에 없는 필드들은 기본값으로 설정
const connectionName = '';
Expand Down Expand Up @@ -3020,7 +3020,7 @@ function buildPolicyRequestData(data) {
command: data.command ? [data.command] : [],
userName: data.userName
},
subGroupDynamicReq: {
nodeGroupDynamicReq: {
imageId: data.commonImage,
specId: data.commonSpec,
connectionName: data.connectionName,
Expand All @@ -3032,7 +3032,7 @@ function buildPolicyRequestData(data) {
name: data.name,
rootDiskSize: data.rootDiskSize,
rootDiskType: data.rootDiskType,
subGroupSize: data.subGroupSize,
nodeGroupSize: data.subGroupSize,
vmUserPassword: ""
}
},
Expand Down
Loading