pcm ali sdk CRUD

Signed-off-by: zhouqj <[email protected]>

Author: zhouqunjie-cs

adaptor/pod_adaptor/server/pod/ali/create_container_group.go

@@ -23,6 +23,7 @@ func CreateContainerGroup(request *CreateContainerGroupRequest) (response *Creat
 	memoryPod := container[0].Memory
 
 	requestPCM := &pbpod.CreatePodReq{
+		RequestSource:   "ali",
 		Provider:        provider,
 		AccountName:     tenanters[0].AccountName(),
 		PodName:         request.ContainerGroupName,

adaptor/pod_adaptor/server/pod/ali/delete_container_group.go

@@ -1,18 +1,3 @@
-//Licensed under the Apache License, Version 2.0 (the "License");
-//you may not use this file except in compliance with the License.
-//You may obtain a copy of the License at
-//
-//http://www.apache.org/licenses/LICENSE-2.0
-//
-//Unless required by applicable law or agreed to in writing, software
-//distributed under the License is distributed on an "AS IS" BASIS,
-//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//See the License for the specific language governing permissions and
-//limitations under the License.
-//
-// Code generated by Alibaba Cloud SDK Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is regenerated.
-
 package ali
 
 import (
@@ -29,6 +14,7 @@ func DescribeContainerGroups(request *DescribeContainerGroupsRequest) (response
 
 	provider := pbtenant.CloudProvider(request.ProviderId)
 	containerGroups := make([]DescribeContainerGroupsContainerGroup0, 0)
+	//trans Ali request to  PCM request
 	requestPCM := &pbpod.ListPodReq{
 		RequestSource: "ali",
 		Provider:      provider,

adaptor/pod_adaptor/server/pod/ali/describe_container_groups.go

@@ -2,7 +2,6 @@ package pod
 
 import (
 	"context"
-	"flag"
 	"fmt"
 	"sync"
 
@@ -99,7 +98,10 @@ func CreatePod(ctx context.Context, req *pbpod.CreatePodReq) (*pbpod.CreatePodRe
 	var (
 		pod poder.Poder
 	)
-
+	//pcm adk过来的请求需要从用户本地读取配置文件
+	if len(req.RequestSource) > 0 {
+		tenanter.GenTenanter("configs/config.yaml")
+	}
 	tenanters, err := tenanter.GetTenanters(req.Provider)
 	if err != nil {
 		return nil, errors.WithMessage(err, "getTenanters error")
@@ -126,7 +128,10 @@ func DeletePod(ctx context.Context, req *pbpod.DeletePodReq) (*pbpod.DeletePodRe
 	var (
 		pod poder.Poder
 	)
-
+	//pcm adk过来的请求需要从用户本地读取配置文件
+	if len(req.RequestSource) > 0 {
+		tenanter.GenTenanter("configs/config.yaml")
+	}
 	tenanters, err := tenanter.GetTenanters(req.Provider)
 	if err != nil {
 		return nil, errors.WithMessage(err, "getTenanters error")
@@ -153,7 +158,10 @@ func UpdatePod(ctx context.Context, req *pbpod.UpdatePodReq) (*pbpod.UpdatePodRe
 	var (
 		pod poder.Poder
 	)
-
+	//pcm adk过来的请求需要从用户本地读取配置文件
+	if len(req.RequestSource) > 0 {
+		tenanter.GenTenanter("configs/config.yaml")
+	}
 	tenanters, err := tenanter.GetTenanters(req.Provider)
 	if err != nil {
 		return nil, errors.WithMessage(err, "getTenanters error")
@@ -210,27 +218,13 @@ func ListPod(ctx context.Context, req *pbpod.ListPodReq) (*pbpod.ListPodResp, er
 		pods      []*pbpod.PodInstance
 		tenanters []tenanter.Tenanter
 	)
-	//ali adk过来的请求需要从用户本地读取配置文件
-	if req.RequestSource == "ali" {
-
-		var configFile string
-		flag.StringVar(&configFile, "conf", "configs/config.yaml", "config.yaml")
-		flag.Parse()
-		defer glog.Flush()
-
-		if err := tenanter.LoadCloudConfigsFromFile(configFile); err != nil {
-			if !errors.Is(err, tenanter.ErrLoadTenanterFileEmpty) {
-				glog.Fatalf("LoadCloudConfigsFromFile error %+v", err)
-			}
-			glog.Warningf("LoadCloudConfigsFromFile empty file path %s", configFile)
-		}
-
-		glog.Infof("load tenant from file finished")
-		tenanters, _ = tenanter.GetTenanters(req.Provider)
-	} else {
-		tenanters, _ = tenanter.GetTenanters(req.Provider)
+	//pcm adk过来的请求需要从用户本地读取配置文件
+	if len(req.RequestSource) > 0 {
+		tenanter.GenTenanter("configs/config.yaml")
 	}
 
+	tenanters, _ = tenanter.GetTenanters(req.Provider)
+
 	//get the available region for product
 	reqPodRegion := &pbpod.GetPodRegionReq{Provider: req.GetProvider()}
 	respPodRegion, err := GetPodRegion(ctx, reqPodRegion)

adaptor/pod_adaptor/server/pod/ali/update_container_group.go

@@ -2,7 +2,9 @@ package tenanter
 
 import (
 	"encoding/json"
+	"flag"
 	"github.com/JCCE-nudt/PCM/lan_trans/idl/pbtenant"
+	"github.com/golang/glog"
 	"io/ioutil"
 	"os"
 	"sync"
@@ -99,3 +101,19 @@ func GetTenanters(provider pbtenant.CloudProvider) ([]Tenanter, error) {
 	}
 	return tenanters, nil
 }
+
+func GenTenanter(configPath string) {
+	var configFile string
+	flag.StringVar(&configFile, "conf", configPath, "config.yaml")
+	flag.Parse()
+	defer glog.Flush()
+
+	if err := LoadCloudConfigsFromFile(configFile); err != nil {
+		if !errors.Is(err, ErrLoadTenanterFileEmpty) {
+			glog.Fatalf("LoadCloudConfigsFromFile error %+v", err)
+		}
+		glog.Warningf("LoadCloudConfigsFromFile empty file path %s", configFile)
+	}
+
+	glog.Infof("load tenant from file finished")
+}

adaptor/pod_adaptor/server/pod/pod.go

@@ -81,6 +81,8 @@ message CreatePodReq {
   string vpc_id = 12;
   //名空间
   string namespace = 13;
+  //请求源,如果是从pcm sdk 过来的，则单独生成tenanters实体
+  string requestSource = 14;
 }
 
 message CreatePodResp {
@@ -109,6 +111,8 @@ message DeletePodReq {
   string namespace = 6;
   // 地域，数据中心
   int32 region_id = 7;
+  //请求源,如果是从pcm sdk 过来的，则单独生成tenanters实体
+  string requestSource = 8;
 }
 
 message DeletePodResp {
@@ -149,6 +153,8 @@ message UpdatePodReq {
   string restart_policy = 12;
   // labels
   string labels = 13;
+  //请求源,如果是从pcm sdk 过来的，则单独生成tenanters实体
+  string requestSource = 14;
 }
 
 message UpdatePodResp {
@@ -204,7 +210,7 @@ message ListPodReq {
   pbtenant.CloudProvider provider = 1;
   //命名空间
   string namespace =2;
-  //请求源,如果是从ali sdk 过来的，则单独生成tenanters实体
+  //请求源,如果是从pcm sdk 过来的，则单独生成tenanters实体
   string requestSource =3;
 }