From 7610b3d80cf27109c362c1a4bc163da333e115f5 Mon Sep 17 00:00:00 2001
From: innodreamer <innodreamer@gmail.com>
Date: Fri, 20 Sep 2024 17:02:17 +0900
Subject: [PATCH] Add Requested Zone info to Subnet Info

---
 .../drivers/ncp/resources/VPCHandler.go       | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/cloud-control-manager/cloud-driver/drivers/ncp/resources/VPCHandler.go b/cloud-control-manager/cloud-driver/drivers/ncp/resources/VPCHandler.go
index bb339a134..cc05a79a5 100644
--- a/cloud-control-manager/cloud-driver/drivers/ncp/resources/VPCHandler.go
+++ b/cloud-control-manager/cloud-driver/drivers/ncp/resources/VPCHandler.go
@@ -42,16 +42,17 @@ func init() {
 }
 
 type VPC struct {
-    IID			IId     	`json:"IId"`
-    Cidr		string  	`json:"IPv4_CIDR"`
-    Subnet_List []Subnet 	`json:"SubnetInfoList"`
-    KeyValue_List []KeyValue  `json:"KeyValueList"`
+    IID				IId     	`json:"IId"`
+    Cidr			string  	`json:"IPv4_CIDR"`
+    Subnet_List 	[]Subnet 	`json:"SubnetInfoList"`
+    KeyValue_List 	[]KeyValue  `json:"KeyValueList"`
 }
 
 type Subnet struct {
-    IID			IId     `json:"IId"`
-    Cidr		string	`json:"IPv4_CIDR"`
-    KeyValue_List []KeyValue `json:"KeyValueList"`
+    IID				IId     `json:"IId"`
+	Zone        	string     `json:"Zone"`
+    Cidr			string	`json:"IPv4_CIDR"`
+    KeyValue_List 	[]KeyValue `json:"KeyValueList"`
 }
 
 type KeyValue struct {
@@ -326,12 +327,13 @@ func (VPCHandler *NcpVPCHandler) CreateSubnet(subnetReqInfo irs.SubnetInfo) (irs
 
 	newSubnetInfo := irs.SubnetInfo{
 		IId: irs.IID{
-			NameId: subnetReqInfo.IId.NameId,
+			NameId: 	subnetReqInfo.IId.NameId,
 			// Note!! : subnetReqInfo.IId.NameId -> SystemId
-			SystemId: subnetReqInfo.IId.NameId,
+			SystemId: 	subnetReqInfo.IId.NameId,
 		},
-		IPv4_CIDR: subnetReqInfo.IPv4_CIDR,
-		KeyValueList: []irs.KeyValue{
+		Zone: 			subnetReqInfo.Zone,
+		IPv4_CIDR: 		subnetReqInfo.IPv4_CIDR,
+		KeyValueList: 	[]irs.KeyValue{
 			{Key: "NCP-Subnet-info.", Value: "This Subnet info. is temporary."},
 		},
 	}
@@ -351,6 +353,7 @@ func (VPCHandler *NcpVPCHandler) MappingVPCInfo(vpcJSON VPC) (irs.VPCInfo, error
 	for i := 0; i < len(vpcJSON.Subnet_List); i++ {
 		subnetInfo.IId.NameId = 	vpcJSON.Subnet_List[i].IID.NameID
 		subnetInfo.IId.SystemId = 	vpcJSON.Subnet_List[i].IID.SystemID
+		subnetInfo.Zone = 			vpcJSON.Subnet_List[i].Zone
 		subnetInfo.IPv4_CIDR = 		vpcJSON.Subnet_List[i].Cidr
 
 		for j := 0; j < len(vpcJSON.Subnet_List[i].KeyValue_List); j++ {
@@ -369,7 +372,7 @@ func (VPCHandler *NcpVPCHandler) MappingVPCInfo(vpcJSON VPC) (irs.VPCInfo, error
     }
 
 	vpcInfo := irs.VPCInfo{
-		//VPC 정보는 CB에서 파일로 관리되므로 SystemId는 NameId와 동일하게
+		// Since the VPC information is managed as a file, the systemID is the same as the nameID.
 		IId:        	irs.IID{NameId: vpcJSON.IID.NameID, SystemId: vpcJSON.IID.NameID},
 		IPv4_CIDR: 		vpcJSON.Cidr,
 		SubnetInfoList: subnetInfoList,