diff --git a/front/assets/js/common/api/services/mci_api.js b/front/assets/js/common/api/services/mci_api.js index b3e7a4e1..42006c25 100644 --- a/front/assets/js/common/api/services/mci_api.js +++ b/front/assets/js/common/api/services/mci_api.js @@ -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, @@ -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, @@ -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, } diff --git a/front/assets/js/pages/operation/manage/mci.js b/front/assets/js/pages/operation/manage/mci.js index 3ee20129..ff1cf7e2 100644 --- a/front/assets/js/pages/operation/manage/mci.js +++ b/front/assets/js/pages/operation/manage/mci.js @@ -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 @@ -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) @@ -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 @@ -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; @@ -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 @@ -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 @@ -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; @@ -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 @@ -2607,7 +2607,7 @@ function transformPolicyResponse(resp) { actionType = '', placementAlgo = '', postCommand = {}, - vmDynamicReq = {} + nodeGroupDynamicReq = {} } = autoAction; const { @@ -2621,8 +2621,8 @@ function transformPolicyResponse(resp) { description: vmDescription = '', label = {}, name: vmName = '', - subGroupSize = '' - } = vmDynamicReq; + nodeGroupSize: subGroupSize = '' + } = nodeGroupDynamicReq; // API 응답에 없는 필드들은 기본값으로 설정 const connectionName = ''; @@ -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, @@ -3032,7 +3032,7 @@ function buildPolicyRequestData(data) { name: data.name, rootDiskSize: data.rootDiskSize, rootDiskType: data.rootDiskType, - subGroupSize: data.subGroupSize, + nodeGroupSize: data.subGroupSize, vmUserPassword: "" } },