fix: 优化azure资源同步

pkg/multicloud/azure/classic_disk.go

@@ -48,7 +48,7 @@ type SClassicDisk struct {
 	StorageAccount  SubResource
 }
 
-func (self *SRegion) GetStorageAccountsDisksWithSnapshots(storageaccounts ...*SStorageAccount) ([]SClassicDisk, []SClassicSnapshot, error) {
+func (self *SRegion) GetStorageAccountsDisksWithSnapshots(storageaccounts ...SStorageAccount) ([]SClassicDisk, []SClassicSnapshot, error) {
 	disks, snapshots := []SClassicDisk{}, []SClassicSnapshot{}
 	for i := 0; i < len(storageaccounts); i++ {
 		_disks, _snapshots, err := self.GetStorageAccountDisksWithSnapshots(storageaccounts[i])
@@ -61,7 +61,7 @@ func (self *SRegion) GetStorageAccountsDisksWithSnapshots(storageaccounts ...*SS
 	return disks, snapshots, nil
 }
 
-func (self *SRegion) GetStorageAccountDisksWithSnapshots(storageaccount *SStorageAccount) ([]SClassicDisk, []SClassicSnapshot, error) {
+func (self *SRegion) GetStorageAccountDisksWithSnapshots(storageaccount SStorageAccount) ([]SClassicDisk, []SClassicSnapshot, error) {
 	disks, snapshots := []SClassicDisk{}, []SClassicSnapshot{}
 	containers, err := storageaccount.GetContainers()
 	if err != nil {

pkg/multicloud/azure/classic_eip.go

@@ -15,6 +15,7 @@
 package azure
 
 import (
+	"net/url"
 	"strings"
 	"time"
 
@@ -134,7 +135,7 @@ func (self *SClassicEipAddress) IsEmulated() bool {
 
 func (region *SRegion) GetClassicEip(eipId string) (*SClassicEipAddress, error) {
 	eip := SClassicEipAddress{region: region}
-	return &eip, region.client.Get(eipId, []string{}, &eip)
+	return &eip, region.get(eipId, url.Values{}, &eip)
 }
 
 func (self *SClassicEipAddress) Refresh() error {
@@ -147,7 +148,7 @@ func (self *SClassicEipAddress) Refresh() error {
 
 func (region *SRegion) GetClassicEips() ([]SClassicEipAddress, error) {
 	eips := []SClassicEipAddress{}
-	err := region.client.ListAll("Microsoft.ClassicNetwork/reservedIps", &eips)
+	err := region.client.list("Microsoft.ClassicNetwork/reservedIps", url.Values{}, &eips)
 	if err != nil {
 		return nil, err
 	}

pkg/multicloud/azure/classic_host.go

@@ -43,7 +43,7 @@ func (self *SClassicHost) GetName() string {
 }
 
 func (self *SClassicHost) GetGlobalId() string {
-	return fmt.Sprintf("%s/%s-classic", self.zone.region.GetGlobalId(), self.zone.region.SubscriptionID)
+	return fmt.Sprintf("%s/%s-classic", self.zone.region.GetGlobalId(), self.zone.region.client.subscriptionId)
 }
 
 func (self *SClassicHost) IsEmulated() bool {

pkg/multicloud/azure/classic_instance.go

@@ -17,6 +17,7 @@ package azure
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"strings"
 	"time"
 
@@ -176,7 +177,7 @@ func (self *SClassicInstance) GetInstanceType() string {
 func (self *SRegion) GetClassicInstances() ([]SClassicInstance, error) {
 	result := []SClassicInstance{}
 	instances := []SClassicInstance{}
-	err := self.client.ListAll("Microsoft.ClassicCompute/virtualMachines", &instances)
+	err := self.client.list("Microsoft.ClassicCompute/virtualMachines", url.Values{}, &instances)
 	if err != nil {
 		return nil, err
 	}
@@ -190,7 +191,9 @@ func (self *SRegion) GetClassicInstances() ([]SClassicInstance, error) {
 
 func (self *SRegion) GetClassicInstance(instanceId string) (*SClassicInstance, error) {
 	instance := SClassicInstance{}
-	return &instance, self.client.Get(instanceId, []string{"$expand=instanceView"}, &instance)
+	params := url.Values{}
+	params.Add("$expand", "instanceView")
+	return &instance, self.get(instanceId, params, &instance)
 }
 
 type ClassicInstanceDiskProperties struct {
@@ -212,7 +215,7 @@ type ClassicInstanceDisk struct {
 
 func (self *SClassicInstance) getDisks() ([]SClassicDisk, error) {
 	disks := []SClassicDisk{}
-	body, err := self.host.zone.region.client.jsonRequest("GET", fmt.Sprintf("%s/disks", self.ID), "")
+	body, err := self.host.zone.region.client.jsonRequest("GET", fmt.Sprintf("%s/disks", self.ID), nil, url.Values{})
 	if err != nil {
 		return nil, err
 	}
@@ -350,10 +353,10 @@ func (self *SClassicInstance) DeleteVM(ctx context.Context) error {
 		return err
 	}
 	if self.Properties.NetworkProfile.NetworkSecurityGroup != nil {
-		self.host.zone.region.client.Delete(self.Properties.NetworkProfile.NetworkSecurityGroup.ID)
+		self.host.zone.region.del(self.Properties.NetworkProfile.NetworkSecurityGroup.ID)
 	}
 	if self.Properties.DomainName != nil {
-		self.host.zone.region.client.Delete(self.Properties.DomainName.ID)
+		self.host.zone.region.del(self.Properties.DomainName.ID)
 	}
 	return nil
 }
@@ -457,7 +460,7 @@ func (self *SClassicInstance) StopVM(ctx context.Context, opts *cloudprovider.Se
 }
 
 func (self *SRegion) StopClassicVM(instanceId string, isForce bool) error {
-	_, err := self.client.PerformAction(instanceId, "shutdown", "")
+	_, err := self.perform(instanceId, "shutdown", nil)
 	return err
 }
 
@@ -511,7 +514,7 @@ func (self *SClassicInstance) AssignSecurityGroup(secgroupId string) error {
 		if self.Properties.NetworkProfile.NetworkSecurityGroup.ID == secgroupId {
 			return nil
 		}
-		self.host.zone.region.client.Delete(fmt.Sprintf("%s/associatedNetworkSecurityGroups/%s", self.ID, self.Properties.NetworkProfile.NetworkSecurityGroup.Name))
+		self.host.zone.region.del(fmt.Sprintf("%s/associatedNetworkSecurityGroups/%s", self.ID, self.Properties.NetworkProfile.NetworkSecurityGroup.Name))
 	}
 
 	secgroup, err := self.host.zone.region.GetClassicSecurityGroupDetails(secgroupId)
@@ -528,7 +531,7 @@ func (self *SClassicInstance) AssignSecurityGroup(secgroupId string) error {
 			},
 		},
 	}
-	return self.host.zone.region.client.Update(jsonutils.Marshal(data), nil)
+	return self.host.zone.region.update(jsonutils.Marshal(data), nil)
 }
 
 func (self *SClassicInstance) GetBillingType() string {

pkg/multicloud/azure/classic_network.go

@@ -67,7 +67,7 @@ func (self *SClassicNetwork) Delete() error {
 		}
 		subnets = append(subnets, network)
 	}
-	return self.wire.vpc.region.client.Update(jsonutils.Marshal(vpc), self.wire.vpc)
+	return self.wire.vpc.region.update(jsonutils.Marshal(vpc), self.wire.vpc)
 }
 
 func (self *SClassicNetwork) GetGateway() string {

pkg/multicloud/azure/classic_secruitygroup.go

@@ -17,6 +17,7 @@ package azure
 import (
 	"fmt"
 	"net"
+	"net/url"
 	"strconv"
 	"strings"
 	"unicode"
@@ -186,12 +187,12 @@ func (region *SRegion) CreateClassicSecurityGroup(name string) (*SClassicSecurit
 		Type:     "Microsoft.ClassicNetwork/networkSecurityGroups",
 		Location: region.Name,
 	}
-	return &secgroup, region.client.Create(jsonutils.Marshal(secgroup), &secgroup)
+	return &secgroup, region.create("", jsonutils.Marshal(secgroup), &secgroup)
 }
 
 func (region *SRegion) GetClassicSecurityGroups(name string) ([]SClassicSecurityGroup, error) {
 	secgroups := []SClassicSecurityGroup{}
-	err := region.client.ListAll("Microsoft.ClassicNetwork/networkSecurityGroups", &secgroups)
+	err := region.client.list("Microsoft.ClassicNetwork/networkSecurityGroups", url.Values{}, &secgroups)
 	if err != nil {
 		return nil, err
 	}
@@ -206,11 +207,11 @@ func (region *SRegion) GetClassicSecurityGroups(name string) ([]SClassicSecurity
 
 func (region *SRegion) GetClassicSecurityGroupDetails(secgroupId string) (*SClassicSecurityGroup, error) {
 	secgroup := SClassicSecurityGroup{region: region}
-	return &secgroup, region.client.Get(secgroupId, []string{}, &secgroup)
+	return &secgroup, region.get(secgroupId, url.Values{}, &secgroup)
 }
 
 func (region *SRegion) deleteClassicSecurityGroup(secgroupId string) error {
-	return region.client.Delete(secgroupId)
+	return region.del(secgroupId)
 }
 
 func (self *SClassicSecurityGroup) Delete() error {
@@ -289,7 +290,10 @@ func convertClassicSecurityGroupRules(rule cloudprovider.SecurityRule) ([]SClass
 
 func (self *SRegion) getClassicSecurityGroupRules(secgroupId string) ([]SClassicSecurityGroupRule, error) {
 	rules := []SClassicSecurityGroupRule{}
-	result, err := self.client.jsonRequest("GET", fmt.Sprintf("%s/securityRules?api-version=2015-06-01", secgroupId), "")
+	params := url.Values{}
+	params.Set("api-version", "2015-06-01")
+	resource := fmt.Sprintf("%s/securityRules", secgroupId)
+	result, err := self.client.jsonRequest("GET", resource, nil, params)
 	if err != nil {
 		return nil, err
 	}
@@ -297,8 +301,10 @@ func (self *SRegion) getClassicSecurityGroupRules(secgroupId string) ([]SClassic
 }
 
 func (self *SRegion) addClassicSecgroupRule(secgroupId string, rule SClassicSecurityGroupRule) error {
-	url := fmt.Sprintf("%s/securityRules/%s?api-version=2015-06-01", secgroupId, rule.Name)
-	_, err := self.client.jsonRequest("PUT", url, jsonutils.Marshal(rule).String())
+	resource := fmt.Sprintf("%s/securityRules/%s", secgroupId, rule.Name)
+	params := url.Values{}
+	params.Set("api-version", "2015-06-01")
+	_, err := self.client.jsonRequest("PUT", resource, jsonutils.Marshal(rule), params)
 	return err
 }
 
@@ -308,7 +314,7 @@ func (self *SClassicSecurityGroup) GetProjectId() string {
 
 func (self *SClassicSecurityGroup) SyncRules(common, inAdds, outAdds, inDels, outDels []cloudprovider.SecurityRule) error {
 	for _, r := range append(inDels, outDels...) {
-		err := self.region.client.Delete(r.ExternalId)
+		err := self.region.del(r.ExternalId)
 		if err != nil {
 			return errors.Wrapf(err, "Delete(%s)", r.ExternalId)
 		}

pkg/multicloud/azure/classic_storage.go

@@ -17,6 +17,7 @@ package azure
 import (
 	"strings"
 
+	"github.com/pkg/errors"
 	"yunion.io/x/jsonutils"
 
 	api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -100,7 +101,10 @@ func (self *SClassicStorage) GetIDiskById(diskId string) (cloudprovider.ICloudDi
 
 func (self *SClassicStorage) GetIDisks() ([]cloudprovider.ICloudDisk, error) {
 	storageaccount, err := self.zone.region.GetStorageAccountDetail(self.ID)
-	disks, _, err := self.zone.region.GetStorageAccountDisksWithSnapshots(storageaccount)
+	if err != nil {
+		return nil, errors.Wrapf(err, "GetStorageAccountDetail")
+	}
+	disks, _, err := self.zone.region.GetStorageAccountDisksWithSnapshots(*storageaccount)
 	if err != nil {
 		return nil, err
 	}

pkg/multicloud/azure/classic_vpc.go

@@ -16,6 +16,7 @@ package azure
 
 import (
 	"fmt"
+	"net/url"
 	"strings"
 
 	"yunion.io/x/jsonutils"
@@ -91,7 +92,7 @@ func (self *SClassicVpc) GetCidrBlock() string {
 }
 
 func (self *SClassicVpc) Delete() error {
-	return self.region.client.Delete(self.ID)
+	return self.region.del(self.ID)
 }
 
 func (self *SClassicVpc) getWire() *SClassicWire {
@@ -103,7 +104,7 @@ func (self *SClassicVpc) getWire() *SClassicWire {
 
 func (region *SRegion) GetClassicVpc(vpcId string) (*SClassicVpc, error) {
 	vpc := SClassicVpc{region: region}
-	return &vpc, region.client.Get(vpcId, []string{}, &vpc)
+	return &vpc, region.get(vpcId, url.Values{}, &vpc)
 }
 
 func (self *SClassicVpc) fetchNetworks() error {

pkg/multicloud/azure/cloudgroup.go

@@ -122,7 +122,7 @@ func (group *SCloudgroup) DetachSystemPolicy(policyId string) error {
 			return errors.Wrapf(err, "GetRule(%s)", assignment.Properties.RoleDefinitionId)
 		}
 		if role.Properties.RoleName == policyId {
-			return group.client.Delete(assignment.Id)
+			return group.client.gdel(assignment.Id)
 		}
 	}
 	return nil
@@ -142,7 +142,7 @@ func (self *SAzureClient) GetCloudgroups(name string) ([]SCloudgroup, error) {
 	if len(name) > 0 {
 		params.Set("$filter", fmt.Sprintf("displayName eq '%s'", name))
 	}
-	err := self.ListGraphResource("groups", params, &groups)
+	err := self.glist("groups", params, &groups)
 	if err != nil {
 		return nil, err
 	}
@@ -180,7 +180,7 @@ func (self *SAzureClient) GetICloudgroupByName(name string) (cloudprovider.IClou
 func (self *SAzureClient) ListGroupMemebers(id string) ([]SClouduser, error) {
 	users := []SClouduser{}
 	resource := fmt.Sprintf("groups/%s/members", id)
-	err := self.ListGraphResource(resource, nil, &users)
+	err := self.glist(resource, nil, &users)
 	if err != nil {
 		return nil, err
 	}
@@ -188,7 +188,7 @@ func (self *SAzureClient) ListGroupMemebers(id string) ([]SClouduser, error) {
 }
 
 func (self *SAzureClient) DeleteGroup(id string) error {
-	return self.DeleteGraph(fmt.Sprintf("%s/groups/%s?api-version=1.6", self.tenantId, id))
+	return self.gdel(fmt.Sprintf("%s/groups/%s", self.tenantId, id))
 }
 
 func (self *SAzureClient) CreateGroup(name, desc string) (*SCloudgroup, error) {
@@ -202,7 +202,7 @@ func (self *SAzureClient) CreateGroup(name, desc string) (*SCloudgroup, error) {
 		params["Description"] = desc
 	}
 	group := SCloudgroup{client: self}
-	err := self.CreateGraphResource("groups", jsonutils.Marshal(params), &group)
+	err := self.gcreate("groups", jsonutils.Marshal(params), &group)
 	if err != nil {
 		return nil, errors.Wrap(err, "Create")
 	}
@@ -220,7 +220,7 @@ func (self *SAzureClient) RemoveGroupUser(id, userName string) error {
 	if len(users) > 1 {
 		return cloudprovider.ErrDuplicateId
 	}
-	return self.DeleteGraph(fmt.Sprintf("%s/groups/%s/$links/members/%s", self.tenantId, id, users[0].ObjectId))
+	return self.gdel(fmt.Sprintf("%s/groups/%s/$links/members/%s", self.tenantId, id, users[0].ObjectId))
 }
 
 func (self *SAzureClient) CreateICloudgroup(name, desc string) (cloudprovider.ICloudgroup, error) {
@@ -247,7 +247,7 @@ func (self *SAzureClient) AddGroupUser(id, userName string) error {
 	params := map[string]string{
 		"url": fmt.Sprintf("%s%s/directoryObjects/%s", self.domain, self.tenantId, users[0].ObjectId),
 	}
-	err = self.CreateGraphResource(resource, jsonutils.Marshal(params), nil)
+	err = self.gcreate(resource, jsonutils.Marshal(params), nil)
 	if err != nil && !strings.Contains(err.Error(), "One or more added object references already exist for the following modified properties") {
 		return err
 	}

pkg/multicloud/azure/cloudpolicy.go

@@ -74,11 +74,6 @@ func (role *SCloudpolicy) Delete() error {
 
 func (cli *SAzureClient) GetRoles(name, policyType string) ([]SCloudpolicy, error) {
 	ret := []SCloudpolicy{}
-	subscriptionId, err := cli.getDefaultSubscriptionId()
-	if err != nil {
-		return nil, errors.Wrap(err, "getDefaultSubscriptionId")
-	}
-	params := url.Values{}
 	filter := []string{}
 	if len(name) > 0 {
 		filter = append(filter, fmt.Sprintf("roleName eq '%s'", name))
@@ -86,16 +81,14 @@ func (cli *SAzureClient) GetRoles(name, policyType string) ([]SCloudpolicy, erro
 	if len(policyType) > 0 {
 		filter = append(filter, fmt.Sprintf("Type eq '%s'", policyType))
 	}
+	params := url.Values{}
 	if len(filter) > 0 {
 		params.Set("$filter", strings.Join(filter, " and "))
 	}
-	resource := "providers/Microsoft.Authorization/roleDefinitions"
-	if len(params) > 0 {
-		resource = fmt.Sprintf("%s?%s", resource, params.Encode())
-	}
-	err = cli.listSubscriptionResource(subscriptionId, resource, &ret)
+	resource := "Microsoft.Authorization/roleDefinitions"
+	err := cli.list(resource, params, &ret)
 	if err != nil {
-		return nil, errors.Wrap(err, "listSubscriptionResource")
+		return nil, errors.Wrap(err, "list")
 	}
 	return ret, nil
 }
@@ -150,7 +143,7 @@ func (cli *SAzureClient) AssignPolicy(objectId, roleName, subscriptionId string)
 	}
 	for _, subscriptionId := range subscriptionIds {
 		resource := fmt.Sprintf("subscriptions/%s/providers/Microsoft.Authorization/roleAssignments/%s", subscriptionId, stringutils.UUID4())
-		err = cli.Put(resource, jsonutils.Marshal(body))
+		_, err = cli.put(resource, jsonutils.Marshal(body))
 		if err != nil {
 			return errors.Wrapf(err, "AssignPolicy %s for subscription %s", roleName, subscriptionId)
 		}
@@ -174,28 +167,21 @@ type SAssignment struct {
 
 func (cli *SAzureClient) GetAssignments(objectId string) ([]SAssignment, error) {
 	ret := []SAssignment{}
-	subscriptionId, err := cli.getDefaultSubscriptionId()
-	if err != nil {
-		return nil, errors.Wrap(err, "getDefaultSubscriptionId")
-	}
 	params := url.Values{}
 	if len(objectId) > 0 {
 		params.Set("$filter", fmt.Sprintf("principalId eq '%s'", objectId))
 	}
-	resource := "providers/Microsoft.Authorization/roleAssignments"
-	if len(params) > 0 {
-		resource = fmt.Sprintf("%s?%s", resource, params.Encode())
-	}
-	err = cli.listSubscriptionResource(subscriptionId, resource, &ret)
+	resource := "Microsoft.Authorization/roleAssignments"
+	err := cli.list(resource, params, &ret)
 	if err != nil {
-		return nil, errors.Wrap(err, "listSubscriptionResource")
+		return nil, errors.Wrap(err, "list")
 	}
 	return ret, nil
 }
 
 func (cli *SAzureClient) GetRole(roleId string) (*SCloudpolicy, error) {
 	role := &SCloudpolicy{}
-	err := cli.Get(roleId, nil, role)
+	err := cli.get(roleId, nil, role)
 	if err != nil {
 		return nil, errors.Wrapf(err, "GetRole(%s)", roleId)
 	}

pkg/multicloud/azure/clouduser.go

@@ -119,19 +119,23 @@ func (user *SClouduser) GetICustomCloudpolicies() ([]cloudprovider.ICloudpolicy,
 }
 
 func (user *SClouduser) AttachSystemPolicy(policyId string) error {
-	subscriptionId, err := user.client.getDefaultSubscriptionId()
-	if err != nil {
-		return errors.Wrapf(err, "getDefaultSubscriptionId")
+	for _, subscription := range user.client.subscriptions {
+		err := user.client.AssignPolicy(user.ObjectId, policyId, subscription.SubscriptionId)
+		if err != nil {
+			return errors.Wrapf(err, "AssignPolicy for subscription %s", subscription.SubscriptionId)
+		}
 	}
-	return user.client.AssignPolicy(user.ObjectId, policyId, subscriptionId)
+	return nil
 }
 
 func (user *SClouduser) AttachCustomPolicy(policyId string) error {
-	subscriptionId, err := user.client.getDefaultSubscriptionId()
-	if err != nil {
-		return errors.Wrapf(err, "getDefaultSubscriptionId")
+	for _, subscription := range user.client.subscriptions {
+		err := user.client.AssignPolicy(user.ObjectId, policyId, subscription.SubscriptionId)
+		if err != nil {
+			return errors.Wrapf(err, "AssignPolicy for subscription %s", subscription.SubscriptionId)
+		}
 	}
-	return user.client.AssignPolicy(user.ObjectId, policyId, subscriptionId)
+	return nil
 }
 
 func (user *SClouduser) DetachSystemPolicy(policyId string) error {
@@ -145,7 +149,7 @@ func (user *SClouduser) DetachSystemPolicy(policyId string) error {
 			return errors.Wrapf(err, "GetRule(%s)", assignment.Properties.RoleDefinitionId)
 		}
 		if role.Properties.RoleName == policyId {
-			return user.client.Delete(assignment.Id)
+			return user.client.gdel(assignment.Id)
 		}
 	}
 	return nil
@@ -182,30 +186,13 @@ func (user *SClouduser) GetICloudgroups() ([]cloudprovider.ICloudgroup, error) {
 }
 
 func (self *SAzureClient) GetUserGroups(userId string) ([]SCloudgroup, error) {
-	cli, err := self.getGraphClient()
-	if err != nil {
-		return nil, err
-	}
-
 	resource := fmt.Sprintf("%s/users/%s/memberOf", self.tenantId, userId)
-	resp, err := jsonRequest(cli, "GET", self.domain, resource, self.subscriptionId, "", GraphResource)
-	if err != nil {
-		return nil, err
-	}
-
 	groups := []SCloudgroup{}
-	err = resp.Unmarshal(&groups, "value")
-	if err != nil {
-		return nil, errors.Wrap(err, "resp.Unmarshal")
-	}
-	return groups, nil
+	err := self.glist(resource, url.Values{}, groups)
+	return groups, err
 }
 
 func (self *SAzureClient) ResetClouduserPassword(id, password string) error {
-	cli, err := self.getGraphClient()
-	if err != nil {
-		return err
-	}
 	body := jsonutils.Marshal(map[string]interface{}{
 		"passwordPolicies": "DisablePasswordExpiration, DisableStrongPassword",
 		"passwordProfile": map[string]interface{}{
@@ -213,7 +200,7 @@ func (self *SAzureClient) ResetClouduserPassword(id, password string) error {
 		},
 	})
 	resource := fmt.Sprintf("%s/users/%s", self.tenantId, id)
-	_, err = jsonRequest(cli, "PATCH", self.domain, resource, self.subscriptionId, body.String(), GraphResource)
+	_, err := self.gpatch(resource, body)
 	return err
 }
 
@@ -223,7 +210,7 @@ func (self *SAzureClient) GetCloudusers(name string) ([]SClouduser, error) {
 	if len(name) > 0 {
 		params.Set("$filter", fmt.Sprintf("userPrincipalName eq '%s'", name))
 	}
-	err := self.ListGraphResource("users", params, &users)
+	err := self.glist("users", params, &users)
 	if err != nil {
 		return nil, err
 	}
@@ -231,7 +218,7 @@ func (self *SAzureClient) GetCloudusers(name string) ([]SClouduser, error) {
 }
 
 func (self *SAzureClient) DeleteClouduser(id string) error {
-	return self.DeleteGraph(fmt.Sprintf("%s/users/%s?api-version=1.6", self.tenantId, id))
+	return self.gdel(fmt.Sprintf("%s/users/%s", self.tenantId, id))
 }
 
 func (self *SAzureClient) GetICloudusers() ([]cloudprovider.IClouduser, error) {
@@ -272,9 +259,9 @@ type SDomain struct {
 
 func (self *SAzureClient) GetDomains() ([]SDomain, error) {
 	domains := []SDomain{}
-	err := self.ListGraphResource("domains", nil, &domains)
+	err := self.glist("domains", nil, &domains)
 	if err != nil {
-		return nil, errors.Wrap(err, "ListGraphResource")
+		return nil, errors.Wrap(err, "glist")
 	}
 	return domains, nil
 }
@@ -302,7 +289,7 @@ func (self *SAzureClient) CreateClouduser(name, password string) (*SClouduser, e
 	}
 	params["userPrincipalName"] = fmt.Sprintf("%s@%s", name, domains[0].Name)
 	user := SClouduser{client: self}
-	err = self.CreateGraphResource("users", jsonutils.Marshal(params), &user)
+	err = self.gcreate("users", jsonutils.Marshal(params), &user)
 	if err != nil {
 		return nil, errors.Wrap(err, "Create")
 	}

pkg/multicloud/azure/disk.go

@@ -17,6 +17,7 @@ package azure
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"strings"
 	"time"
 
@@ -118,7 +119,7 @@ func (self *SRegion) CreateDisk(storageType string, name string, sizeGb int32, d
 		}
 		disk.Properties.OsType = image.GetOsType()
 	}
-	return &disk, self.client.CreateWithResourceGroup(resourceGroup, jsonutils.Marshal(disk), &disk)
+	return &disk, self.create(resourceGroup, jsonutils.Marshal(disk), &disk)
 }
 
 func (self *SRegion) DeleteDisk(diskId string) error {
@@ -130,7 +131,7 @@ func (self *SRegion) deleteDisk(diskId string) error {
 		startTime := time.Now()
 		timeout := 5 * time.Minute
 		for {
-			err := self.client.Delete(diskId)
+			err := self.del(diskId)
 			if err == nil {
 				return nil
 			}
@@ -158,20 +159,20 @@ func (self *SRegion) ResizeDisk(diskId string, sizeGb int32) error {
 		}
 		disk.Properties.DiskSizeGB = sizeGb
 		disk.Properties.ProvisioningState = ""
-		return self.client.Update(jsonutils.Marshal(disk), nil)
+		return self.update(jsonutils.Marshal(disk), nil)
 	}
 	return cloudprovider.ErrNotSupported
 }
 
 func (self *SRegion) GetDisk(diskId string) (*SDisk, error) {
 	disk := SDisk{}
-	return &disk, self.client.Get(diskId, []string{}, &disk)
+	return &disk, self.get(diskId, url.Values{}, &disk)
 }
 
 func (self *SRegion) GetDisks() ([]SDisk, error) {
 	result := []SDisk{}
 	disks := []SDisk{}
-	err := self.client.ListAll("Microsoft.Compute/disks", &disks)
+	err := self.client.list("Microsoft.Compute/disks", url.Values{}, &disks)
 	if err != nil {
 		return nil, err
 	}
@@ -346,14 +347,14 @@ func (self *SDisk) GetSnapshotDetail(snapshotId string) (*SSnapshot, error) {
 
 func (region *SRegion) GetSnapshotDetail(snapshotId string) (*SSnapshot, error) {
 	snapshot := SSnapshot{region: region}
-	return &snapshot, region.client.Get(snapshotId, []string{}, &snapshot)
+	return &snapshot, region.get(snapshotId, url.Values{}, &snapshot)
 }
 
 func (region *SRegion) GetSnapShots(diskId string) ([]SSnapshot, error) {
 	result := []SSnapshot{}
 	if !strings.HasPrefix(diskId, "https://") {
 		snapshots := []SSnapshot{}
-		err := region.client.ListAll("Microsoft.Compute/snapshots", &snapshots)
+		err := region.client.list("Microsoft.Compute/snapshots", url.Values{}, &snapshots)
 		if err != nil {
 			return nil, err
 		}
@@ -397,7 +398,7 @@ func (self *SRegion) CreateDiskBySnapshot(diskName, snapshotId string) (*SDisk,
 		"type": "Microsoft.Compute/disks",
 	}
 	disk := &SDisk{}
-	err := self.client.Create(jsonutils.Marshal(params), disk)
+	err := self.create("", jsonutils.Marshal(params), disk)
 	if err != nil {
 		return nil, errors.Wrapf(err, "CreateDiskBySnapshot.Create")
 	}

pkg/multicloud/azure/eip.go

@@ -16,9 +16,11 @@ package azure
 
 import (
 	"fmt"
+	"net/url"
 	"strings"
 	"time"
 
+	"github.com/pkg/errors"
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 
@@ -72,7 +74,7 @@ func (region *SRegion) AllocateEIP(eipName, projectId string) (*SEipAddress, err
 		},
 		Type: "Microsoft.Network/publicIPAddresses",
 	}
-	err := region.client.CreateWithResourceGroup(projectId, jsonutils.Marshal(eip), &eip)
+	err := region.create(projectId, jsonutils.Marshal(eip), &eip)
 	if err != nil {
 		return nil, err
 	}
@@ -85,7 +87,7 @@ func (region *SRegion) CreateEIP(eip *cloudprovider.SEip) (cloudprovider.ICloudE
 
 func (region *SRegion) GetEip(eipId string) (*SEipAddress, error) {
 	eip := SEipAddress{region: region}
-	return &eip, region.client.Get(eipId, []string{}, &eip)
+	return &eip, region.get(eipId, url.Values{}, &eip)
 }
 
 func (self *SEipAddress) Associate(conf *cloudprovider.AssociateConfig) error {
@@ -102,10 +104,9 @@ func (region *SRegion) AssociateEip(eipId string, instanceId string) error {
 		if err != nil {
 			return err
 		}
-		log.Errorf("nic: %s", jsonutils.Marshal(nic).PrettyString())
 		if len(nic.Properties.IPConfigurations) > 0 {
 			nic.Properties.IPConfigurations[0].Properties.PublicIPAddress = &PublicIPAddress{ID: eipId}
-			return region.client.Update(jsonutils.Marshal(nic), nil)
+			return region.update(jsonutils.Marshal(nic), nil)
 		}
 		return fmt.Errorf("network interface with no IPConfigurations")
 	}
@@ -126,24 +127,18 @@ func (self *SEipAddress) Delete() error {
 }
 
 func (region *SRegion) DeallocateEIP(eipId string) error {
-	startTime := time.Now()
-	timeout := time.Minute * 3
-	for {
-		err := region.client.Delete(eipId)
+	return cloudprovider.Wait(time.Second*5, time.Minute*5, func() (bool, error) {
+		err := region.del(eipId)
 		if err == nil {
-			return nil
+			return true, nil
 		}
 		// {"error":{"code":"PublicIPAddressCannotBeDeleted","details":[],"message":"Public IP address /subscriptions/d4f0ec08-3e28-4ae5-bdf9-3dc7c5b0eeca/resourceGroups/Default/providers/Microsoft.Network/publicIPAddresses/eip-for-test-wwl can not be deleted since it is still allocated to resource /subscriptions/d4f0ec08-3e28-4ae5-bdf9-3dc7c5b0eeca/resourceGroups/Default/providers/Microsoft.Network/networkInterfaces/test-wwl-ipconfig."}}
 		// 刚解绑eip后可能数据未刷新，需要再次尝试
 		if strings.Contains(err.Error(), "it is still allocated to resource") {
-			time.Sleep(time.Second * 5)
-		} else {
-			return err
+			return false, nil
 		}
-		if time.Now().Sub(startTime) > timeout {
-			return err
-		}
-	}
+		return false, errors.Wrapf(err, "del(%s)", eipId)
+	})
 }
 
 func (self *SEipAddress) Dissociate() error {
@@ -173,7 +168,7 @@ func (region *SRegion) DissociateEip(eipId string) error {
 			break
 		}
 	}
-	return region.client.Update(jsonutils.Marshal(nic), nil)
+	return region.update(jsonutils.Marshal(nic), nil)
 }
 
 func (self *SEipAddress) GetAssociationExternalId() string {

pkg/multicloud/azure/enrollment_account.go

@@ -41,7 +41,7 @@ func (cli *SAzureClient) GetEnrollmentAccounts() ([]cloudprovider.SEnrollmentAcc
 	accounts := struct {
 		Value []SEnrollmentAccount
 	}{}
-	err := cli.Get("providers/Microsoft.Billing/enrollmentAccounts", nil, &accounts)
+	err := cli.get("providers/Microsoft.Billing/enrollmentAccounts", nil, &accounts)
 	if err != nil {
 		return nil, err
 	}
@@ -72,7 +72,8 @@ func (cli *SAzureClient) CreateSubscription(name string, eaId string, offerType
 		"owners":      owners,
 	}
 	resource := fmt.Sprintf("providers/Microsoft.Billing/enrollmentAccounts/%s/providers/Microsoft.Subscription/createSubscription", eaId)
-	return cli.POST(resource, jsonutils.Marshal(body))
+	_, err = cli.post(resource, jsonutils.Marshal(body))
+	return err
 }
 
 type SServicePrincipal struct {
@@ -97,9 +98,5 @@ func (cli *SAzureClient) ListServicePrincipal(appId string) ([]SServicePrincipal
 		params.Set("$filter", fmt.Sprintf(`appId eq '%s'`, cli.clientId))
 	}
 	result := []SServicePrincipal{}
-	err := cli.ListGraphResource("servicePrincipals", params, &result)
-	if err != nil {
-		return result, errors.Wrap(err, "ListGraphResource.servicePrincipals")
-	}
-	return result, nil
+	return result, cli.glist("servicePrincipals", params, &result)
 }

pkg/multicloud/azure/event.go

@@ -137,29 +137,18 @@ func (region *SRegion) GetICloudEvents(start time.Time, end time.Time, withReadE
 
 func (region *SRegion) GetEvents(start time.Time, end time.Time) ([]SEvent, error) {
 	events := []SEvent{}
-	params := url.Values{}
 	if start.IsZero() {
 		start = time.Now().AddDate(0, 0, -7)
 	}
 	if end.IsZero() {
 		end = time.Now()
 	}
+	params := url.Values{}
 	params.Set("$filter", fmt.Sprintf("eventTimestamp ge '%s' and eventTimestamp le '%s' and eventChannels eq 'Admin, Operation' and levels eq 'Critical,Error,Warning,Informational'", start.Format("2006-01-02T15:04:05Z"), end.Format("2006-01-02T15:04:05Z")))
-	nextLink := fmt.Sprintf("microsoft.insights/eventtypes/management/values?%s", params.Encode())
-	var err error
-	for {
-		_events := []SEvent{}
-		nextLink, err = region.client.ListAllWithNextToken(nextLink, &_events)
-		if err != nil {
-			return nil, err
-		}
-		events = append(events, _events...)
-		if len(nextLink) > 0 {
-			nextLink = nextLink[strings.Index(nextLink, "microsoft.insights"):]
-		}
-		if len(nextLink) == 0 || len(_events) == 0 {
-			break
-		}
+	resource := fmt.Sprintf("microsoft.insights/eventtypes/management/values")
+	err := region.client.list(resource, params, &events)
+	if err != nil {
+		return nil, err
 	}
 	return events, nil
 }

pkg/multicloud/azure/host.go

@@ -49,7 +49,7 @@ func (self *SHost) GetName() string {
 }
 
 func (self *SHost) GetGlobalId() string {
-	return fmt.Sprintf("%s/%s", self.zone.region.GetGlobalId(), self.zone.region.SubscriptionID)
+	return fmt.Sprintf("%s/%s", self.zone.region.GetGlobalId(), self.zone.region.client.subscriptionId)
 }
 
 func (self *SHost) IsEmulated() bool {
@@ -74,7 +74,7 @@ func (self *SHost) searchNetorkInterface(IPAddr string, networkId string, secgro
 			if ipConf.Properties.PrivateIPAddress == IPAddr && networkId == ipConf.Properties.Subnet.ID && ipConf.Properties.PrivateIPAllocationMethod == "Static" {
 				if nic.Properties.NetworkSecurityGroup == nil || nic.Properties.NetworkSecurityGroup.ID != secgroupId {
 					nic.Properties.NetworkSecurityGroup = &SSecurityGroup{ID: secgroupId}
-					if err := self.zone.region.client.Update(jsonutils.Marshal(nic), nil); err != nil {
+					if err := self.zone.region.update(jsonutils.Marshal(nic), nil); err != nil {
 						log.Errorf("assign secgroup %s for nic %#v failed: %v", secgroupId, nic, err)
 						return nil, err
 					}
@@ -217,7 +217,7 @@ func (self *SHost) _createVM(desc *cloudprovider.SManagedVMCreateConfig, nicId s
 	if len(desc.InstanceType) > 0 {
 		instance.Properties.HardwareProfile.VMSize = desc.InstanceType
 		log.Debugf("Try HardwareProfile : %s", desc.InstanceType)
-		err = self.zone.region.client.CreateWithResourceGroup(desc.ProjectId, jsonutils.Marshal(instance), &instance)
+		err = self.zone.region.create(desc.ProjectId, jsonutils.Marshal(instance), &instance)
 		if err != nil {
 			log.Errorf("Failed for %s: %s", desc.InstanceType, err)
 			return "", fmt.Errorf("Failed to create specification %s.%s", desc.InstanceType, err.Error())
@@ -228,7 +228,7 @@ func (self *SHost) _createVM(desc *cloudprovider.SManagedVMCreateConfig, nicId s
 	for _, profile := range self.zone.region.getHardwareProfile(desc.Cpu, desc.MemoryMB) {
 		instance.Properties.HardwareProfile.VMSize = profile
 		log.Debugf("Try HardwareProfile : %s", profile)
-		err = self.zone.region.client.CreateWithResourceGroup(desc.ProjectId, jsonutils.Marshal(instance), &instance)
+		err = self.zone.region.create(desc.ProjectId, jsonutils.Marshal(instance), &instance)
 		if err != nil {
 			for _, key := range []string{`"code":"InvalidParameter"`, `"code":"NicInUse"`} {
 				if strings.Contains(err.Error(), key) {

pkg/multicloud/azure/image.go

@@ -17,6 +17,7 @@ package azure
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"strings"
 	"time"
 
@@ -241,7 +242,7 @@ func (self *SRegion) GetImageById(imageId string) (SImage, error) {
 
 func (self *SRegion) getPrivateImage(imageId string) (SImage, error) {
 	image := SImage{}
-	err := self.client.Get(imageId, []string{}, &image)
+	err := self.get(imageId, url.Values{}, &image)
 	if err != nil {
 		return image, err
 	}
@@ -295,7 +296,7 @@ func (self *SRegion) CreateImageByBlob(imageName, osType, blobURI string, diskSi
 		},
 		Type: "Microsoft.Compute/images",
 	}
-	return &image, self.client.Create(jsonutils.Marshal(image), &image)
+	return &image, self.create("", jsonutils.Marshal(image), &image)
 }
 
 func (self *SRegion) CreateImage(snapshotId, imageName, osType, imageDesc string) (*SImage, error) {
@@ -315,7 +316,7 @@ func (self *SRegion) CreateImage(snapshotId, imageName, osType, imageDesc string
 		},
 		Type: "Microsoft.Compute/images",
 	}
-	return &image, self.client.Create(jsonutils.Marshal(image), &image)
+	return &image, self.create("", jsonutils.Marshal(image), &image)
 }
 
 func (self *SRegion) getOfferedImages(publishersFilter []string, offersFilter []string, skusFilter []string, verFilter []string, imageType string, latestVer bool) ([]SImage, error) {
@@ -388,7 +389,7 @@ func (self *SRegion) GetOfferedImageIDs(publishersFilter []string, offersFilter
 func (self *SRegion) getPrivateImages() ([]SImage, error) {
 	result := []SImage{}
 	images := []SImage{}
-	err := self.client.ListAll("Microsoft.Compute/images", &images)
+	err := self.client.list("Microsoft.Compute/images", url.Values{}, &images)
 	if err != nil {
 		return nil, err
 	}
@@ -433,7 +434,7 @@ func (self *SRegion) GetImages(imageType string) ([]SImage, error) {
 }
 
 func (self *SRegion) DeleteImage(imageId string) error {
-	return self.client.Delete(imageId)
+	return self.del(imageId)
 }
 
 func (self *SImage) GetBlobUri() string {
@@ -464,7 +465,8 @@ type SAzureImageResource struct {
 
 func (region *SRegion) GetImagePublishers(filter []string) ([]string, error) {
 	publishers := make([]SAzureImageResource, 0)
-	err := region.client.ListResources(fmt.Sprintf("Microsoft.Compute/locations/%s/publishers", region.Name), &publishers, nil)
+	// TODO
+	err := region.client.list(fmt.Sprintf("Microsoft.Compute/locations/%s/publishers", region.Name), url.Values{}, &publishers)
 	if err != nil {
 		return nil, err
 	}
@@ -493,7 +495,7 @@ func (region *SRegion) getImageOffers(publisher string, filter []string) ([]stri
 		log.Warningf("failed to get publisher %s driver", publisher)
 	}
 	offers := make([]SAzureImageResource, 0)
-	err := region.client.ListResources(fmt.Sprintf("Microsoft.Compute/locations/%s/publishers/%s/artifacttypes/vmimage/offers", region.Name, publisher), &offers, nil)
+	err := region.client.list(fmt.Sprintf("Microsoft.Compute/locations/%s/publishers/%s/artifacttypes/vmimage/offers", region.Name, publisher), url.Values{}, &offers)
 	if err != nil {
 		return nil, err
 	}
@@ -519,7 +521,7 @@ func (region *SRegion) getImageSkus(publisher string, offer string, filter []str
 		}
 	}
 	skus := make([]SAzureImageResource, 0)
-	err := region.client.ListResources(fmt.Sprintf("Microsoft.Compute/locations/%s/publishers/%s/artifacttypes/vmimage/offers/%s/skus", region.Name, publisher, offer), &skus, nil)
+	err := region.client.list(fmt.Sprintf("Microsoft.Compute/locations/%s/publishers/%s/artifacttypes/vmimage/offers/%s/skus", region.Name, publisher, offer), url.Values{}, &skus)
 	if err != nil {
 		return nil, err
 	}
@@ -534,10 +536,12 @@ func (region *SRegion) getImageSkus(publisher string, offer string, filter []str
 func (region *SRegion) getImageVersions(publisher string, offer string, sku string, filter []string, latestVer bool) ([]string, error) {
 	vers := make([]SAzureImageResource, 0)
 	resource := fmt.Sprintf("Microsoft.Compute/locations/%s/publishers/%s/artifacttypes/vmimage/offers/%s/skus/%s/versions", region.Name, publisher, offer, sku)
+	params := url.Values{}
 	if latestVer {
-		resource = resource + "?$top=1&$orderby=name%20desc"
+		params.Set("$top", "1")
+		params.Set("orderby", "name desc")
 	}
-	err := region.client.ListResources(resource, &vers, nil)
+	err := region.client.list(resource, params, &vers)
 	if err != nil {
 		return nil, err
 	}
@@ -558,7 +562,7 @@ func (region *SRegion) getImageDetail(publisher string, offer string, sku string
 		"/artifacttypes/vmimage/offers/" + offer +
 		"/skus/" + sku +
 		"/versions/" + version
-	return image, region.client.Get(id, []string{}, &image)
+	return image, region.get(id, url.Values{}, &image)
 }
 
 func (region *SRegion) getOfferedImage(offerId string) (SImage, error) {

pkg/multicloud/azure/instance.go

@@ -17,6 +17,7 @@ package azure
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"strings"
 	"time"
 
@@ -194,31 +195,28 @@ type SInstance struct {
 
 func (self *SRegion) GetInstance(instanceId string) (*SInstance, error) {
 	instance := SInstance{}
-	return &instance, self.client.Get(instanceId, []string{"$expand=instanceView"}, &instance)
+	params := url.Values{}
+	params.Set("$expand", "instanceView")
+	return &instance, self.get(instanceId, params, &instance)
 }
 
 func (self *SRegion) GetInstanceScaleSets() ([]SInstance, error) {
 	instance := []SInstance{}
-	return instance, self.client.ListAll("Microsoft.Compute/virtualMachineScaleSets", &instance)
+	return instance, self.client.list("Microsoft.Compute/virtualMachineScaleSets", url.Values{}, &instance)
 }
 
 func (self *SRegion) GetInstances() ([]SInstance, error) {
 	result := []SInstance{}
-	instances := []SInstance{}
-	err := self.client.ListAll("Microsoft.Compute/virtualMachines", &instances)
+	resource := fmt.Sprintf("Microsoft.Compute/locations/%s/virtualMachines", self.Name)
+	err := self.client.list(resource, url.Values{}, &result)
 	if err != nil {
 		return nil, err
 	}
-	for i := 0; i < len(instances); i++ {
-		if instances[i].Location == self.Name {
-			result = append(result, instances[i])
-		}
-	}
 	return result, nil
 }
 
 func (self *SRegion) doDeleteVM(instanceId string) error {
-	return self.client.Delete(instanceId)
+	return self.del(instanceId)
 }
 
 func (self *SInstance) GetSecurityGroupIds() ([]string, error) {
@@ -349,7 +347,7 @@ func (self *SInstance) getStorageInfoByUri(uri string) (*SStorage, *SClassicStor
 			return nil, &storage, nil
 		}
 	}
-	storageaccounts, err = self.host.zone.region.GetStorageAccounts()
+	storageaccounts, err = self.host.zone.region.ListStorageAccounts()
 	if err != nil {
 		return nil, nil, err
 	}
@@ -580,7 +578,7 @@ func (region *SRegion) AttachDisk(instanceId, diskId string) error {
 	instance.Properties.StorageProfile.DataDisks = dataDisks
 	instance.Properties.ProvisioningState = ""
 	instance.Properties.InstanceView = nil
-	return region.client.Update(jsonutils.Marshal(instance), nil)
+	return region.update(jsonutils.Marshal(instance), nil)
 }
 
 func (self *SInstance) DetachDisk(ctx context.Context, diskId string) error {
@@ -609,7 +607,7 @@ func (region *SRegion) DetachDisk(instanceId, diskId string) error {
 	instance.Properties.StorageProfile.DataDisks = dataDisks
 	instance.Properties.ProvisioningState = ""
 	instance.Properties.InstanceView = nil
-	return region.client.Update(jsonutils.Marshal(instance), nil)
+	return region.update(jsonutils.Marshal(instance), nil)
 }
 
 func (self *SInstance) ChangeConfig(ctx context.Context, config *cloudprovider.SManagedVMChangeConfig) error {
@@ -623,7 +621,7 @@ func (self *SInstance) ChangeConfig(ctx context.Context, config *cloudprovider.S
 		self.Properties.ProvisioningState = ""
 		self.Properties.InstanceView = nil
 		log.Debugf("Try HardwareProfile : %s", vmSize)
-		err = self.host.zone.region.client.Update(jsonutils.Marshal(self), nil)
+		err = self.host.zone.region.update(jsonutils.Marshal(self), nil)
 		if err == nil {
 			return cloudprovider.WaitStatus(self, status, 10*time.Second, 300*time.Second)
 		}
@@ -640,7 +638,7 @@ func (self *SInstance) ChangeConfig2(ctx context.Context, instanceType string) e
 	self.Properties.ProvisioningState = ""
 	self.Properties.InstanceView = nil
 	log.Debugf("Try HardwareProfile : %s", instanceType)
-	err := self.host.zone.region.client.Update(jsonutils.Marshal(self), nil)
+	err := self.host.zone.region.update(jsonutils.Marshal(self), nil)
 	if err != nil {
 		return errors.Wrap(err, "client.Update")
 	}
@@ -697,8 +695,8 @@ func (region *SRegion) execOnLinux(instanceId string, command string) error {
 			Settings:           map[string]string{"commandToExecute": command},
 		},
 	}
-	url := fmt.Sprintf("%s/extensions/CustomScript", instanceId)
-	_, err := region.client.jsonRequest("PUT", url, jsonutils.Marshal(extension).String())
+	resource := fmt.Sprintf("%s/extensions/CustomScript", instanceId)
+	_, err := region.client.jsonRequest("PUT", resource, jsonutils.Marshal(extension), url.Values{})
 	return err
 }
 
@@ -715,7 +713,7 @@ func (region *SRegion) resetOvsEnv(instanceId string) error {
 }
 
 func (region *SRegion) deleteExtension(instanceId, extensionName string) error {
-	return region.client.Delete(fmt.Sprintf("%s/extensions/%s", instanceId, extensionName))
+	return region.del(fmt.Sprintf("%s/extensions/%s", instanceId, extensionName))
 }
 func (region *SRegion) resetLoginInfo(instanceId string, setting map[string]string) error {
 	extension := SVirtualMachineExtension{
@@ -727,8 +725,8 @@ func (region *SRegion) resetLoginInfo(instanceId string, setting map[string]stri
 			ProtectedSettings:  setting,
 		},
 	}
-	url := fmt.Sprintf("%s/extensions/enablevmaccess", instanceId)
-	_, err := region.client.jsonRequest("PUT", url, jsonutils.Marshal(extension).String())
+	resource := fmt.Sprintf("%s/extensions/enablevmaccess", instanceId)
+	_, err := region.client.jsonRequest("PUT", resource, jsonutils.Marshal(extension), url.Values{})
 	if err != nil {
 		err = region.deleteExtension(instanceId, "enablevmaccess")
 		if err != nil {
@@ -738,8 +736,8 @@ func (region *SRegion) resetLoginInfo(instanceId string, setting map[string]stri
 		if err != nil {
 			return err
 		}
-		url := fmt.Sprintf("%s/extensions/enablevmaccess", instanceId)
-		_, err = region.client.jsonRequest("PUT", url, jsonutils.Marshal(extension).String())
+		resource := fmt.Sprintf("%s/extensions/enablevmaccess", instanceId)
+		_, err = region.client.jsonRequest("PUT", resource, jsonutils.Marshal(extension), url.Values{})
 		return err
 	}
 	return nil
@@ -850,7 +848,7 @@ func (region *SRegion) ReplaceSystemDisk(instance *SInstance, cpu int, memoryMb
 	instance.Properties.ProvisioningState = ""
 	instance.Properties.InstanceView = nil
 	instance.Properties.VmId = ""
-	err = region.client.Update(jsonutils.Marshal(instance), nil)
+	err = region.update(jsonutils.Marshal(instance), nil)
 	if err != nil {
 		// 更新失败，需要删除之前交换过的系统盘
 		region.DeleteDisk(instance.Properties.StorageProfile.OsDisk.ManagedDisk.ID)
@@ -1058,7 +1056,7 @@ func (self *SInstance) GetVNCInfo() (jsonutils.JSONObject, error) {
 }
 
 func (self *SRegion) StartVM(instanceId string) error {
-	_, err := self.client.PerformAction(instanceId, "start", "")
+	_, err := self.perform(instanceId, "start", nil)
 	return err
 }
 
@@ -1066,7 +1064,7 @@ func (self *SInstance) StartVM(ctx context.Context) error {
 	if err := self.host.zone.region.StartVM(self.ID); err != nil {
 		return err
 	}
-	self.host.zone.region.client.jsonRequest("PATCH", self.ID, jsonutils.Marshal(self).String())
+	self.host.zone.region.client.jsonRequest("PATCH", self.ID, jsonutils.Marshal(self), url.Values{})
 	return cloudprovider.WaitStatus(self, api.VM_RUNNING, 10*time.Second, 300*time.Second)
 }
 
@@ -1075,12 +1073,12 @@ func (self *SInstance) StopVM(ctx context.Context, opts *cloudprovider.ServerSto
 	if err != nil {
 		return err
 	}
-	self.host.zone.region.client.jsonRequest("PATCH", self.ID, jsonutils.Marshal(self).String())
+	self.host.zone.region.client.jsonRequest("PATCH", self.ID, jsonutils.Marshal(self), url.Values{})
 	return cloudprovider.WaitStatus(self, api.VM_READY, 10*time.Second, 300*time.Second)
 }
 
 func (self *SRegion) StopVM(instanceId string, isForce bool) error {
-	_, err := self.client.PerformAction(instanceId, "deallocate", "")
+	_, err := self.perform(instanceId, "deallocate", nil)
 	return err
 }
 

pkg/multicloud/azure/instancenic.go

@@ -15,6 +15,7 @@
 package azure
 
 import (
+	"net/url"
 	"strings"
 
 	"yunion.io/x/jsonutils"
@@ -71,7 +72,7 @@ func (self *SInstanceNic) GetIP() string {
 }
 
 func (region *SRegion) DeleteNetworkInterface(interfaceId string) error {
-	return region.client.Delete(interfaceId)
+	return region.del(interfaceId)
 }
 
 func (self *SInstanceNic) Delete() error {
@@ -101,7 +102,7 @@ func (self *SInstanceNic) updateSecurityGroup(secgroupId string) error {
 	if len(secgroupId) > 0 {
 		self.Properties.NetworkSecurityGroup = &SSecurityGroup{ID: secgroupId}
 	}
-	return region.client.Update(jsonutils.Marshal(self), nil)
+	return region.update(jsonutils.Marshal(self), nil)
 }
 
 func (self *SInstanceNic) revokeSecurityGroup() error {
@@ -132,12 +133,12 @@ func (self *SInstanceNic) GetINetwork() cloudprovider.ICloudNetwork {
 
 func (self *SRegion) GetNetworkInterfaceDetail(interfaceId string) (*SInstanceNic, error) {
 	instancenic := SInstanceNic{}
-	return &instancenic, self.client.Get(interfaceId, []string{}, &instancenic)
+	return &instancenic, self.get(interfaceId, url.Values{}, &instancenic)
 }
 
 func (self *SRegion) GetNetworkInterfaces() ([]SInstanceNic, error) {
 	interfaces := []SInstanceNic{}
-	err := self.client.ListAll("Microsoft.Network/networkInterfaces", &interfaces)
+	err := self.client.list("Microsoft.Network/networkInterfaces", url.Values{}, &interfaces)
 	if err != nil {
 		return nil, err
 	}
@@ -177,5 +178,5 @@ func (self *SRegion) CreateNetworkInterface(resourceGroup string, nicName string
 		instancenic.Properties.IPConfigurations[0].Properties.PrivateIPAllocationMethod = "Dynamic"
 	}
 
-	return &instancenic, self.client.CreateWithResourceGroup(resourceGroup, jsonutils.Marshal(&instancenic), &instancenic)
+	return &instancenic, self.create(resourceGroup, jsonutils.Marshal(&instancenic), &instancenic)
 }

pkg/multicloud/azure/monitor.go

@@ -15,6 +15,8 @@
 package azure
 
 import (
+	"fmt"
+	"net/url"
 	"time"
 )
 
@@ -85,22 +87,18 @@ type MetricValue struct {
 
 func (self *SRegion) GetMonitorData(name string, ns string, external_id string, since time.Time,
 	until time.Time) (*ResponseMetirc, error) {
-	params := map[string]string{
-		"metricnamespace": ns,
-		"metricnames":     name,
-		"interval":        "PT1M",
-		"aggregation":     "Average",
-		"api-version":     "2018-01-01",
-	}
+	params := url.Values{}
+	params.Set("metricnamespace", ns)
+	params.Set("metricnames", name)
+	params.Set("interval", "PT1M")
+	params.Set("aggregation", "Average")
+	params.Set("api-version", "2018-01-01")
 	if !since.IsZero() && !until.IsZero() {
-		params["timespan"] = since.UTC().Format(time.RFC3339) + "/" + until.UTC().Format(time.RFC3339)
-	}
-	rtn, err := self.client.ListResourcesOfMetirc("microsoft.insights/metrics", external_id, params)
-	if err != nil {
-		return nil, err
+		params.Set("timespan", since.UTC().Format(time.RFC3339)+"/"+until.UTC().Format(time.RFC3339))
 	}
+	resource := fmt.Sprintf("%s/provider/microsoft.insights/metrics")
 	elements := ResponseMetirc{}
-	err = rtn.Unmarshal(&elements)
+	err := self.get(resource, params, &elements)
 	if err != nil {
 		return nil, err
 	}

pkg/multicloud/azure/network.go

@@ -71,7 +71,7 @@ func (self *SNetwork) Delete() error {
 		}
 		vpc.Properties.Subnets = &subnets
 		vpc.Properties.ProvisioningState = ""
-		return self.wire.vpc.region.client.Update(jsonutils.Marshal(vpc), nil)
+		return self.wire.vpc.region.update(jsonutils.Marshal(vpc), nil)
 	}
 	return nil
 }

pkg/multicloud/azure/policy.go

@@ -72,7 +72,7 @@ type SPolicyDefinition struct {
 
 func (client *SAzureClient) GetPolicyDefinitions() ([]SPolicyDefinition, error) {
 	definitions := []SPolicyDefinition{}
-	err := client.ListAll("Microsoft.Authorization/policyDefinitions", &definitions)
+	err := client.list("Microsoft.Authorization/policyDefinitions", url.Values{}, &definitions)
 	if err != nil {
 		return nil, errors.Wrap(err, "Microsoft.Authorization/policyDefinitions.List")
 	}
@@ -81,7 +81,7 @@ func (client *SAzureClient) GetPolicyDefinitions() ([]SPolicyDefinition, error)
 
 func (client *SAzureClient) GetPolicyDefinition(id string) (*SPolicyDefinition, error) {
 	definition := &SPolicyDefinition{}
-	err := client.Get(id, []string{}, definition)
+	err := client.get(id, url.Values{}, definition)
 	if err != nil {
 		return nil, errors.Wrapf(err, "get %s", id)
 	}
@@ -129,10 +129,11 @@ func (assignment *SPolicyAssignment) GetParameters() *jsonutils.JSONDict {
 func (client *SAzureClient) GetPolicyAssignments(defineId string) ([]SPolicyAssignment, error) {
 	assignments := []SPolicyAssignment{}
 	resource := "Microsoft.Authorization/policyAssignments"
+	params := url.Values{}
 	if len(defineId) > 0 {
-		resource += ("?$filter=" + url.PathEscape("policyDefinitionId eq ") + fmt.Sprintf("'%s'", defineId))
+		params.Set("$filter", fmt.Sprintf(`policyDefinitionId eq '%s'`, defineId))
 	}
-	err := client.ListAll(resource, &assignments)
+	err := client.list(resource, params, &assignments)
 	if err != nil {
 		return nil, errors.Wrap(err, "Microsoft.Authorization/policyAssignments.List")
 	}

pkg/multicloud/azure/region.go

@@ -16,6 +16,7 @@ package azure
 
 import (
 	"fmt"
+	"net/url"
 	"strconv"
 	"strings"
 
@@ -48,12 +49,11 @@ type SRegion struct {
 
 	storageCache *SStoragecache
 
-	ID             string
-	SubscriptionID string
-	Name           string
-	DisplayName    string
-	Latitude       string
-	Longitude      string
+	ID          string
+	Name        string
+	DisplayName string
+	Latitude    string
+	Longitude   string
 }
 
 func (self *SRegion) GetILoadBalancerBackendGroups() ([]cloudprovider.ICloudLoadbalancerBackendGroup, error) {
@@ -70,50 +70,37 @@ func (self *SRegion) GetClient() *SAzureClient {
 	return self.client
 }
 
-func (self *SRegion) GetVMSize(location string) (map[string]SVMSize, error) {
-	if len(location) == 0 {
-		location = self.Name
-	}
-	body, err := self.client.ListVmSizes(location)
-	if err != nil {
-		return nil, err
-	}
-	vmSizes := []SVMSize{}
-	err = body.Unmarshal(&vmSizes, "value")
-	if err != nil {
-		return nil, err
-	}
-	result := map[string]SVMSize{}
-	for i := 0; i < len(vmSizes); i++ {
-		result[vmSizes[i].Name] = vmSizes[i]
-	}
-	return result, nil
+func (self *SRegion) ListVmSizes() ([]SVMSize, error) {
+	result := []SVMSize{}
+	resource := fmt.Sprintf("Microsoft.Compute/locations/%s/vmSizes", self.Name)
+	return result, self.client.list(resource, url.Values{}, &result)
 }
 
 func (self *SRegion) getHardwareProfile(cpu, memMB int) []string {
-	if vmSizes, err := self.GetVMSize(""); err != nil {
+	vmSizes, err := self.ListVmSizes()
+	if err != nil {
 		return []string{}
-	} else {
-		profiles := make([]string, 0)
-		for vmSize, info := range vmSizes {
-			if info.MemoryInMB == int32(memMB) && info.NumberOfCores == cpu {
-				profiles = append(profiles, vmSize)
-			}
-		}
-		return profiles
 	}
+	result := []string{}
+	for i := range vmSizes {
+		if vmSizes[i].MemoryInMB == int32(memMB) && vmSizes[i].NumberOfCores == cpu {
+			result = append(result, vmSizes[i].Name)
+		}
+	}
+	return result
 }
 
-func (self *SRegion) getVMSize(size string) (*SVMSize, error) {
-	vmSizes, err := self.GetVMSize("")
+func (self *SRegion) getVMSize(name string) (*SVMSize, error) {
+	vmSizes, err := self.ListVmSizes()
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrapf(err, "ListVmSizes")
 	}
-	vmSize, ok := vmSizes[size]
-	if !ok {
-		return nil, cloudprovider.ErrNotFound
+	for i := range vmSizes {
+		if vmSizes[i].Name == name {
+			return &vmSizes[i], nil
+		}
 	}
-	return &vmSize, nil
+	return nil, errors.Wrapf(cloudprovider.ErrNotFound, name)
 }
 
 func (self *SRegion) GetMetadata() *jsonutils.JSONDict {
@@ -191,7 +178,7 @@ func (self *SRegion) CreateIVpc(name string, desc string, cidr string) (cloudpro
 		},
 		Type: "Microsoft.Network/virtualNetworks",
 	}
-	return &vpc, self.client.Create(jsonutils.Marshal(vpc), &vpc)
+	return &vpc, self.create("", jsonutils.Marshal(vpc), &vpc)
 }
 
 func (self *SRegion) GetIHostById(id string) (cloudprovider.ICloudHost, error) {
@@ -344,7 +331,7 @@ func (self *SRegion) getStoragecache() *SStoragecache {
 func (self *SRegion) getVpcs() ([]SVpc, error) {
 	result := []SVpc{}
 	vpcs := []SVpc{}
-	err := self.client.ListAll("Microsoft.Network/virtualNetworks", &vpcs)
+	err := self.client.list("Microsoft.Network/virtualNetworks", url.Values{}, &vpcs)
 	if err != nil {
 		return nil, err
 	}
@@ -360,7 +347,7 @@ func (self *SRegion) getClassicVpcs() ([]SClassicVpc, error) {
 	result := []SClassicVpc{}
 	for _, resourceType := range []string{"Microsoft.ClassicNetwork/virtualNetworks"} {
 		vpcs := []SClassicVpc{}
-		err := self.client.ListAll(resourceType, &vpcs)
+		err := self.client.list(resourceType, url.Values{}, &vpcs)
 		if err != nil {
 			return nil, err
 		}
@@ -498,7 +485,7 @@ func (self *SRegion) CreateInstanceSimple(name string, imgId, osType string, cpu
 
 func (region *SRegion) GetEips() ([]SEipAddress, error) {
 	eips := []SEipAddress{}
-	err := region.client.ListAll("Microsoft.Network/publicIPAddresses", &eips)
+	err := region.client.list("Microsoft.Network/publicIPAddresses", url.Values{}, &eips)
 	if err != nil {
 		return nil, err
 	}
@@ -611,16 +598,13 @@ func (region *SRegion) CreateILoadBalancerAcl(acl *cloudprovider.SLoadbalancerAc
 }
 
 func (region *SRegion) GetIBuckets() ([]cloudprovider.ICloudBucket, error) {
-	iBuckets, err := region.client.getIBuckets()
+	accounts, err := region.ListStorageAccounts()
 	if err != nil {
-		return nil, errors.Wrap(err, "getIBuckets")
+		return nil, errors.Wrapf(err, "ListStorageAccounts")
 	}
 	ret := make([]cloudprovider.ICloudBucket, 0)
-	for i := range iBuckets {
-		if iBuckets[i].GetLocation() != region.GetId() {
-			continue
-		}
-		ret = append(ret, iBuckets[i])
+	for i := range accounts {
+		ret = append(ret, &accounts[i])
 	}
 	return ret, nil
 }
@@ -634,20 +618,19 @@ func (region *SRegion) CreateIBucket(name string, storageClassStr string, acl st
 }
 
 func (region *SRegion) DeleteIBucket(name string) error {
-	accounts, err := region.GetStorageAccounts()
+	accounts, err := region.listStorageAccounts()
 	if err != nil {
-		return errors.Wrap(err, "GetStorageAccounts")
+		return errors.Wrap(err, "ListStorageAccounts")
 	}
 	for i := range accounts {
 		if accounts[i].Name == name {
-			err = region.client.Delete(accounts[i].ID)
+			err = region.del(accounts[i].ID)
 			if err != nil {
-				return errors.Wrap(err, "region.client.Delete")
+				return errors.Wrapf(err, "region.del")
 			}
 			return nil
 		}
 	}
-	region.client.invalidateIBuckets()
 	return nil
 }
 
@@ -666,3 +649,71 @@ func (region *SRegion) GetIBucketByName(name string) (cloudprovider.ICloudBucket
 func (region *SRegion) GetCapabilities() []string {
 	return region.client.GetCapabilities()
 }
+
+func (self *SRegion) get(resource string, params url.Values, retVal interface{}) error {
+	return self.client.get(resource, params, retVal)
+}
+
+func (self *SRegion) del(resource string) error {
+	return self.client.del(resource)
+}
+
+func (self *SRegion) checkResourceGroup(resourceGroup string) (string, error) {
+	if len(resourceGroup) == 0 {
+		resourceGroup = "Default"
+	}
+	for i := range self.client.ressourceGroups {
+		if strings.ToLower(self.client.ressourceGroups[i].Name) == strings.ToLower(resourceGroup) {
+			return resourceGroup, nil
+		}
+	}
+	_, err := self.CreateResourceGroup(resourceGroup)
+	return resourceGroup, err
+}
+
+type sInfo struct {
+	Location string
+	Name     string
+	Type     string
+}
+
+func (self *SRegion) createInfo(body jsonutils.JSONObject) (sInfo, error) {
+	info := sInfo{}
+	err := body.Unmarshal(&info)
+	if err != nil {
+		return info, errors.Wrapf(err, "body.Unmarshal")
+	}
+	if len(info.Name) == 0 {
+		return info, fmt.Errorf("Missing name params")
+	}
+	if len(info.Type) == 0 {
+		return info, fmt.Errorf("Missing type params")
+	}
+	return info, nil
+}
+
+func (self *SRegion) create(resourceGroup string, body jsonutils.JSONObject, retVal interface{}) error {
+	info, err := self.createInfo(body)
+	if err != nil {
+		return errors.Wrapf(err, "createInfo")
+	}
+	resourceGroup, err = self.checkResourceGroup(resourceGroup)
+	if err != nil {
+		return errors.Wrapf(err, "checkResourceGroup")
+	}
+	info.Name, err = self.client.getUniqName(resourceGroup, info.Type, info.Name)
+	if err != nil {
+		return errors.Wrapf(err, "getUniqName")
+	}
+	info.Location = self.Name
+	jsonutils.Update(&body, info)
+	return self.client.create(resourceGroup, info.Type, info.Name, body, retVal)
+}
+
+func (self *SRegion) update(body jsonutils.JSONObject, retVal interface{}) error {
+	return self.client.update(body, retVal)
+}
+
+func (self *SRegion) perform(id, action string, body jsonutils.JSONObject) (jsonutils.JSONObject, error) {
+	return self.client.perform(id, action, body)
+}

pkg/multicloud/azure/resourcegroup.go

@@ -16,6 +16,7 @@ package azure
 
 import (
 	"fmt"
+	"net/url"
 	"strings"
 
 	"yunion.io/x/jsonutils"
@@ -28,6 +29,8 @@ type GroupProperties struct {
 }
 
 type SResourceGroup struct {
+	client *SAzureClient
+
 	ID         string
 	Name       string
 	Location   string
@@ -35,33 +38,29 @@ type SResourceGroup struct {
 	ManagedBy  string
 }
 
-func (self *SRegion) GetResourceGroups() ([]SResourceGroup, error) {
-	resourceGroups := []SResourceGroup{}
-	return resourceGroups, self.client.List("resourcegroups", &resourceGroups)
-}
-
 func (self *SRegion) GetResourceGroupDetail(groupName string) (*SResourceGroup, error) {
 	resourceGroup := SResourceGroup{}
-	idStr := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.SubscriptionID, groupName)
-	return &resourceGroup, self.client.Get(idStr, []string{}, &resourceGroup)
+	idStr := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.client.subscriptionId, groupName)
+	return &resourceGroup, self.get(idStr, url.Values{}, &resourceGroup)
 }
 
 // not support update, resource group name is immutable???
 func (self *SRegion) UpdateResourceGroup(groupName string, newName string) error {
 	resourceGroup := SResourceGroup{Name: newName}
-	idStr := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.SubscriptionID, groupName)
-	return self.client.Patch(idStr, jsonutils.Marshal(&resourceGroup))
+	resource := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.client.subscriptionId, groupName)
+	_, err := self.client.patch(resource, jsonutils.Marshal(&resourceGroup))
+	return err
 }
 
-func (self *SRegion) CreateResourceGroup(groupName string) error {
+func (self *SRegion) CreateResourceGroup(groupName string) (jsonutils.JSONObject, error) {
 	resourceGroup := SResourceGroup{Location: self.Name}
-	idStr := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.SubscriptionID, groupName)
-	return self.client.Put(idStr, jsonutils.Marshal(resourceGroup))
+	idStr := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.client.subscriptionId, groupName)
+	return self.client.put(idStr, jsonutils.Marshal(resourceGroup))
 }
 
 func (self *SRegion) DeleteResourceGroup(groupName string) error {
-	idStr := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.SubscriptionID, groupName)
-	return self.client.Delete(idStr)
+	idStr := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.client.subscriptionId, groupName)
+	return self.del(idStr)
 }
 
 func (r *SResourceGroup) GetName() string {

pkg/multicloud/azure/resourcesku.go

@@ -14,12 +14,6 @@
 
 package azure
 
-import (
-	"fmt"
-
-	"yunion.io/x/pkg/utils"
-)
-
 /*
 {
 	"capabilities":[
@@ -113,48 +107,7 @@ type SResourceSkusResult struct {
 }
 
 func (self *SAzureClient) ListResourceSkus() ([]SResourceSku, error) {
-	cli, err := self.getDefaultClient()
-	if err != nil {
-		return nil, err
-	}
-	if len(self.subscriptionId) == 0 {
-		return nil, fmt.Errorf("need subscription id")
-	}
-	url := fmt.Sprintf("/subscriptions/%s/providers/Microsoft.Compute/skus?api-version=2017-09-01", self.subscriptionId)
-	skus := make([]SResourceSku, 0)
-	for {
-		body, err := jsonRequest(cli, "GET", self.domain, url, self.subscriptionId, "", DefaultResource)
-		if err != nil {
-			return nil, err
-		}
-		result := SResourceSkusResult{}
-		err = body.Unmarshal(&result)
-		if err != nil {
-			return nil, err
-		}
-		skus = append(skus, result.Value...)
-		if len(result.NextLink) > 0 {
-			url = result.NextLink
-		} else {
-			break
-		}
-	}
-	return skus, nil
-}
-
-func (self *SRegion) GetResourceSkus(location string) ([]SResourceSku, error) {
-	skus, err := self.client.ListResourceSkus()
-	if err != nil {
-		return nil, err
-	}
-	if len(location) == 0 {
-		return skus, nil
-	}
-	ret := make([]SResourceSku, 0)
-	for i := 0; i < len(skus); i += 1 {
-		if utils.IsInStringArray(location, skus[i].Locations) {
-			ret = append(ret, skus[i])
-		}
-	}
-	return ret, nil
+	skus := []SResourceSku{}
+	resource := "Microsoft.Compute/skus"
+	return skus, self.list(resource, nil, &skus)
 }

pkg/multicloud/azure/securitygroup.go

@@ -17,6 +17,7 @@ package azure
 import (
 	"fmt"
 	"net"
+	"net/url"
 	"strconv"
 	"strings"
 	"unicode"
@@ -311,12 +312,12 @@ func (region *SRegion) CreateSecurityGroup(secName string) (*SSecurityGroup, err
 		Type:     "Microsoft.Network/networkSecurityGroups",
 		Location: region.Name,
 	}
-	return &secgroup, region.client.Create(jsonutils.Marshal(secgroup), &secgroup)
+	return &secgroup, region.create("", jsonutils.Marshal(secgroup), &secgroup)
 }
 
 func (region *SRegion) GetSecurityGroups(name string) ([]SSecurityGroup, error) {
 	secgroups := []SSecurityGroup{}
-	err := region.client.ListAll("Microsoft.Network/networkSecurityGroups", &secgroups)
+	err := region.client.list("Microsoft.Network/networkSecurityGroups", url.Values{}, &secgroups)
 	if err != nil {
 		return nil, err
 	}
@@ -332,7 +333,7 @@ func (region *SRegion) GetSecurityGroups(name string) ([]SSecurityGroup, error)
 
 func (region *SRegion) GetSecurityGroupDetails(secgroupId string) (*SSecurityGroup, error) {
 	secgroup := SSecurityGroup{region: region}
-	return &secgroup, region.client.Get(secgroupId, []string{}, &secgroup)
+	return &secgroup, region.get(secgroupId, url.Values{}, &secgroup)
 }
 
 func (self *SSecurityGroup) Refresh() error {
@@ -422,7 +423,7 @@ func (region *SRegion) AttachSecurityToInterfaces(secgroupId string, nicIds []st
 			return err
 		}
 		nic.Properties.NetworkSecurityGroup = &SSecurityGroup{ID: secgroupId}
-		if err := region.client.Update(jsonutils.Marshal(nic), nil); err != nil {
+		if err := region.update(jsonutils.Marshal(nic), nil); err != nil {
 			return err
 		}
 	}
@@ -453,12 +454,12 @@ func (self *SSecurityGroup) Delete() error {
 				return err
 			}
 			nic.Properties.NetworkSecurityGroup = nil
-			if err := self.region.client.Update(jsonutils.Marshal(nic), nil); err != nil {
+			if err := self.region.update(jsonutils.Marshal(nic), nil); err != nil {
 				return err
 			}
 		}
 	}
-	return self.region.client.Delete(self.ID)
+	return self.region.del(self.ID)
 }
 
 func (self *SSecurityGroup) SetRules(rules []cloudprovider.SecurityRule) error {
@@ -479,7 +480,7 @@ func (self *SSecurityGroup) SetRules(rules []cloudprovider.SecurityRule) error {
 	}
 	self.Properties.SecurityRules = securityRules
 	self.Properties.ProvisioningState = ""
-	return self.region.client.Update(jsonutils.Marshal(self), nil)
+	return self.region.update(jsonutils.Marshal(self), nil)
 }
 
 func (self *SSecurityGroup) SyncRules(common, inAdds, outAdds, inDels, outDels []cloudprovider.SecurityRule) error {

pkg/multicloud/azure/service.go

@@ -16,6 +16,7 @@ package azure
 
 import (
 	"fmt"
+	"net/url"
 )
 
 type SServices struct {
@@ -36,24 +37,24 @@ type ResourceType struct {
 	ResourceType string   `json:"resourceType,omitempty"`
 }
 
-func (self *SRegion) ListServices() ([]SService, error) {
+func (self *SAzureClient) ListServices() ([]SService, error) {
 	services := []SService{}
-	return services, self.client.List("providers", &services)
+	return services, self.list("providers", url.Values{}, &services)
 }
 
 func (self *SRegion) SerciceShow(serviceType string) (*SService, error) {
 	service := SService{}
-	return &service, self.client.Get("providers/"+serviceType, []string{}, &service)
+	return &service, self.get("providers/"+serviceType, url.Values{}, &service)
 }
 
 func (self *SRegion) serviceOperation(resourceType, operation string) error {
-	services, err := self.ListServices()
+	services, err := self.client.ListServices()
 	if err != nil {
 		return err
 	}
 	for _, service := range services {
 		if service.Namespace == resourceType {
-			_, err := self.client.jsonRequest("POST", fmt.Sprintf("%s/%s", service.ID, operation), "")
+			_, err := self.client.jsonRequest("POST", fmt.Sprintf("%s/%s", service.ID, operation), nil, url.Values{})
 			return err
 		}
 	}

pkg/multicloud/azure/shell/cloudpolicy.go

@@ -61,7 +61,7 @@ func init() {
 	}
 
 	shellutils.R(&AssignmentIdOption{}, "assignment-delete", "Delete role assignment", func(cli *azure.SRegion, args *AssignmentIdOption) error {
-		return cli.GetClient().Delete(args.ID)
+		return cli.GetClient().GDelete(args.ID)
 	})
 
 	type ObjectPolicyListOptions struct {

pkg/multicloud/azure/shell/instance.go

@@ -54,19 +54,18 @@ func init() {
 	})
 
 	type InstanceSizeListOptions struct {
-		Location string
 	}
 
 	shellutils.R(&InstanceSizeListOptions{}, "instance-size-list", "List intances", func(cli *azure.SRegion, args *InstanceSizeListOptions) error {
-		if vmSize, err := cli.GetVMSize(args.Location); err != nil {
+		vmSizes, err := cli.ListVmSizes()
+		if err != nil {
 			return err
-		} else {
-			printObject(vmSize)
-			return nil
 		}
+		printList(vmSizes, 0, 0, 0, nil)
+		return nil
 	})
 	shellutils.R(&InstanceSizeListOptions{}, "resource-sku-list", "List resource sku", func(cli *azure.SRegion, args *InstanceSizeListOptions) error {
-		skus, err := cli.GetResourceSkus(args.Location)
+		skus, err := cli.GetClient().ListResourceSkus()
 		if err != nil {
 			return err
 		}

pkg/multicloud/azure/shell/resourcegroup.go

@@ -25,12 +25,12 @@ func init() {
 		Offset int `help:"page offset"`
 	}
 	shellutils.R(&ResourceGroupListOptions{}, "resource-group-list", "List group", func(cli *azure.SRegion, args *ResourceGroupListOptions) error {
-		if groups, err := cli.GetResourceGroups(); err != nil {
+		groups, err := cli.GetClient().ListResourceGroups()
+		if err != nil {
 			return err
-		} else {
-			printList(groups, len(groups), args.Offset, args.Limit, []string{})
-			return nil
 		}
+		printList(groups, len(groups), 0, 0, []string{})
+		return nil
 	})
 
 	type ResourceGroupOptions struct {
@@ -47,10 +47,11 @@ func init() {
 	})
 
 	shellutils.R(&ResourceGroupOptions{}, "resource-group-create", "Create resource group", func(cli *azure.SRegion, args *ResourceGroupOptions) error {
-		err := cli.CreateResourceGroup(args.GROUP)
+		resp, err := cli.CreateResourceGroup(args.GROUP)
 		if err != nil {
 			return err
 		}
+		printObject(resp)
 		return nil
 	})
 

pkg/multicloud/azure/shell/service.go

@@ -23,7 +23,7 @@ func init() {
 	type ServiceListOptions struct {
 	}
 	shellutils.R(&ServiceListOptions{}, "service-list", "List providers", func(cli *azure.SRegion, args *ServiceListOptions) error {
-		services, err := cli.ListServices()
+		services, err := cli.GetClient().ListServices()
 		if err != nil {
 			return err
 		}

pkg/multicloud/azure/shell/storageaccount.go

@@ -25,12 +25,12 @@ func init() {
 	type StorageAccountListOptions struct {
 	}
 	shellutils.R(&StorageAccountListOptions{}, "storage-account-list", "List storage account", func(cli *azure.SRegion, args *StorageAccountListOptions) error {
-		if accounts, err := cli.GetStorageAccounts(); err != nil {
+		accounts, err := cli.ListStorageAccounts()
+		if err != nil {
 			return err
-		} else {
-			printList(accounts, len(accounts), 0, 0, []string{})
-			return nil
 		}
+		printList(accounts, len(accounts), 0, 0, []string{})
+		return nil
 	})
 
 	type StorageAccountOptions struct {

pkg/multicloud/azure/shell/subscription.go

@@ -23,7 +23,7 @@ func init() {
 	type SubscriptionListOptions struct {
 	}
 	shellutils.R(&SubscriptionListOptions{}, "subscription-list", "List subscriptions", func(cli *azure.SRegion, args *SubscriptionListOptions) error {
-		subscriptions, err := cli.GetClient().GetSubscriptions()
+		subscriptions, err := cli.GetClient().ListSubscriptions()
 		if err != nil {
 			return err
 		}

pkg/multicloud/azure/snapshot.go

@@ -15,7 +15,6 @@
 package azure
 
 import (
-	"fmt"
 	"strings"
 
 	"yunion.io/x/jsonutils"
@@ -90,7 +89,7 @@ func (self *SRegion) CreateSnapshot(diskId, snapName, desc string) (*SSnapshot,
 		},
 		Type: "Microsoft.Compute/snapshots",
 	}
-	return &snapshot, self.client.Create(jsonutils.Marshal(snapshot), &snapshot)
+	return &snapshot, self.create("", jsonutils.Marshal(snapshot), &snapshot)
 }
 
 func (self *SSnapshot) Delete() error {
@@ -102,7 +101,7 @@ func (self *SSnapshot) GetSizeMb() int32 {
 }
 
 func (self *SRegion) DeleteSnapshot(snapshotId string) error {
-	return self.client.Delete(snapshotId)
+	return self.del(snapshotId)
 }
 
 type AccessURIOutput struct {
@@ -119,7 +118,11 @@ type AccessURI struct {
 }
 
 func (self *SRegion) GrantAccessSnapshot(snapshotId string) (string, error) {
-	body, err := self.client.PerformAction(snapshotId, "beginGetAccess", fmt.Sprintf(`{"access": "Read", "durationInSeconds": %d}`, 3600*24))
+	params := map[string]interface{}{
+		"access":            "Read",
+		"durationInSeconds": 3600 * 24,
+	}
+	body, err := self.perform(snapshotId, "beginGetAccess", jsonutils.Marshal(params))
 	if err != nil {
 		return "", err
 	}
@@ -149,7 +152,7 @@ func (self *SRegion) GetISnapshots() ([]cloudprovider.ICloudSnapshot, error) {
 		return nil, err
 	}
 	classicSnapshots := []SClassicSnapshot{}
-	storages, err := self.GetStorageAccounts()
+	storages, err := self.ListStorageAccounts()
 	if err != nil {
 		return nil, err
 	}

pkg/multicloud/azure/storage.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/pkg/errors"
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 
@@ -117,10 +118,9 @@ func (self *SStorage) GetIDisks() ([]cloudprovider.ICloudDisk, error) {
 			log.Debugf("find disk %s for storage %s", disks[i].GetName(), self.GetName())
 		}
 	}
-	storageaccounts, err := self.zone.region.GetStorageAccounts()
+	storageaccounts, err := self.zone.region.ListStorageAccounts()
 	if err != nil {
-		log.Errorf("List storage account for get idisks error: %v", err)
-		return nil, err
+		return nil, errors.Wrapf(err, "ListStorageAccounts")
 	}
 	for i := 0; i < len(storageaccounts); i++ {
 		storageType := strings.ToLower(storageaccounts[i].Sku.Name)

pkg/multicloud/azure/storageaccount.go

@@ -21,6 +21,7 @@ import (
 	"io"
 	"math/rand"
 	"net/http"
+	"net/url"
 	"path"
 	"strconv"
 	"strings"
@@ -101,19 +102,24 @@ type SStorageAccount struct {
 	Properties AccountProperties `json:"properties"`
 }
 
-func (self *SRegion) GetStorageAccounts() ([]*SStorageAccount, error) {
-	iBuckets, err := self.client.getIBuckets()
+func (self *SRegion) listStorageAccounts() ([]SStorageAccount, error) {
+	accounts := []SStorageAccount{}
+	err := self.client.list("Microsoft.Storage/storageAccounts", url.Values{}, &accounts)
 	if err != nil {
-		return nil, errors.Wrap(err, "getIBuckets")
+		return nil, errors.Wrapf(err, "list")
 	}
-	ret := make([]*SStorageAccount, 0)
-	for i := range iBuckets {
-		if iBuckets[i].GetLocation() != self.GetId() {
-			continue
+	result := []SStorageAccount{}
+	for i := range accounts {
+		if strings.ToLower(accounts[i].Location) == strings.ToLower(self.Name) {
+			accounts[i].region = self
+			result = append(result, accounts[i])
 		}
-		ret = append(ret, iBuckets[i].(*SStorageAccount))
 	}
-	return ret, nil
+	return result, nil
+}
+
+func (self *SRegion) ListStorageAccounts() ([]SStorageAccount, error) {
+	return self.listStorageAccounts()
 }
 
 func randomString(prefix string, length int) string {
@@ -129,8 +135,11 @@ func randomString(prefix string, length int) string {
 func (self *SRegion) GetUniqStorageAccountName() string {
 	for {
 		uniqString := randomString("storage", 8)
-		requestBody := fmt.Sprintf(`{"name": "%s", "type": "Microsoft.Storage/storageAccounts"}`, uniqString)
-		body, err := self.client.CheckNameAvailability("Microsoft.Storage", requestBody)
+		params := map[string]string{
+			"name": uniqString,
+			"type": "Microsoft.Storage/storageAccounts",
+		}
+		body, err := self.client.CheckNameAvailability("Microsoft.Storage", jsonutils.Marshal(params))
 		if err != nil {
 			continue
 		}
@@ -152,12 +161,12 @@ type sStorageAccountCheckNameAvailabilityOutput struct {
 }
 
 func (self *SRegion) checkStorageAccountNameExist(name string) (bool, error) {
-	url := fmt.Sprintf("/subscriptions/%s/providers/Microsoft.Storage/checkNameAvailability?api-version=2019-04-01", self.client.subscriptionId)
+	resource := fmt.Sprintf("/subscriptions/%s/providers/Microsoft.Storage/checkNameAvailability?api-version=2019-04-01", self.client.subscriptionId)
 	body := jsonutils.Marshal(sStorageAccountCheckNameAvailabilityInput{
 		Name: name,
 		Type: "Microsoft.Storage/storageAccounts",
 	})
-	resp, err := self.client.jsonRequest("POST", url, body.String())
+	resp, err := self.client.jsonRequest("POST", resource, body, url.Values{})
 	if err != nil {
 		return false, errors.Wrap(err, "jsonRequest")
 	}
@@ -196,7 +205,7 @@ type SStorageAccountSku struct {
 
 func (self *SRegion) GetStorageAccountSkus() ([]SStorageAccountSku, error) {
 	skus := make([]SStorageAccountSku, 0)
-	err := self.client.List("providers/Microsoft.Storage/skus?api-version=2019-04-01", &skus)
+	err := self.client.list("Microsoft.Storage/skus", url.Values{}, &skus)
 	if err != nil {
 		return nil, errors.Wrap(err, "List")
 	}
@@ -254,11 +263,10 @@ func (self *SRegion) createStorageAccount(name string, skuName string) (*SStorag
 		Type: "Microsoft.Storage/storageAccounts",
 	}
 
-	err := self.client.Create(jsonutils.Marshal(storageaccount), &storageaccount)
+	err := self.create("", jsonutils.Marshal(storageaccount), &storageaccount)
 	if err != nil {
 		return nil, errors.Wrap(err, "Create")
 	}
-	self.client.invalidateIBuckets()
 	return &storageaccount, nil
 }
 
@@ -284,21 +292,21 @@ func (self *SRegion) CreateStorageAccount(storageAccount string) (*SStorageAccou
 			Type: "Microsoft.Storage/storageAccounts",
 			Tags: map[string]string{"id": storageAccount},
 		}
-		return &stoargeaccount, self.client.Create(jsonutils.Marshal(stoargeaccount), &stoargeaccount)
+		return &stoargeaccount, self.create("", jsonutils.Marshal(stoargeaccount), &stoargeaccount)
 	}
 	return nil, err
 }
 
 func (self *SRegion) getStorageAccountID(storageAccount string) (*SStorageAccount, error) {
-	accounts, err := self.GetStorageAccounts()
+	accounts, err := self.ListStorageAccounts()
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrapf(err, "ListStorageAccounts")
 	}
 	for i := 0; i < len(accounts); i++ {
 		for k, v := range accounts[i].Tags {
 			if k == "id" && v == storageAccount {
 				accounts[i].region = self
-				return accounts[i], nil
+				return &accounts[i], nil
 			}
 		}
 	}
@@ -307,7 +315,7 @@ func (self *SRegion) getStorageAccountID(storageAccount string) (*SStorageAccoun
 
 func (self *SRegion) GetStorageAccountDetail(accountId string) (*SStorageAccount, error) {
 	account := SStorageAccount{region: self}
-	err := self.client.Get(accountId, []string{}, &account)
+	err := self.get(accountId, url.Values{}, &account)
 	if err != nil {
 		return nil, err
 	}
@@ -321,7 +329,7 @@ type AccountKeys struct {
 }
 
 func (self *SRegion) GetStorageAccountKey(accountId string) (string, error) {
-	body, err := self.client.PerformAction(accountId, "listKeys", "")
+	body, err := self.perform(accountId, "listKeys", nil)
 	if err != nil {
 		return "", err
 	}
@@ -342,20 +350,20 @@ func (self *SRegion) GetStorageAccountKey(accountId string) (string, error) {
 }
 
 func (self *SRegion) DeleteStorageAccount(accountId string) error {
-	return self.client.Delete(accountId)
+	return self.del(accountId)
 }
 
-func (self *SRegion) GetClassicStorageAccounts() ([]*SStorageAccount, error) {
-	result := make([]*SStorageAccount, 0)
+func (self *SRegion) GetClassicStorageAccounts() ([]SStorageAccount, error) {
+	result := make([]SStorageAccount, 0)
 	accounts := make([]SStorageAccount, 0)
-	err := self.client.ListAll("Microsoft.ClassicStorage/storageAccounts", &accounts)
+	err := self.client.list("Microsoft.ClassicStorage/storageAccounts", url.Values{}, &accounts)
 	if err != nil {
 		return nil, err
 	}
 	for i := 0; i < len(accounts); i++ {
 		if accounts[i].Location == self.Name {
 			accounts[i].region = self
-			result = append(result, &accounts[i])
+			result = append(result, accounts[i])
 		}
 	}
 	return result, nil

pkg/multicloud/azure/storagecache.go

@@ -133,9 +133,9 @@ func (self *SStoragecache) UploadImage(ctx context.Context, userCred mcclient.To
 }
 
 func (self *SStoragecache) checkStorageAccount() (*SStorageAccount, error) {
-	storageaccounts, err := self.region.GetStorageAccounts()
+	storageaccounts, err := self.region.ListStorageAccounts()
 	if err != nil {
-		return nil, errors.Wrap(err, "GetStorageAccounts")
+		return nil, errors.Wrap(err, "ListStorageAccounts")
 	}
 	if len(storageaccounts) == 0 {
 		storageaccount, err := self.region.CreateStorageAccount(self.region.Name)
@@ -146,16 +146,16 @@ func (self *SStoragecache) checkStorageAccount() (*SStorageAccount, error) {
 	}
 	for i := 0; i < len(storageaccounts); i++ {
 		if id, ok := storageaccounts[i].Tags["id"]; ok && id == self.region.Name {
-			return storageaccounts[i], nil
+			return &storageaccounts[i], nil
 		}
 	}
 
-	storageaccount := storageaccounts[0]
+	storageaccount := &storageaccounts[0]
 	if storageaccount.Tags == nil {
 		storageaccount.Tags = map[string]string{}
 	}
 	storageaccount.Tags["id"] = self.region.Name
-	err = self.region.client.Update(jsonutils.Marshal(storageaccount), nil)
+	err = self.region.update(jsonutils.Marshal(storageaccount), nil)
 	if err != nil {
 		return nil, errors.Wrapf(err, "Update(%s)", jsonutils.Marshal(storageaccount).String())
 	}

pkg/multicloud/azure/subscription.go

@@ -1,6 +1,6 @@
 package azure
 
-import "yunion.io/x/pkg/errors"
+import "net/url"
 
 type SSubscription struct {
 	SubscriptionId string `json:"subscriptionId"`
@@ -8,15 +8,8 @@ type SSubscription struct {
 	DisplayName    string `json:"displayName"`
 }
 
-func (self *SAzureClient) GetSubscriptions() ([]SSubscription, error) {
-	resp, err := self.ListSubscriptions()
-	if err != nil {
-		return nil, err
-	}
-	subscriptions := []SSubscription{}
-	err = resp.Unmarshal(&subscriptions, "value")
-	if err != nil {
-		return nil, errors.Wrap(err, "resp.Unmarshal")
-	}
-	return subscriptions, nil
+func (self *SAzureClient) ListSubscriptions() ([]SSubscription, error) {
+	result := []SSubscription{}
+	err := self.list("subscriptions", url.Values{}, &result)
+	return result, err
 }

pkg/multicloud/azure/usage.go

@@ -16,6 +16,7 @@ package azure
 
 import (
 	"fmt"
+	"net/url"
 	"strings"
 
 	"yunion.io/x/pkg/errors"
@@ -59,7 +60,7 @@ func (u *SUsage) GetCurrentQuotaUsedCount() int {
 func (region *SRegion) GetUsage(resourceType string) ([]SUsage, error) {
 	usage := []SUsage{}
 	resource := fmt.Sprintf("%s/locations/%s/usages", resourceType, region.Name)
-	err := region.client.ListAll(resource, &usage)
+	err := region.client.list(resource, url.Values{}, &usage)
 	if err != nil {
 		return nil, errors.Wrapf(err, "ListAll(%s)", resource)
 	}

pkg/multicloud/azure/vpc.go

@@ -15,6 +15,7 @@
 package azure
 
 import (
+	"net/url"
 	"strings"
 
 	"yunion.io/x/jsonutils"
@@ -98,7 +99,7 @@ func (self *SVpc) Delete() error {
 }
 
 func (self *SRegion) DeleteVpc(vpcId string) error {
-	return self.client.Delete(vpcId)
+	return self.del(vpcId)
 }
 
 func (self *SVpc) getSecurityGroups() ([]SSecurityGroup, error) {
@@ -219,7 +220,7 @@ func (self *SVpc) GetStatus() string {
 
 func (region *SRegion) GetVpc(vpcId string) (*SVpc, error) {
 	vpc := SVpc{region: region}
-	return &vpc, region.client.Get(vpcId, []string{}, &vpc)
+	return &vpc, region.get(vpcId, url.Values{}, &vpc)
 }
 
 func (self *SVpc) Refresh() error {
@@ -244,5 +245,5 @@ func (self *SVpc) GetNetworks() []SNetwork {
 
 func (self *SRegion) GetNetworkDetail(networkId string) (*Subnet, error) {
 	subnet := Subnet{}
-	return &subnet, self.client.Get(networkId, []string{}, &subnet)
+	return &subnet, self.get(networkId, url.Values{}, &subnet)
 }

pkg/multicloud/azure/wire.go

@@ -88,7 +88,7 @@ func (self *SRegion) createNetwork(vpc *SVpc, subnetName string, cidr string, de
 		*vpc.Properties.Subnets = append(*vpc.Properties.Subnets, subnet)
 	}
 	vpc.Properties.ProvisioningState = ""
-	err := self.client.Update(jsonutils.Marshal(vpc), vpc)
+	err := self.update(jsonutils.Marshal(vpc), vpc)
 	if err != nil {
 		return nil, err
 	}