Add Subnet handing id generated by CSP to vNet info

cloud-barista · May 22, 2024 · c941b8e · c941b8e
2 parents ca7f202 + 31920b7
commit c941b8e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/src/api/rest/docs/docs.go b/src/api/rest/docs/docs.go
@@ -10139,6 +10139,9 @@ const docTemplate = `{
                 "id": {
                     "type": "string"
                 },
+                "idFromCsp": {
+                    "type": "string"
+                },
                 "ipv4_CIDR": {
                     "type": "string"
                 },
@@ -10163,6 +10166,9 @@ const docTemplate = `{
                 "description": {
                     "type": "string"
                 },
+                "idFromCsp": {
+                    "type": "string"
+                },
                 "ipv4_CIDR": {
                     "type": "string"
                 },

diff --git a/src/api/rest/docs/swagger.json b/src/api/rest/docs/swagger.json
@@ -10132,6 +10132,9 @@
                 "id": {
                     "type": "string"
                 },
+                "idFromCsp": {
+                    "type": "string"
+                },
                 "ipv4_CIDR": {
                     "type": "string"
                 },
@@ -10156,6 +10159,9 @@
                 "description": {
                     "type": "string"
                 },
+                "idFromCsp": {
+                    "type": "string"
+                },
                 "ipv4_CIDR": {
                     "type": "string"
                 },

diff --git a/src/api/rest/docs/swagger.yaml b/src/api/rest/docs/swagger.yaml
@@ -1051,6 +1051,8 @@ definitions:
         type: string
       id:
         type: string
+      idFromCsp:
+        type: string
       ipv4_CIDR:
         type: string
       keyValueList:
@@ -1067,6 +1069,8 @@ definitions:
     properties:
       description:
         type: string
+      idFromCsp:
+        type: string
       ipv4_CIDR:
         type: string
       keyValueList:

diff --git a/src/core/mcir/subnet.go b/src/core/mcir/subnet.go
@@ -156,6 +156,7 @@ func CreateSubnet(nsId string, vNetId string, req TbSubnetReq, objectOnly bool)
 	}
 	tbSubnetInfo.Id = req.Name
 	tbSubnetInfo.Name = req.Name
+	tbSubnetInfo.IdFromCsp = req.IdFromCsp
 
 	newVNet.SubnetInfoList = append(newVNet.SubnetInfoList, tbSubnetInfo)
 	Val, _ = json.Marshal(newVNet)

diff --git a/src/core/mcir/vnet.go b/src/core/mcir/vnet.go
@@ -116,6 +116,7 @@ type TbVNetInfo struct { // Tumblebug
 // TbSubnetReq is a struct that represents TB subnet object.
 type TbSubnetReq struct { // Tumblebug
 	Name         string `validate:"required"`
+	IdFromCsp    string
 	IPv4_CIDR    string `validate:"required"`
 	KeyValueList []common.KeyValue
 	Description  string
@@ -137,6 +138,7 @@ func TbSubnetReqStructLevelValidation(sl validator.StructLevel) {
 type TbSubnetInfo struct { // Tumblebug
 	Id           string
 	Name         string `validate:"required"`
+	IdFromCsp    string
 	IPv4_CIDR    string `validate:"required"`
 	BastionNodes []BastionNode
 	KeyValueList []common.KeyValue
@@ -274,6 +276,7 @@ func CreateVNet(nsId string, u *TbVNetReq, option string) (TbVNetInfo, error) {
 			log.Error().Err(err).Msg("")
 		}
 		tbSubnetReq.Name = v.IId.NameId
+		tbSubnetReq.IdFromCsp = v.IId.SystemId
 
 		_, err = CreateSubnet(nsId, content.Id, tbSubnetReq, true)
 		if err != nil {