Influencing cb-spider resource objects with namespace (#909)

* Go mod tidy * Use NS prefix for CSP vnet Name * Use NS prefix for CSP SSHKEY Name * Use NS prefix for CSP SG Name * Use NS prefix for CSP name del Res * Fix GetCspResourceId return value
cloud-barista · Nov 2, 2021 · e44f883 · e44f883
1 parent 93f4f7d
commit e44f883
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 494 deletions.
diff --git a/go.mod b/go.mod
@@ -15,8 +15,6 @@ require (
 	github.com/cloud-barista/cb-log v0.4.0
 	github.com/cloud-barista/cb-spider v0.4.13
 	github.com/cloud-barista/cb-store v0.4.1
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/go-playground/validator/v10 v10.9.0
 	github.com/go-resty/resty/v2 v2.6.0
 	github.com/go-sql-driver/mysql v1.6.0
@@ -26,7 +24,6 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/labstack/echo/v4 v4.6.1
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/prometheus/client_golang v1.11.0

diff --git a/go.sum b/go.sum
diff --git a/src/core/common/utility.go b/src/core/common/utility.go
@@ -209,15 +209,15 @@ func GetCspResourceId(nsId string, resourceType string, resourceId string) (stri
 	case StrSSHKey:
 		content := mcirIds{}
 		json.Unmarshal([]byte(keyValue.Value), &content)
-		return resourceId, nil
+		return content.CspSshKeyName, nil
 	case StrSpec:
 		content := mcirIds{}
 		json.Unmarshal([]byte(keyValue.Value), &content)
 		return content.CspSpecName, nil
 	case StrVNet:
 		content := mcirIds{}
 		json.Unmarshal([]byte(keyValue.Value), &content)
-		return resourceId, nil // contains CspSubnetId
+		return content.CspVNetName, nil // contains CspSubnetId
 	// case "subnet":
 	// 	content := subnetInfo{}
 	// 	json.Unmarshal([]byte(keyValue.Value), &content)

diff --git a/src/core/mcir/common.go b/src/core/mcir/common.go
@@ -210,7 +210,7 @@ func DelResource(nsId string, resourceType string, resourceId string, forceFlag
 				return err
 			}
 			tempReq.ConnectionName = temp.ConnectionName
-			url = common.SpiderRestUrl + "/keypair/" + temp.Name
+			url = common.SpiderRestUrl + "/keypair/" + temp.CspSshKeyName
 		case common.StrVNet:
 			temp := TbVNetInfo{}
 			err = json.Unmarshal([]byte(keyValue.Value), &temp)
@@ -219,7 +219,7 @@ func DelResource(nsId string, resourceType string, resourceId string, forceFlag
 				return err
 			}
 			tempReq.ConnectionName = temp.ConnectionName
-			url = common.SpiderRestUrl + "/vpc/" + temp.Name
+			url = common.SpiderRestUrl + "/vpc/" + temp.CspVNetName
 			childResources = temp.SubnetInfoList
 		case common.StrSecurityGroup:
 			temp := TbSecurityGroupInfo{}
@@ -229,7 +229,7 @@ func DelResource(nsId string, resourceType string, resourceId string, forceFlag
 				return err
 			}
 			tempReq.ConnectionName = temp.ConnectionName
-			url = common.SpiderRestUrl + "/securitygroup/" + temp.Name
+			url = common.SpiderRestUrl + "/securitygroup/" + temp.CspSecurityGroupName
 		/*
 			case "subnet":
 				temp := subnetInfo{}

diff --git a/src/core/mcir/securitygroup.go b/src/core/mcir/securitygroup.go
@@ -149,10 +149,22 @@ func CreateSecurityGroup(nsId string, u *TbSecurityGroupReq) (TbSecurityGroupInf
 		return content, err
 	}
 
+	tempInterface, err := GetResource(nsId, common.StrVNet, u.VNetId)
+	if err != nil {
+		err := fmt.Errorf("Failed to get the TbVNetInfo " + u.VNetId + ".")
+		return TbSecurityGroupInfo{}, err
+	}
+	vNetInfo := TbVNetInfo{}
+	err = common.CopySrcToDest(&tempInterface, &vNetInfo)
+	if err != nil {
+		err := fmt.Errorf("Failed to get the TbVNetInfo-CopySrcToDest() " + u.VNetId + ".")
+		return TbSecurityGroupInfo{}, err
+	}
+
 	tempReq := SpiderSecurityReqInfoWrapper{}
 	tempReq.ConnectionName = u.ConnectionName
 	tempReq.ReqInfo.Name = u.Name
-	tempReq.ReqInfo.VPCName = u.VNetId
+	tempReq.ReqInfo.VPCName = vNetInfo.CspVNetName
 	tempReq.ReqInfo.SecurityRules = u.FirewallRules
 
 	var tempSpiderSecurityInfo *SpiderSecurityInfo

diff --git a/src/core/mcir/sshkey.go b/src/core/mcir/sshkey.go
@@ -138,7 +138,7 @@ func CreateSshKey(nsId string, u *TbSshKeyReq) (TbSshKeyInfo, error) {
 
 	tempReq := SpiderKeyPairReqInfoWrapper{}
 	tempReq.ConnectionName = u.ConnectionName
-	tempReq.ReqInfo.Name = u.Name
+	tempReq.ReqInfo.Name = nsId + "-" + u.Name
 
 	var tempSpiderKeyPairInfo *SpiderKeyPairInfo
 

diff --git a/src/core/mcir/vnet.go b/src/core/mcir/vnet.go
@@ -189,7 +189,7 @@ func CreateVNet(nsId string, u *TbVNetReq) (TbVNetInfo, error) {
 
 	tempReq := SpiderVPCReqInfoWrapper{}
 	tempReq.ConnectionName = u.ConnectionName
-	tempReq.ReqInfo.Name = u.Name
+	tempReq.ReqInfo.Name = nsId + "-" + u.Name
 	tempReq.ReqInfo.IPv4_CIDR = u.CidrBlock
 
 	// tempReq.ReqInfo.SubnetInfoList = u.SubnetInfoList