Merge pull request #1050 from ioito/hotfix/qx-huawei-errcode

fix(huawei): error code

Author: ioito

pkg/multicloud/huawei/huawei.go

@@ -514,7 +514,7 @@ func (self *SHuaweiClient) QueryAccountBalance() (*SBalance, error) {
 		resp, err := self.list(service, "", "accounts/customer-accounts/balances", nil)
 		if err != nil {
 			// 国际区账号会报错: {"error_code":"CBC.0150","error_msg":"Access denied. The customer does not belong to the website you are now at."}
-			if e, ok := err.(*httputils.JSONClientError); ok && e.Class == "CBC.0150" {
+			if e, ok := err.(*sHuaweiError); ok && (e.ErrorCode == "CBC.0150" || e.ErrorCode == "CBC.0156") {
 				continue
 			}
 			return nil, err

pkg/multicloud/huawei/saml_provider.go

@@ -21,7 +21,6 @@ import (
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/errors"
-	"yunion.io/x/pkg/util/httputils"
 	"yunion.io/x/pkg/util/samlutils"
 	"yunion.io/x/pkg/util/stringutils"
 
@@ -209,11 +208,11 @@ func (self *SHuaweiClient) CreateSAMLProvider(opts *cloudprovider.SAMLProviderCr
 			if err == nil {
 				return nil
 			}
-			he, ok := errors.Cause(err).(*httputils.JSONClientError)
+			he, ok := errors.Cause(err).(*sHuaweiError)
 			if !ok {
 				return errors.Wrapf(err, "SAMLProviders.Update")
 			}
-			if he.Code != 409 {
+			if he.ErrorInfo.Code != "409" {
 				return errors.Wrapf(err, "SAMLProviders.Update")
 			}
 			samlName = fmt.Sprintf("%s-%d", string(name), idx)