Add GetCSPResourceName for Ladybug's CMKS

cloud-barista · Aug 17, 2022 · ba0dfb5 · ba0dfb5
1 parent 4aa6215
commit ba0dfb5
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 0 deletions.
diff --git a/api-runtime/common-runtime/CCMCommon.go b/api-runtime/common-runtime/CCMCommon.go
@@ -5765,3 +5765,32 @@ func setVMUserIIDwithSystemId(connectionName string, nlbName string, healthInfo
 	return nil
 }
 
+func GetCSPResourceName(connectionName string, rsType string, nameID string) (string, error) {
+        cblog.Info("call GetCSPResourceName()")
+
+        // check empty and trim user inputs
+        connectionName, err := EmptyCheckAndTrim("connectionName", connectionName)
+        if err != nil {
+                cblog.Error(err)
+                return "", err
+        }
+
+        nameID, err = EmptyCheckAndTrim("nameID", nameID)
+        if err != nil {
+                cblog.Error(err)
+                return "", err
+        }
+
+        keySPLock.RLock(connectionName, nameID)
+        defer keySPLock.RUnlock(connectionName, nameID)
+
+        // (1) get IID(NameId)
+        iidInfo, err := iidRWLock.GetIID(iidm.IIDSGROUP, connectionName, rsType, cres.IID{nameID, ""})
+        if err != nil {
+                cblog.Error(err)
+                return "", err
+        }
+
+        // (2) get DriverNameId and return it
+        return getDriverIID(iidInfo.IId).NameId, nil
+}
diff --git a/api-runtime/rest-runtime/CBSpiderRuntime.go b/api-runtime/rest-runtime/CBSpiderRuntime.go
@@ -334,6 +334,11 @@ func RunServer() {
                 {"GET", "/allnlb", ListAllNLB},
                 {"DELETE", "/cspnlb/:Id", DeleteCSPNLB},
 
+
+		//-------------------------------------------------------------------//
+                //----------Additional Info
+		{"GET", "/cspresourcename/:Name", GetCSPResourceName},
+
 		//-------------------------------------------------------------------//
 		//----------SPLock Info
 		{"GET", "/splockinfo", GetAllSPLockInfo},

diff --git a/api-runtime/rest-runtime/CCMRest.go b/api-runtime/rest-runtime/CCMRest.go
@@ -2302,3 +2302,37 @@ func GetAllSPLockInfo(c echo.Context) error {
         return c.JSON(http.StatusOK, &jsonResult)
 }
 
+
+func GetCSPResourceName(c echo.Context) error {
+        cblog.Info("call GetCSPResourceName()")
+
+        var req struct {
+                ConnectionName string
+                ResourceType string
+        }
+
+        if err := c.Bind(&req); err != nil {
+                return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
+        }
+
+        // To support for Get-Query Param Type API
+        if req.ConnectionName == "" {
+                req.ConnectionName = c.QueryParam("ConnectionName")
+        }
+        if req.ResourceType == "" {
+                req.ResourceType = c.QueryParam("ResourceType")
+        }
+
+        // Call common-runtime API
+        result, err := cmrt.GetCSPResourceName(req.ConnectionName, req.ResourceType, c.Param("Name"))
+        if err != nil {
+                return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
+        }
+
+        var resultInfo struct {
+                Name string
+        }
+	resultInfo.Name = string(result)
+
+        return c.JSON(http.StatusOK, &resultInfo)
+}