diff --git a/api-runtime/common-runtime/CCMCommon.go b/api-runtime/common-runtime/CCMCommon.go index e71b78839..e650ab077 100644 --- a/api-runtime/common-runtime/CCMCommon.go +++ b/api-runtime/common-runtime/CCMCommon.go @@ -460,19 +460,13 @@ func ListVMSpec(connectionName string) ([]*cres.VMSpecInfo, error) { return nil, err } - regionName, _, err := ccm.GetRegionNameByConnectionName(connectionName) - if err != nil { - cblog.Error(err) - return nil, err - } - handler, err := cldConn.CreateVMSpecHandler() if err != nil { cblog.Error(err) return nil, err } - infoList, err := handler.ListVMSpec(regionName) + infoList, err := handler.ListVMSpec() if err != nil { cblog.Error(err) return nil, err @@ -507,18 +501,12 @@ func GetVMSpec(connectionName string, nameID string) (*cres.VMSpecInfo, error) { return nil, err } - regionName, _, err := ccm.GetRegionNameByConnectionName(connectionName) - if err != nil { - cblog.Error(err) - return nil, err - } - handler, err := cldConn.CreateVMSpecHandler() if err != nil { cblog.Error(err) return nil, err } - info, err := handler.GetVMSpec(regionName, nameID) + info, err := handler.GetVMSpec(nameID) if err != nil { cblog.Error(err) return nil, err @@ -543,19 +531,13 @@ func ListOrgVMSpec(connectionName string) (string, error) { return "", err } - regionName, _, err := ccm.GetRegionNameByConnectionName(connectionName) - if err != nil { - cblog.Error(err) - return "", err - } - handler, err := cldConn.CreateVMSpecHandler() if err != nil { cblog.Error(err) return "", err } - infoList, err := handler.ListOrgVMSpec(regionName) + infoList, err := handler.ListOrgVMSpec() if err != nil { cblog.Error(err) return "", err @@ -586,18 +568,12 @@ func GetOrgVMSpec(connectionName string, nameID string) (string, error) { return "", err } - regionName, _, err := ccm.GetRegionNameByConnectionName(connectionName) - if err != nil { - cblog.Error(err) - return "", err - } - handler, err := cldConn.CreateVMSpecHandler() if err != nil { cblog.Error(err) return "", err } - info, err := handler.GetOrgVMSpec(regionName, nameID) + info, err := handler.GetOrgVMSpec(nameID) if err != nil { cblog.Error(err) return "", err diff --git a/cloud-control-manager/cloud-driver/drivers/alibaba/resources/VMSpecHandler.go b/cloud-control-manager/cloud-driver/drivers/alibaba/resources/VMSpecHandler.go index ef6a23618..501920e18 100644 --- a/cloud-control-manager/cloud-driver/drivers/alibaba/resources/VMSpecHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/alibaba/resources/VMSpecHandler.go @@ -79,7 +79,7 @@ func ExtractVMSpecInfo(Region string, instanceTypeInfo ecs.InstanceType) irs.VMS return vmSpecInfo } -func (vmSpecHandler *AlibabaVmSpecHandler) ListVMSpec(RegionDel string) ([]*irs.VMSpecInfo, error) { +func (vmSpecHandler *AlibabaVmSpecHandler) ListVMSpec() ([]*irs.VMSpecInfo, error) { Region := vmSpecHandler.Region.Region cblogger.Infof("Start ListVMSpec(Session Region:[%s])", Region) var vMSpecInfoList []*irs.VMSpecInfo @@ -125,7 +125,7 @@ func (vmSpecHandler *AlibabaVmSpecHandler) ListVMSpec(RegionDel string) ([]*irs. return vMSpecInfoList, nil } -func (vmSpecHandler *AlibabaVmSpecHandler) GetVMSpec(RegionDel string, Name string) (irs.VMSpecInfo, error) { +func (vmSpecHandler *AlibabaVmSpecHandler) GetVMSpec(Name string) (irs.VMSpecInfo, error) { Region := vmSpecHandler.Region.Region cblogger.Infof("Start GetVMSpec(Session Region:[%s], Name:[%s])", Region, Name) @@ -184,7 +184,7 @@ func (vmSpecHandler *AlibabaVmSpecHandler) GetVMSpec(RegionDel string, Name stri } // Alibaba Cloud의 정보 그대로를 가공 없이 JSON으로 리턴 함. -func (vmSpecHandler *AlibabaVmSpecHandler) ListOrgVMSpec(RegionDel string) (string, error) { +func (vmSpecHandler *AlibabaVmSpecHandler) ListOrgVMSpec() (string, error) { Region := vmSpecHandler.Region.Region cblogger.Infof("Start ListOrgVMSpec(Session Region:[%s])", Region) @@ -227,7 +227,7 @@ func (vmSpecHandler *AlibabaVmSpecHandler) ListOrgVMSpec(RegionDel string) (stri } // AWS의 정보 그대로를 가공 없이 JSON으로 리턴 함. -func (vmSpecHandler *AlibabaVmSpecHandler) GetOrgVMSpec(RegionDel string, Name string) (string, error) { +func (vmSpecHandler *AlibabaVmSpecHandler) GetOrgVMSpec(Name string) (string, error) { Region := vmSpecHandler.Region.Region cblogger.Infof("Start GetOrgVMSpec(Session Region:[%s], Name:[%s])", Region, Name) request := ecs.CreateDescribeInstanceTypesRequest() diff --git a/cloud-control-manager/cloud-driver/drivers/aws/resources/VMSpecHandler.go b/cloud-control-manager/cloud-driver/drivers/aws/resources/VMSpecHandler.go index d1515aae4..cde66524f 100644 --- a/cloud-control-manager/cloud-driver/drivers/aws/resources/VMSpecHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/aws/resources/VMSpecHandler.go @@ -163,7 +163,7 @@ func (vmSpecHandler *AwsVmSpecHandler) ListVMSpecAZ(ZoneName string) (map[string return mapVmSpecIds, nil } -func (vmSpecHandler *AwsVmSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecInfo, error) { +func (vmSpecHandler *AwsVmSpecHandler) ListVMSpec() ([]*irs.VMSpecInfo, error) { cblogger.Infof("Start ListVMSpec(Region:[%s] / Zone:[%s])", vmSpecHandler.Region.Region, vmSpecHandler.Region.Zone) zoneId := vmSpecHandler.Region.Zone @@ -269,7 +269,7 @@ func (vmSpecHandler *AwsVmSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecI return vMSpecInfoList, nil } -func (vmSpecHandler *AwsVmSpecHandler) GetVMSpec(Region string, Name string) (irs.VMSpecInfo, error) { +func (vmSpecHandler *AwsVmSpecHandler) GetVMSpec(Name string) (irs.VMSpecInfo, error) { cblogger.Infof("Start GetVMSpec(Region:[%s], Name:[%s])", vmSpecHandler.Region.Region, Name) //https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstanceTypes.html @@ -330,7 +330,7 @@ func (vmSpecHandler *AwsVmSpecHandler) GetVMSpec(Region string, Name string) (ir } // AWS의 정보 그대로를 가공 없이 JSON으로 리턴 함. -func (vmSpecHandler *AwsVmSpecHandler) ListOrgVMSpec(Region string) (string, error) { +func (vmSpecHandler *AwsVmSpecHandler) ListOrgVMSpec() (string, error) { cblogger.Infof("Start ListOrgVMSpec(Region:[%s])", vmSpecHandler.Region.Region) zoneId := vmSpecHandler.Region.Zone @@ -432,7 +432,7 @@ func (vmSpecHandler *AwsVmSpecHandler) ListOrgVMSpec(Region string) (string, err } // AWS의 정보 그대로를 가공 없이 JSON으로 리턴 함. -func (vmSpecHandler *AwsVmSpecHandler) ListOrgVMSpecOld(Region string) (string, error) { +func (vmSpecHandler *AwsVmSpecHandler) ListOrgVMSpecOld() (string, error) { cblogger.Infof("Start ListOrgVMSpec(Region:[%s])", vmSpecHandler.Region.Region) input := &ec2.DescribeInstanceTypesInput{ @@ -458,7 +458,7 @@ func (vmSpecHandler *AwsVmSpecHandler) ListOrgVMSpecOld(Region string) (string, } // AWS의 정보 그대로를 가공 없이 JSON으로 리턴 함. -func (vmSpecHandler *AwsVmSpecHandler) GetOrgVMSpec(Region string, Name string) (string, error) { +func (vmSpecHandler *AwsVmSpecHandler) GetOrgVMSpec(Name string) (string, error) { cblogger.Infof("Start GetOrgVMSpec(Region:[%s], Name:[%s])", vmSpecHandler.Region.Region, Name) input := &ec2.DescribeInstanceTypesInput{ diff --git a/cloud-control-manager/cloud-driver/drivers/azure/resources/VMSpecHandler.go b/cloud-control-manager/cloud-driver/drivers/azure/resources/VMSpecHandler.go index 79c37f20a..735464da0 100644 --- a/cloud-control-manager/cloud-driver/drivers/azure/resources/VMSpecHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/azure/resources/VMSpecHandler.go @@ -36,7 +36,7 @@ func setterVmSpec(region string, vmSpec compute.VirtualMachineSize) *irs.VMSpecI return vmSpecInfo } -func (vmSpecHandler *AzureVmSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecInfo, error) { +func (vmSpecHandler *AzureVmSpecHandler) ListVMSpec() ([]*irs.VMSpecInfo, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Region, call.VMSPEC, VMSpec, "ListVMSpec()") @@ -56,7 +56,7 @@ func (vmSpecHandler *AzureVmSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpe return vmSpecList, nil } -func (vmSpecHandler *AzureVmSpecHandler) GetVMSpec(Region string, Name string) (irs.VMSpecInfo, error) { +func (vmSpecHandler *AzureVmSpecHandler) GetVMSpec(Name string) (irs.VMSpecInfo, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Region, call.VMSPEC, Name, "GetVMSpec()") @@ -82,7 +82,7 @@ func (vmSpecHandler *AzureVmSpecHandler) GetVMSpec(Region string, Name string) ( return irs.VMSpecInfo{}, getErr } -func (vmSpecHandler *AzureVmSpecHandler) ListOrgVMSpec(Region string) (string, error) { +func (vmSpecHandler *AzureVmSpecHandler) ListOrgVMSpec() (string, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Region, call.VMSPEC, VMSpec, "ListOrgVMSpec()") @@ -110,7 +110,7 @@ func (vmSpecHandler *AzureVmSpecHandler) ListOrgVMSpec(Region string) (string, e return jsonString, nil } -func (vmSpecHandler *AzureVmSpecHandler) GetOrgVMSpec(Region string, Name string) (string, error) { +func (vmSpecHandler *AzureVmSpecHandler) GetOrgVMSpec(Name string) (string, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Region, call.VMSPEC, Name, "GetOrgVMSpec()") diff --git a/cloud-control-manager/cloud-driver/drivers/cloudit/resources/VMSpecHandler.go b/cloud-control-manager/cloud-driver/drivers/cloudit/resources/VMSpecHandler.go index 39aba8d80..4796be5a1 100644 --- a/cloud-control-manager/cloud-driver/drivers/cloudit/resources/VMSpecHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/cloudit/resources/VMSpecHandler.go @@ -45,7 +45,7 @@ func setterVMSpec(region string, vmSpec specs.VMSpecInfo) *irs.VMSpecInfo { return vmSpecInfo } -func (vmSpecHandler *ClouditVMSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecInfo, error) { +func (vmSpecHandler *ClouditVMSpecHandler) ListVMSpec() ([]*irs.VMSpecInfo, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Client.IdentityEndpoint, call.VMSPEC, VMSpec, "ListVMSpec()") @@ -73,7 +73,7 @@ func (vmSpecHandler *ClouditVMSpecHandler) ListVMSpec(Region string) ([]*irs.VMS return vmSpecList, nil } -func (vmSpecHandler *ClouditVMSpecHandler) GetVMSpec(Region string, Name string) (irs.VMSpecInfo, error) { +func (vmSpecHandler *ClouditVMSpecHandler) GetVMSpec(Name string) (irs.VMSpecInfo, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Client.IdentityEndpoint, call.VMSPEC, Name, "GetVMSpec()") @@ -90,7 +90,7 @@ func (vmSpecHandler *ClouditVMSpecHandler) GetVMSpec(Region string, Name string) return *specInfo, nil } -func (vmSpecHandler *ClouditVMSpecHandler) ListOrgVMSpec(Region string) (string, error) { +func (vmSpecHandler *ClouditVMSpecHandler) ListOrgVMSpec() (string, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Client.IdentityEndpoint, call.VMSPEC, VMSpec, "ListOrgVMSpec()") @@ -127,7 +127,7 @@ func (vmSpecHandler *ClouditVMSpecHandler) ListOrgVMSpec(Region string) (string, return jsonString, nil } -func (vmSpecHandler *ClouditVMSpecHandler) GetOrgVMSpec(Region string, Name string) (string, error) { +func (vmSpecHandler *ClouditVMSpecHandler) GetOrgVMSpec(Name string) (string, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Client.IdentityEndpoint, call.VMSPEC, Name, "GetOrgVMSpec()") diff --git a/cloud-control-manager/cloud-driver/drivers/gcp/resources/VMSpecHandler.go b/cloud-control-manager/cloud-driver/drivers/gcp/resources/VMSpecHandler.go index cd5a8e40a..924d8049c 100644 --- a/cloud-control-manager/cloud-driver/drivers/gcp/resources/VMSpecHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/gcp/resources/VMSpecHandler.go @@ -30,7 +30,7 @@ type GCPVMSpecHandler struct { Credential idrv.CredentialInfo } -func (vmSpecHandler *GCPVMSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecInfo, error) { +func (vmSpecHandler *GCPVMSpecHandler) ListVMSpec() ([]*irs.VMSpecInfo, error) { projectID := vmSpecHandler.Credential.ProjectID zone := vmSpecHandler.Region.Zone @@ -72,7 +72,7 @@ func (vmSpecHandler *GCPVMSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecI return vmSpecInfo, nil } -func (vmSpecHandler *GCPVMSpecHandler) GetVMSpec(Region string, Name string) (irs.VMSpecInfo, error) { +func (vmSpecHandler *GCPVMSpecHandler) GetVMSpec(Name string) (irs.VMSpecInfo, error) { // default info projectID := vmSpecHandler.Credential.ProjectID zone := vmSpecHandler.Region.Zone @@ -122,7 +122,7 @@ func (vmSpecHandler *GCPVMSpecHandler) GetVMSpec(Region string, Name string) (ir return vmSpecInfo, nil } -func (vmSpecHandler *GCPVMSpecHandler) ListOrgVMSpec(Region string) (string, error) { +func (vmSpecHandler *GCPVMSpecHandler) ListOrgVMSpec() (string, error) { projectID := vmSpecHandler.Credential.ProjectID zone := vmSpecHandler.Region.Zone @@ -153,7 +153,7 @@ func (vmSpecHandler *GCPVMSpecHandler) ListOrgVMSpec(Region string) (string, err return string(j), err } -func (vmSpecHandler *GCPVMSpecHandler) GetOrgVMSpec(Region string, Name string) (string, error) { +func (vmSpecHandler *GCPVMSpecHandler) GetOrgVMSpec(Name string) (string, error) { projectID := vmSpecHandler.Credential.ProjectID zone := vmSpecHandler.Region.Zone diff --git a/cloud-control-manager/cloud-driver/drivers/ibmcloud-vpc/resources/VmSpecHandler.go b/cloud-control-manager/cloud-driver/drivers/ibmcloud-vpc/resources/VMSpecHandler.go similarity index 93% rename from cloud-control-manager/cloud-driver/drivers/ibmcloud-vpc/resources/VmSpecHandler.go rename to cloud-control-manager/cloud-driver/drivers/ibmcloud-vpc/resources/VMSpecHandler.go index 7889634b2..6ac61168e 100644 --- a/cloud-control-manager/cloud-driver/drivers/ibmcloud-vpc/resources/VmSpecHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/ibmcloud-vpc/resources/VMSpecHandler.go @@ -20,7 +20,7 @@ type IbmVmSpecHandler struct { Ctx context.Context } -func (vmSpecHandler *IbmVmSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecInfo, error) { +func (vmSpecHandler *IbmVmSpecHandler) ListVMSpec() ([]*irs.VMSpecInfo, error) { hiscallInfo := GetCallLogScheme(vmSpecHandler.Region, call.VMSPEC, "VMSpec", "ListVMSpec()") start := call.Start() @@ -47,7 +47,7 @@ func (vmSpecHandler *IbmVmSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecI LoggingInfo(hiscallInfo, start) return specList, nil } -func (vmSpecHandler *IbmVmSpecHandler) GetVMSpec(Region string, Name string) (irs.VMSpecInfo, error) { +func (vmSpecHandler *IbmVmSpecHandler) GetVMSpec(Name string) (irs.VMSpecInfo, error) { hiscallInfo := GetCallLogScheme(vmSpecHandler.Region, call.VMSPEC, Name, "GetVMSpec()") start := call.Start() if Name == "" { @@ -75,7 +75,7 @@ func (vmSpecHandler *IbmVmSpecHandler) GetVMSpec(Region string, Name string) (ir return vmSpecInfo, nil } -func (vmSpecHandler *IbmVmSpecHandler) ListOrgVMSpec(Region string) (string, error) { +func (vmSpecHandler *IbmVmSpecHandler) ListOrgVMSpec() (string, error) { hiscallInfo := GetCallLogScheme(vmSpecHandler.Region, call.VMSPEC, "OrgVMSpec", "ListOrgVMSpec()") start := call.Start() @@ -109,7 +109,7 @@ func (vmSpecHandler *IbmVmSpecHandler) ListOrgVMSpec(Region string) (string, err LoggingInfo(hiscallInfo, start) return jsonString, nil } -func (vmSpecHandler *IbmVmSpecHandler) GetOrgVMSpec(Region string, Name string) (string, error) { +func (vmSpecHandler *IbmVmSpecHandler) GetOrgVMSpec(Name string) (string, error) { hiscallInfo := GetCallLogScheme(vmSpecHandler.Region, call.VMSPEC, "OrgVMSpec", "GetOrgVMSpec()") start := call.Start() if Name == "" { diff --git a/cloud-control-manager/cloud-driver/drivers/mock/resources/VMHandler.go b/cloud-control-manager/cloud-driver/drivers/mock/resources/VMHandler.go index eac9e7387..01785418f 100644 --- a/cloud-control-manager/cloud-driver/drivers/mock/resources/VMHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/mock/resources/VMHandler.go @@ -49,7 +49,7 @@ func (vmHandler *MockVMHandler) StartVM(vmReqInfo irs.VMReqInfo) (irs.VMInfo, er // spec validation vmSpecHandler := MockVMSpecHandler{mockName} - validatedSpecInfo, err := vmSpecHandler.GetVMSpec(vmHandler.Region.Region, vmReqInfo.VMSpecName) + validatedSpecInfo, err := vmSpecHandler.GetVMSpec(vmReqInfo.VMSpecName) if err != nil { cblogger.Error(err) return irs.VMInfo{}, err diff --git a/cloud-control-manager/cloud-driver/drivers/mock/resources/VMSpecHandler.go b/cloud-control-manager/cloud-driver/drivers/mock/resources/VMSpecHandler.go index e6d8e8777..3c22cb91b 100644 --- a/cloud-control-manager/cloud-driver/drivers/mock/resources/VMSpecHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/mock/resources/VMSpecHandler.go @@ -48,7 +48,7 @@ func PrepareVMSpec(mockName string) { vmSpecInfoMap[mockName] = prepareVMSpecInfoList } -func (vmSpecHandler *MockVMSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecInfo, error) { +func (vmSpecHandler *MockVMSpecHandler) ListVMSpec() ([]*irs.VMSpecInfo, error) { cblogger := cblog.GetLogger("CB-SPIDER") cblogger.Info("Mock Driver: called ListVMSpec()!") @@ -65,11 +65,11 @@ func (vmSpecHandler *MockVMSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpec return resultList, nil } -func (vmSpecHandler *MockVMSpecHandler) GetVMSpec(Region string, Name string) (irs.VMSpecInfo, error) { +func (vmSpecHandler *MockVMSpecHandler) GetVMSpec(Name string) (irs.VMSpecInfo, error) { cblogger := cblog.GetLogger("CB-SPIDER") cblogger.Info("Mock Driver: called GetVMSpec()!") - infoList, err := vmSpecHandler.ListVMSpec(Region) + infoList, err := vmSpecHandler.ListVMSpec() if err != nil { cblogger.Error(err) return irs.VMSpecInfo{}, err @@ -84,13 +84,13 @@ func (vmSpecHandler *MockVMSpecHandler) GetVMSpec(Region string, Name string) (i return irs.VMSpecInfo{}, fmt.Errorf("%s VMSpec does not exist!!", Name) } -func (vmSpecHandler *MockVMSpecHandler) ListOrgVMSpec(Region string) (string, error) { // return string: json format +func (vmSpecHandler *MockVMSpecHandler) ListOrgVMSpec() (string, error) { // return string: json format cblogger := cblog.GetLogger("CB-SPIDER") cblogger.Info("Mock Driver: called ListOrgVMSpec()!") return "", nil } -func (vmSpecHandler *MockVMSpecHandler) GetOrgVMSpec(Region string, Name string) (string, error) { // return string: json format +func (vmSpecHandler *MockVMSpecHandler) GetOrgVMSpec(Name string) (string, error) { // return string: json format cblogger := cblog.GetLogger("CB-SPIDER") cblogger.Info("Mock Driver: called GetOrgVMSpec()!") return "", nil diff --git a/cloud-control-manager/cloud-driver/drivers/openstack/resources/VMSpecHandler.go b/cloud-control-manager/cloud-driver/drivers/openstack/resources/VMSpecHandler.go index b1be6b8cc..b1ed776b0 100644 --- a/cloud-control-manager/cloud-driver/drivers/openstack/resources/VMSpecHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/openstack/resources/VMSpecHandler.go @@ -36,7 +36,7 @@ func setterVMSpec(region string, vmSpec flavors.Flavor) *irs.VMSpecInfo { return vmSpecInfo } -func (vmSpecHandler *OpenStackVMSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecInfo, error) { +func (vmSpecHandler *OpenStackVMSpecHandler) ListVMSpec() ([]*irs.VMSpecInfo, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Client.IdentityEndpoint, call.VMSPEC, VMSpec, "ListVMSpec()") @@ -63,7 +63,7 @@ func (vmSpecHandler *OpenStackVMSpecHandler) ListVMSpec(Region string) ([]*irs.V return vmSpecList, nil } -func (vmSpecHandler *OpenStackVMSpecHandler) GetVMSpec(Region string, Name string) (irs.VMSpecInfo, error) { +func (vmSpecHandler *OpenStackVMSpecHandler) GetVMSpec(Name string) (irs.VMSpecInfo, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Client.IdentityEndpoint, call.VMSPEC, Name, "GetVMSpec()") @@ -87,7 +87,7 @@ func (vmSpecHandler *OpenStackVMSpecHandler) GetVMSpec(Region string, Name strin return *vmSpecInfo, nil } -func (vmSpecHandler *OpenStackVMSpecHandler) ListOrgVMSpec(Region string) (string, error) { +func (vmSpecHandler *OpenStackVMSpecHandler) ListOrgVMSpec() (string, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Client.IdentityEndpoint, call.VMSPEC, VMSpec, "ListOrgVMSpec()") @@ -123,7 +123,7 @@ func (vmSpecHandler *OpenStackVMSpecHandler) ListOrgVMSpec(Region string) (strin return jsonString, nil } -func (vmSpecHandler *OpenStackVMSpecHandler) GetOrgVMSpec(Region string, Name string) (string, error) { +func (vmSpecHandler *OpenStackVMSpecHandler) GetOrgVMSpec(Name string) (string, error) { // log HisCall hiscallInfo := GetCallLogScheme(vmSpecHandler.Client.IdentityEndpoint, call.VMSPEC, Name, "GetOrgVMSpec()") diff --git a/cloud-control-manager/cloud-driver/drivers/tencent/resources/VMSpecHandler.go b/cloud-control-manager/cloud-driver/drivers/tencent/resources/VMSpecHandler.go index 5b452ab8c..1231fde1c 100644 --- a/cloud-control-manager/cloud-driver/drivers/tencent/resources/VMSpecHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/tencent/resources/VMSpecHandler.go @@ -19,7 +19,7 @@ type TencentVmSpecHandler struct { } //@TODO : Region : zone id(Region이 아닌 zone id로 조회해야 함.) -func (vmSpecHandler *TencentVmSpecHandler) ListVMSpec(Region string) ([]*irs.VMSpecInfo, error) { +func (vmSpecHandler *TencentVmSpecHandler) ListVMSpec() ([]*irs.VMSpecInfo, error) { //cblogger.Infof("ListVMSpec(ZoneId:[%s])", Region) zoneId := vmSpecHandler.Region.Zone @@ -76,7 +76,7 @@ func (vmSpecHandler *TencentVmSpecHandler) ListVMSpec(Region string) ([]*irs.VMS return vmSpecInfoList, nil } -func (vmSpecHandler *TencentVmSpecHandler) GetVMSpec(Region string, Name string) (irs.VMSpecInfo, error) { +func (vmSpecHandler *TencentVmSpecHandler) GetVMSpec(Name string) (irs.VMSpecInfo, error) { //cblogger.Infof("Start GetVMSpec(ZoneId:[%s], Name:[%s])", Region, Name) cblogger.Infof("Spec Name:[%s]", Name) @@ -135,7 +135,7 @@ func (vmSpecHandler *TencentVmSpecHandler) GetVMSpec(Region string, Name string) } } -func (vmSpecHandler *TencentVmSpecHandler) ListOrgVMSpec(Region string) (string, error) { +func (vmSpecHandler *TencentVmSpecHandler) ListOrgVMSpec() (string, error) { //cblogger.Infof("ListOrgVMSpec(ZoneId:[%s])", Region) zoneId := vmSpecHandler.Region.Zone @@ -189,7 +189,7 @@ func (vmSpecHandler *TencentVmSpecHandler) ListOrgVMSpec(Region string) (string, return jsonString, errJson } -func (vmSpecHandler *TencentVmSpecHandler) GetOrgVMSpec(Region string, Name string) (string, error) { +func (vmSpecHandler *TencentVmSpecHandler) GetOrgVMSpec(Name string) (string, error) { cblogger.Infof("Spec Name:[%s]", Name) //cblogger.Infof("Start GetOrgVMSpec(ZoneId:[%s], Name:[%s])", Region, Name) diff --git a/cloud-control-manager/cloud-driver/interfaces/resources/VMSpecHandler.go b/cloud-control-manager/cloud-driver/interfaces/resources/VMSpecHandler.go index be2fb95d8..f065b84de 100644 --- a/cloud-control-manager/cloud-driver/interfaces/resources/VMSpecHandler.go +++ b/cloud-control-manager/cloud-driver/interfaces/resources/VMSpecHandler.go @@ -34,10 +34,9 @@ type GpuInfo struct { type VMSpecHandler interface { - // Region: AWS=Region, GCP=Zone, Azure=Location - ListVMSpec(Region string) ([]*VMSpecInfo, error) - GetVMSpec(Region string, Name string) (VMSpecInfo, error) + ListVMSpec() ([]*VMSpecInfo, error) + GetVMSpec(Name string) (VMSpecInfo, error) - ListOrgVMSpec(Region string) (string, error) // return string: json format - GetOrgVMSpec(Region string, Name string) (string, error) // return string: json format + ListOrgVMSpec() (string, error) // return string: json format + GetOrgVMSpec(Name string) (string, error) // return string: json format } diff --git a/develop.env b/develop.env index 68087e1e3..d8f00ecf4 100644 --- a/develop.env +++ b/develop.env @@ -32,6 +32,8 @@ alias cdopenstack='cd $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers/ alias cdcloudit='cd $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers/cloudit' alias cddocker='cd $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers/docker' alias cdmock='cd $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers/mock' +alias cdtencent='cd $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers/tencent' +alias cdibm='cd $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers/ibmcloud-vpc' # AdminWeb alias cdadminweb='cd $CBSPIDER_ROOT/api-runtime/rest-runtime/admin-web'