diff --git a/pkg/util/huawei/instance.go b/pkg/util/huawei/instance.go index 14fdcc084a..bafebf4e12 100644 --- a/pkg/util/huawei/instance.go +++ b/pkg/util/huawei/instance.go @@ -754,7 +754,7 @@ func (self *SRegion) CreateInstance(name string, imageId string, instanceType st ids, err = self.GetAllSubTaskEntityIDs(self.ecsClient.Servers.ServiceType(), _id, "server_id") } else { // 包年包月 - err = cloudprovider.WaitCreated(10*time.Second, 180*time.Second, func() bool { + err = cloudprovider.WaitCreated(10*time.Second, 300*time.Second, func() bool { log.Debugf("WaitCreated %s", _id) order, e := self.GetOrder(_id) if e != nil { diff --git a/pkg/util/huawei/order.go b/pkg/util/huawei/order.go index c408cfb865..ff66b1932f 100644 --- a/pkg/util/huawei/order.go +++ b/pkg/util/huawei/order.go @@ -5,6 +5,7 @@ import ( "strings" "time" + "yunion.io/x/log" "yunion.io/x/onecloud/pkg/cloudprovider" ) @@ -138,6 +139,8 @@ func (self *SRegion) GetAllResByOrderId(orderId string) ([]SResource, error) { if err != nil { return nil, err } + + log.Debugf("GetAllResByOrderId %s", order.Resources) return order.Resources, nil } @@ -166,7 +169,9 @@ func (self *SRegion) getAllResIdsByType(orderId string, resourceType string) ([] ids := make([]string, 0) for _, r := range res { - ids = append(ids, r.ResourceID) + if len(r.ResourceID) > 0 { + ids = append(ids, r.ResourceID) + } } return ids, nil