Skip to content

Commit

Permalink
Insert Subnet ZoneId to MetaDB for global subnet type like GCP
Browse files Browse the repository at this point in the history
  • Loading branch information
@powerkimhub
powerkimhub committed Jun 2, 2024
1 parent 66130c8 commit ef072bb
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 29 deletions.
10 changes: 10 additions & 0 deletions api-runtime/common-runtime/ClusterManager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,16 @@ func CreateCluster(connectionName string, rsType string, reqInfo cres.ClusterInf
return &info, nil
}

// Get reqNameId from reqIIdList whith driver NameId
func getReqNameId(reqIIdList []cres.IID, driverNameId string) string {
for _, iid := range reqIIdList {
if iid.SystemId == driverNameId {
return iid.NameId
}
}
return ""
}

func setResourcesNameId(connectionName string, info *cres.ClusterInfo) error {
//+++++++++++++++++++++ Set NetworkInfo's NameId
netInfo := &info.Network
Expand Down
8 changes: 8 additions & 0 deletions api-runtime/common-runtime/CommonManager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@ type VPCDependentIIDInfo struct {
OwnerVPCName string `gorm:"primaryKey"` // ex) "my_vpc" for NLB
}

type ZoneLevelVPCDependentIIDInfo struct {
ConnectionName string `gorm:"primaryKey"` // ex) "aws-seoul-config"
ZoneId string // ex) "ap-northeast-2a"
NameId string `gorm:"primaryKey"` // ex) "my_resource"
SystemId string // ID in CSP, ex) "i7baab81a4ez"
OwnerVPCName string `gorm:"primaryKey"` // ex) "my_vpc" for NLB
}

type ClusterDependentIIDInfo struct {
ConnectionName string `gorm:"primaryKey"` // ex) "aws-seoul-config"
NameId string `gorm:"primaryKey"` // ex) "my_resource"
Expand Down
97 changes: 70 additions & 27 deletions api-runtime/common-runtime/VPC-SubnetManager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (VPCIIDInfo) TableName() string {
return "vpc_iid_infos"
}

type SubnetIIDInfo VPCDependentIIDInfo
type SubnetIIDInfo ZoneLevelVPCDependentIIDInfo

func (SubnetIIDInfo) TableName() string {
return "subnet_iid_infos"
Expand Down Expand Up @@ -156,7 +156,7 @@ func RegisterVPC(connectionName string, userIID cres.IID) (*cres.VPCInfo, error)
// (2) get resource info(CSP-ID)
// (3) create spiderIID: {UserID, SP-XID:CSP-ID}
// (4) insert spiderIID
func RegisterSubnet(connectionName string, vpcName string, userIID cres.IID) (*cres.VPCInfo, error) {
func RegisterSubnet(connectionName string, zoneId string, vpcName string, userIID cres.IID) (*cres.VPCInfo, error) {
cblog.Info("call RegisterSubnet()")

// check empty and trim user inputs
Expand All @@ -180,7 +180,7 @@ func RegisterSubnet(connectionName string, vpcName string, userIID cres.IID) (*c
return nil, err
}

cldConn, err := ccm.GetCloudConnection(connectionName)
cldConn, err := ccm.GetZoneLevelCloudConnection(connectionName, zoneId)
if err != nil {
cblog.Error(err)
return nil, err
Expand Down Expand Up @@ -234,12 +234,21 @@ func RegisterSubnet(connectionName string, vpcName string, userIID cres.IID) (*c
if subnetInfo.IId.SystemId == userIID.SystemId {
// insert a subnet SpiderIID to metadb
subnetSpiderIId := cres.IID{NameId: subnetUserId, SystemId: systemId + ":" + subnetInfo.IId.SystemId}
err = infostore.Insert(&SubnetIIDInfo{ConnectionName: connectionName, NameId: subnetSpiderIId.NameId, SystemId: subnetSpiderIId.SystemId,
err = infostore.Insert(&SubnetIIDInfo{ConnectionName: connectionName, ZoneId: zoneId, NameId: subnetSpiderIId.NameId, SystemId: subnetSpiderIId.SystemId,
OwnerVPCName: vpcName})
if err != nil {
cblog.Error(err)
return nil, err
}
if subnetInfo.Zone == "" { // GCP has no Zone info
var iidInfo SubnetIIDInfo
err = infostore.GetBy3Conditions(&iidInfo, CONNECTION_NAME_COLUMN, connectionName, NAME_ID_COLUMN, subnetInfo.IId.NameId, OWNER_VPC_NAME_COLUMN, vpcName)
if err != nil {
cblog.Info(err)
} else {
subnetInfo.Zone = iidInfo.ZoneId
}
}

// setup subnet IID for return info
subnetInfo.IId = cres.IID{NameId: subnetUserId, SystemId: subnetInfo.IId.SystemId}
Expand Down Expand Up @@ -306,6 +315,12 @@ func UnregisterSubnet(connectionName string, vpcName string, nameId string) (boo
// (4) create spiderIID: {reqNameID, "driverNameID:driverSystemID"}
// (5) insert spiderIID
// (6) create userIID

type SubnetReqZoneInfo struct {
IId cres.IID
Zone string
}

func CreateVPC(connectionName string, rsType string, reqInfo cres.VPCReqInfo, IDTransformMode string) (*cres.VPCInfo, error) {
cblog.Info("call CreateVPC()")

Expand Down Expand Up @@ -409,7 +424,7 @@ func CreateVPC(connectionName string, rsType string, reqInfo cres.VPCReqInfo, ID
}

// for subnet list
subnetReqIIdList := []cres.IID{}
subnetReqIIdZoneList := []SubnetReqZoneInfo{}
subnetInfoList := []cres.SubnetInfo{}
for _, info := range reqInfo.SubnetInfoList {
subnetUUID := ""
Expand All @@ -434,12 +449,14 @@ func CreateVPC(connectionName string, rsType string, reqInfo cres.VPCReqInfo, ID

// reqIID
subnetReqIId := cres.IID{NameId: info.IId.NameId, SystemId: subnetUUID}
subnetReqIIdList = append(subnetReqIIdList, subnetReqIId)
subnetReqInfo := SubnetReqZoneInfo{IId: subnetReqIId, Zone: info.Zone}
subnetReqIIdZoneList = append(subnetReqIIdZoneList, subnetReqInfo)
// driverIID
subnetDriverIId := cres.IID{NameId: subnetUUID, SystemId: ""}
info.IId = subnetDriverIId
subnetInfoList = append(subnetInfoList, info)
} // end of for _, info

reqInfo.SubnetInfoList = subnetInfoList

// (3) create Resource
Expand Down Expand Up @@ -470,13 +487,17 @@ func CreateVPC(connectionName string, rsType string, reqInfo cres.VPCReqInfo, ID
}
// for Subnet list
for _, subnetInfo := range info.SubnetInfoList {
subnetReqNameId := getReqNameId(subnetReqIIdList, subnetInfo.IId.NameId)
subnetReqNameId := getSubnetReqNameId(subnetReqIIdZoneList, subnetInfo.IId.NameId)
if subnetReqNameId == "" {
cblog.Error(subnetInfo.IId.NameId + "is not requested Subnet.")
continue
}
if subnetInfo.Zone == "" { // GCP has no Zone info
subnetInfo.Zone = getSubnetReqZoneId(subnetReqIIdZoneList, subnetInfo.IId.NameId)
}

subnetSpiderIId := cres.IID{NameId: subnetReqNameId, SystemId: subnetInfo.IId.NameId + ":" + subnetInfo.IId.SystemId}
err = infostore.Insert(&SubnetIIDInfo{ConnectionName: connectionName, NameId: subnetSpiderIId.NameId, SystemId: subnetSpiderIId.SystemId,
err = infostore.Insert(&SubnetIIDInfo{ConnectionName: connectionName, ZoneId: subnetInfo.Zone, NameId: subnetSpiderIId.NameId, SystemId: subnetSpiderIId.SystemId,
OwnerVPCName: reqIId.NameId})
if err != nil {
cblog.Error(err)
Expand Down Expand Up @@ -516,21 +537,34 @@ func CreateVPC(connectionName string, rsType string, reqInfo cres.VPCReqInfo, ID
// for Subnet list
subnetUserInfoList := []cres.SubnetInfo{}
for _, subnetInfo := range info.SubnetInfoList {
subnetReqNameId := getReqNameId(subnetReqIIdList, subnetInfo.IId.NameId)
subnetReqNameId := getSubnetReqNameId(subnetReqIIdZoneList, subnetInfo.IId.NameId)
userIId := cres.IID{NameId: subnetReqNameId, SystemId: subnetInfo.IId.SystemId}
subnetInfo.IId = userIId
if subnetInfo.Zone == "" { // GCP has no Zone info
subnetInfo.Zone = getSubnetReqZoneId(subnetReqIIdZoneList, subnetInfo.IId.NameId)
}
subnetUserInfoList = append(subnetUserInfoList, subnetInfo)
}
info.SubnetInfoList = subnetUserInfoList

return &info, nil
}

// Get reqNameId from reqIIdList whith driver NameId
func getReqNameId(reqIIdList []cres.IID, driverNameId string) string {
for _, iid := range reqIIdList {
if iid.SystemId == driverNameId {
return iid.NameId
// Get reqNameId from reqIIdZoneList whith driver NameId
func getSubnetReqNameId(reqIIdZoneList []SubnetReqZoneInfo, driverNameId string) string {
for _, reqInfo := range reqIIdZoneList {
if reqInfo.IId.SystemId == driverNameId {
return reqInfo.IId.NameId
}
}
return ""
}

// Get reqZoneId from reqIIdZoneList whith driver NameId
func getSubnetReqZoneId(reqIIdZoneList []SubnetReqZoneInfo, driverNameId string) string {
for _, reqInfo := range reqIIdZoneList {
if reqInfo.IId.SystemId == driverNameId {
return reqInfo.Zone
}
}
return ""
Expand Down Expand Up @@ -659,6 +693,9 @@ func getVPCInfo(connectionName string, handler cres.VPCHandler, iid cres.IID, re
}
if subnetIIDInfo.NameId != "" { // insert only this user created.
subnetInfo.IId = getUserIID(cres.IID{NameId: subnetIIDInfo.NameId, SystemId: subnetIIDInfo.SystemId})
if subnetInfo.Zone == "" { // GCP has no Zone info
subnetInfo.Zone = subnetIIDInfo.ZoneId
}
subnetInfoList = append(subnetInfoList, subnetInfo)
}
}
Expand Down Expand Up @@ -737,6 +774,9 @@ func GetVPC(connectionName string, rsType string, nameID string) (*cres.VPCInfo,
}
if subnetIIDInfo.NameId != "" { // insert only this user created.
subnetInfo.IId = getUserIID(cres.IID{NameId: subnetIIDInfo.NameId, SystemId: subnetIIDInfo.SystemId})
if subnetInfo.Zone == "" { // GCP has no Zone info
subnetInfo.Zone = subnetIIDInfo.ZoneId
}
subnetInfoList = append(subnetInfoList, subnetInfo)
}
}
Expand Down Expand Up @@ -837,7 +877,7 @@ func AddSubnet(connectionName string, rsType string, vpcName string, reqInfo cre
for _, subnetInfo := range info.SubnetInfoList {
if subnetInfo.IId.NameId == reqInfo.IId.NameId { // NameId => SS-UUID
subnetSpiderIId := cres.IID{NameId: subnetReqNameId, SystemId: subnetInfo.IId.NameId + ":" + subnetInfo.IId.SystemId}
err = infostore.Insert(&SubnetIIDInfo{ConnectionName: connectionName, NameId: subnetSpiderIId.NameId, SystemId: subnetSpiderIId.SystemId,
err = infostore.Insert(&SubnetIIDInfo{ConnectionName: connectionName, ZoneId: reqInfo.Zone, NameId: subnetSpiderIId.NameId, SystemId: subnetSpiderIId.SystemId,
OwnerVPCName: vpcName})
if err != nil {
cblog.Error(err)
Expand Down Expand Up @@ -884,6 +924,9 @@ func AddSubnet(connectionName string, rsType string, vpcName string, reqInfo cre
}
if subnetIIDInfo.NameId != "" { // insert only this user created.
subnetInfo.IId = getUserIID(cres.IID{NameId: subnetIIDInfo.NameId, SystemId: subnetInfo.IId.SystemId})
if subnetInfo.Zone == "" { // GCP has no Zone info
subnetInfo.Zone = subnetIIDInfo.ZoneId
}
subnetInfoList = append(subnetInfoList, subnetInfo)
}
}
Expand Down Expand Up @@ -917,18 +960,6 @@ func RemoveSubnet(connectionName string, vpcName string, nameID string, force st
return false, err
}

cldConn, err := ccm.GetCloudConnection(connectionName)
if err != nil {
cblog.Error(err)
return false, err
}

handler, err := cldConn.CreateVPCHandler()
if err != nil {
cblog.Error(err)
return false, err
}

vpcSPLock.Lock(connectionName, vpcName)
defer vpcSPLock.Unlock(connectionName, vpcName)

Expand All @@ -944,6 +975,18 @@ func RemoveSubnet(connectionName string, vpcName string, nameID string, force st
driverIId := getDriverIID(cres.IID{NameId: iidInfo.NameId, SystemId: iidInfo.SystemId})
result := false

cldConn, err := ccm.GetZoneLevelCloudConnection(connectionName, iidInfo.ZoneId)
if err != nil {
cblog.Error(err)
return false, err
}

handler, err := cldConn.CreateVPCHandler()
if err != nil {
cblog.Error(err)
return false, err
}

var iidVPCInfo VPCIIDInfo
err = infostore.GetByConditions(&iidVPCInfo, CONNECTION_NAME_COLUMN, connectionName, NAME_ID_COLUMN, vpcName)
if err != nil {
Expand Down
5 changes: 3 additions & 2 deletions api-runtime/rest-runtime/VPC-SubnetRest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ func RegisterVPC(c echo.Context) error {
type subnetRegisterReq struct {
ConnectionName string
ReqInfo struct {
VPCName string
Name string
Zone string
VPCName string
CSPId string
}
}
Expand All @@ -73,7 +74,7 @@ func RegisterSubnet(c echo.Context) error {
userIId := cres.IID{NameId: req.ReqInfo.Name, SystemId: req.ReqInfo.CSPId}

// Call common-runtime API
result, err := cmrt.RegisterSubnet(req.ConnectionName, req.ReqInfo.VPCName, userIId)
result, err := cmrt.RegisterSubnet(req.ConnectionName, req.ReqInfo.Zone, req.ReqInfo.VPCName, userIId)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
Expand Down

0 comments on commit ef072bb

Please sign in to comment.