Skip to content

Commit

Permalink
Add IID_MGMT_MODE environment variable and API argument to turn off I…
Browse files Browse the repository at this point in the history
…D transformation
  • Loading branch information
powerkimhub committed May 9, 2024
1 parent 5c894f2 commit 06ad314
Show file tree
Hide file tree
Showing 22 changed files with 202 additions and 128 deletions.
31 changes: 18 additions & 13 deletions api-runtime/common-runtime/ClusterManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ func registerNodeGroupList(connectionName string, info *cres.ClusterInfo) error
// (5) insert spiderIID
// (6) create userIID
// (7) set used Resources's userIID
func CreateCluster(connectionName string, rsType string, reqInfo cres.ClusterInfo) (*cres.ClusterInfo, error) {
func CreateCluster(connectionName string, rsType string, reqInfo cres.ClusterInfo, ID_MGMT_MODE string) (*cres.ClusterInfo, error) {
cblog.Info("call CreateCluster()")

// check empty and trim user inputs
Expand Down Expand Up @@ -424,18 +424,23 @@ func CreateCluster(connectionName string, rsType string, reqInfo cres.ClusterInf
return nil, err
}

// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err := iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
spUUID := ""
if GetID_MGMT(ID_MGMT_MODE) == "ON" { // Use IID Management
// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err = iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
}
} else { // No Use IID Management
spUUID = reqInfo.IId.NameId
}

// reqIID
Expand Down
11 changes: 11 additions & 0 deletions api-runtime/common-runtime/CommonManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,17 @@ func setLogLevel() {
}
}

func GetID_MGMT(thisMode string) string {

switch strings.ToUpper(thisMode) {
case "ON":
return "ON"
case "OFF":
return "OFF"
}
return os.Getenv("ID_MGMT_MODE")
}

