From ca4b1a34dbbbdb33c819328eb076b9463382a374 Mon Sep 17 00:00:00 2001 From: zhouqunjie <450705171@qq.com> Date: Thu, 28 Apr 2022 16:41:38 +0800 Subject: [PATCH] bug fix Signed-off-by: zhouqunjie <450705171@qq.com> --- adaptor/pod_adaptor/server/pod/pod.go | 3 +-- common/tenanter/main_test.go | 5 +---- common/tenanter/region_test.go | 1 - idl/pbpod/pod.proto | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/adaptor/pod_adaptor/server/pod/pod.go b/adaptor/pod_adaptor/server/pod/pod.go index 00b3c54d..50ae6ad7 100644 --- a/adaptor/pod_adaptor/server/pod/pod.go +++ b/adaptor/pod_adaptor/server/pod/pod.go @@ -213,8 +213,7 @@ func ListPod(ctx context.Context, req *pbpod.ListPodReq) (*pbpod.ListPodResp, er if err != nil { return nil, errors.WithMessage(err, "getTenanters error") } - - //regions := tenanter.GetAllRegionIds(req.Provider) + //get the available region for product reqPodRegion := &pbpod.GetPodRegionReq{Provider: req.GetProvider()} respPodRegion, err := GetPodRegion(ctx, reqPodRegion) if err != nil { diff --git a/common/tenanter/main_test.go b/common/tenanter/main_test.go index 20889881..51cda479 100644 --- a/common/tenanter/main_test.go +++ b/common/tenanter/main_test.go @@ -10,7 +10,6 @@ var ( aliTenant []Tenanter tcTenant []Tenanter hwTenant []Tenanter - awsTenant []Tenanter ) func TestMain(m *testing.M) { @@ -28,8 +27,6 @@ func TestMain(m *testing.M) { if hwTenant, err = GetTenanters(pbtenant.CloudProvider_huawei); err != nil { panic("get hwTenant failed") } - if awsTenant, err = GetTenanters(pbtenant.CloudProvider_aws); err != nil { - panic("get awsTenant failed") - } + os.Exit(m.Run()) } diff --git a/common/tenanter/region_test.go b/common/tenanter/region_test.go index 5d2bcfad..7314a417 100644 --- a/common/tenanter/region_test.go +++ b/common/tenanter/region_test.go @@ -17,7 +17,6 @@ func TestGetAllRegionIds(t *testing.T) { {name: "ali", args: args{provider: pbtenant.CloudProvider_ali}}, {name: "tencent", args: args{provider: pbtenant.CloudProvider_tencent}}, {name: "huawei", args: args{provider: pbtenant.CloudProvider_huawei}}, - {name: "aws", args: args{provider: pbtenant.CloudProvider_aws}}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/idl/pbpod/pod.proto b/idl/pbpod/pod.proto index 45a6d3d2..6abbc4a1 100644 --- a/idl/pbpod/pod.proto +++ b/idl/pbpod/pod.proto @@ -41,7 +41,7 @@ message PodInstance { message CreatePodsReq { - // 云类型 + // 创建请求集合 repeated CreatePodReq createPodReq = 1; }