ALI SDK test&fix

ali crud
huawei crud
tencent crd

Signed-off-by: zhouqunjie <450705171@qq.com>

adaptor/pod/server/ali/delete_container_group.go

@@ -47,21 +47,18 @@ func DeleteContainerGroup(request *DeleteContainerGroupRequest) (response *Delet
 	glog.Infof("load tenant from file finished")
 	var regionId int32
 	var pcmId string
-	podId := request.ContainerGroupId
-	podName := request.ContainerGroupName
+	pcmId = request.PcmId
+	//podId := request.ContainerGroupId
+	//podName := request.ContainerGroupName
 	switch request.ProviderId {
 	case 0:
 		regionId, _ = tenanter.GetAliRegionId(request.RegionId)
-		pcmId = podId
 	case 1:
 		regionId, _ = tenanter.GetTencentRegionId(request.RegionId)
-		pcmId = podId
 	case 2:
 		regionId, _ = tenanter.GetHuaweiRegionId(request.RegionId)
-		pcmId = podName
 	case 3:
 		regionId, _ = tenanter.GetK8SRegionId(request.RegionId)
-		pcmId = podName
 	}
 
 	requestPCM := &pbpod.DeletePodReq{
@@ -69,8 +66,6 @@ func DeleteContainerGroup(request *DeleteContainerGroupRequest) (response *Delet
 		Provider:      provider,
 		AccountName:   request.AccountName,
 		PcmId:         pcmId,
-		PodId:         podId,
-		PodName:       podName,
 		Namespace:     request.Namespace,
 		RegionId:      regionId,
 	}
@@ -94,6 +89,7 @@ type DeleteContainerGroupRequest struct {
 	ProviderId         int32  `position:"Query" name:"ProviderId"`
 	AccountName        string `position:"Query" name:"AccountName"`
 	Namespace          string `position:"Query" name:"Namespace"`
+	PcmId              string `position:"Query" name:"PcmId"`
 	ContainerGroupName string `position:"Query" name:"ContainerGroupName"`
 	/*********PCM param************/
 	OwnerId              requests.Integer `position:"Query" name:"OwnerId"`

adaptor/pod/server/ali/update_container_group.go

@@ -62,6 +62,7 @@ func UpdateContainerGroup(request *UpdateContainerGroupRequest) (response *Updat
 		RequestSource:  "ali",
 		Provider:       provider,
 		AccountName:    request.AccountName,
+		PcmId:          request.PcmId,
 		PodId:          request.ContainerGroupId,
 		PodName:        request.ContainerGroupName,
 		Namespace:      request.Namespace,
@@ -92,6 +93,7 @@ type UpdateContainerGroupRequest struct {
 	ProviderId         int32  `position:"Query" name:"ProviderId"`
 	AccountName        string `position:"Query" name:"AccountName"`
 	Namespace          string `position:"Query" name:"Namespace"`
+	PcmId              string `position:"Query" name:"PcmId"`
 	ContainerGroupName string `position:"Query" name:"ContainerGroupName"`
 	/*********PCM param************/
 	OwnerId                 requests.Integer                               `position:"Query" name:"OwnerId"`

adaptor/pod/service/huawei_cci.go

@@ -176,7 +176,7 @@ func (cci *HuaweiCci) UpdatePod(ctx context.Context, req *pbpod.UpdatePodReq) (*
 	pod := corev1.Pod{
 		TypeMeta: qresp.TypeMeta,
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      req.PodName,
+			Name:      req.PcmId,
 			Namespace: req.Namespace,
 			Labels:    map[string]string{"name": req.Labels},
 		},

adaptor/pod/service/tencent_eks.go

@@ -156,15 +156,10 @@ func (eks *TencentEks) UpdatePod(ctx context.Context, req *pbpod.UpdatePodReq) (
 	request := tencenteks.NewUpdateEKSContainerInstanceRequest()
 	request.EksCiId = &req.PcmId
 	request.RestartPolicy = &req.RestartPolicy
-	request.Name = &req.PodName
-	cpu, err := strconv.ParseFloat(req.CpuPod, 64)
-	memory, err := strconv.ParseFloat(req.MemoryPod, 64)
 	request.Containers = make([]*tencenteks.Container, 1)
 	request.Containers[0] = new(tencenteks.Container)
 	request.Containers[0].Name = &req.ContainerName
 	request.Containers[0].Image = &req.ContainerImage
-	request.Containers[0].Cpu = &cpu
-	request.Containers[0].Memory = &memory
 	resp, err := eks.cli.UpdateEKSContainerInstance(request)
 	isFinished := true
 	if err != nil {

examples/pcm_ali.go

@@ -8,9 +8,9 @@ func aliCreatePCM() (_err error) {
 	request := pcm_pod_ali.CreateCreateContainerGroupRequest()
 
 	/****************PCM params******************/
-	request.ProviderId = 2
+	request.ProviderId = 1
 	//ali:cn-hangzhou  tc:ap-guangzhou  hw:  cn-east-3
-	request.RegionId = "cn-east-3"
+	request.RegionId = "ap-guangzhou"
 	request.Namespace = "pcm"
 	/****************PCM params******************/
 	request.ContainerGroupName = "pcm0517"
@@ -31,9 +31,9 @@ func aliDescribePCM() (_err error) {
 	request := pcm_pod_ali.CreateDescribeContainerGroupsRequest()
 
 	/****************PCM params******************/
-	request.ProviderId = 2
+	request.ProviderId = 1
 	//ali:cn-hangzhou  tc:ap-guangzhou  hw:  cn-east-3
-	request.RegionId = "cn-east-3"
+	request.RegionId = "ap-guangzhou"
 	request.Namespace = "pcm"
 	/****************PCM params******************/
 
@@ -47,15 +47,18 @@ func aliUpdatePCM() (_err error) {
 	request := pcm_pod_ali.CreateUpdateContainerGroupRequest()
 
 	/****************PCM params******************/
-	request.ProviderId = 2
+	request.ProviderId = 1
 	//ali:cn-hangzhou  tc:ap-guangzhou  hw:  cn-east-3
-	request.RegionId = "cn-east-3"
+	request.RegionId = "ap-guangzhou"
 	request.Namespace = "pcm"
-
+	request.PcmId = "eksci-ofdhm7h0"
 	/****************PCM params******************/
+	request.RestartPolicy = "Always"
 	requestContainer := make([]pcm_pod_ali.UpdateContainerGroupContainer, 1)
-	requestContainer[0].Cpu = "2"
-	requestContainer[0].Memory = "4"
+	requestContainer[0].Cpu = "1"
+	requestContainer[0].Memory = "2"
+	requestContainer[0].Image = "nginx"
+	requestContainer[0].Name = "pc-mNew"
 	request.Container = &requestContainer
 
 	resp, _err := pcm_pod_ali.UpdateContainerGroup(request)
@@ -68,10 +71,11 @@ func aliDeletePCM() (_err error) {
 
 	request := pcm_pod_ali.CreateDeleteContainerGroupRequest()
 	/****************PCM params******************/
-	request.ProviderId = 2
+	request.ProviderId = 1
 	//ali:cn-hangzhou  tc:ap-guangzhou  hw:  cn-east-3
-	request.RegionId = "cn-east-3"
+	request.RegionId = "ap-guangzhou"
 	request.Namespace = "pcm"
+	request.PcmId = "eksci-ofdhm7h0"
 	/****************PCM params******************/
 	request.ContainerGroupId = "eksci-hhfpfms6"
 
@@ -85,7 +89,7 @@ func aliDeletePCM() (_err error) {
 
 func main() {
 
-	err := aliUpdatePCM()
+	err := aliDeletePCM()
 	if err != nil {
 		panic(err)
 	}