func GetAllSPLockInfo() []string {
var results []string

Expand Down
31 changes: 18 additions & 13 deletions api-runtime/common-runtime/DiskManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func RegisterDisk(connectionName string, zoneId string, userIID cres.IID) (*cres
// (4) create spiderIID: {reqNameID, "driverNameID:driverSystemID"}
// (5) insert spiderIID
// (6) create userIID
func CreateDisk(connectionName string, rsType string, reqInfo cres.DiskInfo) (*cres.DiskInfo, error) {
func CreateDisk(connectionName string, rsType string, reqInfo cres.DiskInfo, ID_MGMT_MODE string) (*cres.DiskInfo, error) {
cblog.Info("call CreateDisk()")

// check empty and trim user inputs
Expand Down Expand Up @@ -178,18 +178,23 @@ func CreateDisk(connectionName string, rsType string, reqInfo cres.DiskInfo) (*c
return nil, err
}

// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err := iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
spUUID := ""
if GetID_MGMT(ID_MGMT_MODE) == "ON" { // Use IID Management
// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err = iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
}
} else { // No Use IID Management
spUUID = reqInfo.IId.NameId
}

// reqIID
Expand Down
31 changes: 18 additions & 13 deletions api-runtime/common-runtime/KeyPairManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func RegisterKey(connectionName string, userIID cres.IID) (*cres.KeyPairInfo, er
// (4) create spiderIID: {reqNameID, "driverNameID:driverSystemID"}
// (5) insert spiderIID
// (6) create userIID
func CreateKey(connectionName string, rsType string, reqInfo cres.KeyPairReqInfo) (*cres.KeyPairInfo, error) {
func CreateKey(connectionName string, rsType string, reqInfo cres.KeyPairReqInfo, ID_MGMT_MODE string) (*cres.KeyPairInfo, error) {
cblog.Info("call CreateKey()")

// check empty and trim user inputs
Expand Down Expand Up @@ -177,18 +177,23 @@ func CreateKey(connectionName string, rsType string, reqInfo cres.KeyPairReqInfo
return nil, err
}

// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err := iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
spUUID := ""
if GetID_MGMT(ID_MGMT_MODE) == "ON" { // Use IID Management
// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err = iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
}
} else { // No Use IID Management
spUUID = reqInfo.IId.NameId
}

// reqIID
Expand Down
31 changes: 18 additions & 13 deletions api-runtime/common-runtime/MyImageManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func RegisterMyImage(connectionName string, userIID cres.IID) (*cres.MyImageInfo
// (4) create spiderIID: {reqNameID, "driverNameID:driverSystemID"}
// (5) insert spiderIID
// (6) create userIID
func SnapshotVM(connectionName string, rsType string, reqInfo cres.MyImageInfo) (*cres.MyImageInfo, error) {
func SnapshotVM(connectionName string, rsType string, reqInfo cres.MyImageInfo, ID_MGMT_MODE string) (*cres.MyImageInfo, error) {
cblog.Info("call SnapshotVM()")

// check empty and trim user inputs
Expand Down Expand Up @@ -177,18 +177,23 @@ func SnapshotVM(connectionName string, rsType string, reqInfo cres.MyImageInfo)
return nil, err
}

// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err := iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
spUUID := ""
if GetID_MGMT(ID_MGMT_MODE) == "ON" { // Use IID Management
// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err = iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
}
} else { // No Use IID Management
spUUID = reqInfo.IId.NameId
}

// reqIID
Expand Down
31 changes: 18 additions & 13 deletions api-runtime/common-runtime/NLBManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ func RegisterNLB(connectionName string, vpcUserID string, userIID cres.IID) (*cr
// (4) create spiderIID: {reqNameID, "driverNameID:driverSystemID"}
// (5) insert spiderIID
// (6) create userIID
func CreateNLB(connectionName string, rsType string, reqInfo cres.NLBInfo) (*cres.NLBInfo, error) {
func CreateNLB(connectionName string, rsType string, reqInfo cres.NLBInfo, ID_MGMT_MODE string) (*cres.NLBInfo, error) {
cblog.Info("call CreateNLB()")

// check empty and trim user inputs
Expand Down Expand Up @@ -367,18 +367,23 @@ func CreateNLB(connectionName string, rsType string, reqInfo cres.NLBInfo) (*cre
return nil, err
}

// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err := iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
spUUID := ""
if GetID_MGMT(ID_MGMT_MODE) == "ON" { // Use IID Management
// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err = iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
}
} else { // No Use IID Management
spUUID = reqInfo.IId.NameId
}

// reqIID
Expand Down
31 changes: 18 additions & 13 deletions api-runtime/common-runtime/SecurityGroupManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ func RegisterSecurity(connectionName string, vpcUserID string, userIID cres.IID)
// (4) create spiderIID: {reqNameID, "driverNameID:driverSystemID"}
// (5) insert spiderIID
// (6) create userIID
func CreateSecurity(connectionName string, rsType string, reqInfo cres.SecurityReqInfo) (*cres.SecurityInfo, error) {
func CreateSecurity(connectionName string, rsType string, reqInfo cres.SecurityReqInfo, ID_MGMT_MODE string) (*cres.SecurityInfo, error) {
cblog.Info("call CreateSecurity()")

// check empty and trim user inputs
Expand Down Expand Up @@ -346,18 +346,23 @@ func CreateSecurity(connectionName string, rsType string, reqInfo cres.SecurityR
return nil, err
}

// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err := iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
spUUID := ""
if GetID_MGMT(ID_MGMT_MODE) == "ON" { // Use IID Management
// (2) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err = iidm.New(connectionName, rsType, reqInfo.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
}
} else { // No Use IID Management
spUUID = reqInfo.IId.NameId
}

// reqIID
Expand Down
31 changes: 18 additions & 13 deletions api-runtime/common-runtime/VMManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ func RegisterVM(connectionName string, userIID cres.IID) (*cres.VMInfo, error) {
// (5) create spiderIID: {reqNameID, "driverNameID:driverSystemID"}
// (6) insert spiderIID
// (7) create userIID
func StartVM(connectionName string, rsType string, reqInfo cres.VMReqInfo) (*cres.VMInfo, error) {
func StartVM(connectionName string, rsType string, reqInfo cres.VMReqInfo, ID_MGMT_MODE string) (*cres.VMInfo, error) {
cblog.Info("call StartVM()")

// check empty and trim user inputs
Expand Down Expand Up @@ -453,18 +453,23 @@ func StartVM(connectionName string, rsType string, reqInfo cres.VMReqInfo) (*cre
rsType = "windowsvm" // be used for NCP and NCPVPC in IIDManager.New()
}

// (3) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err := iidm.New(connectionName, rsType, reqInfoForDriver.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
spUUID := ""
if GetID_MGMT(ID_MGMT_MODE) == "ON" { // Use IID Management
// (3) generate SP-XID and create reqIID, driverIID
// ex) SP-XID {"vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create reqIID: {reqNameID, reqSystemID} # reqSystemID=SP-XID
// ex) reqIID {"seoul-service", "vm-01-9m4e2mr0ui3e8a215n4g"}
//
// create driverIID: {driverNameID, driverSystemID} # driverNameID=SP-XID, driverSystemID=csp's ID
// ex) driverIID {"vm-01-9m4e2mr0ui3e8a215n4g", "i-0bc7123b7e5cbf79d"}
spUUID, err = iidm.New(connectionName, rsType, reqInfoForDriver.IId.NameId)
if err != nil {
cblog.Error(err)
return nil, err
}
} else { // No Use IID Management
spUUID = reqInfo.IId.NameId
}

// reqIID
Expand Down
Loading

0 comments on commit 06ad314

Please sign in to comment.