ctyun sync fix

pkg/compute/guestdrivers/managedvirtual.go

@@ -221,7 +221,7 @@ func (self *SManagedVirtualizedGuestDriver) RequestAttachDisk(ctx context.Contex
 			return nil, errors.Wrapf(err, "iVM.AttachDisk")
 		}
 
-		err = cloudprovider.Wait(time.Second*5, time.Minute*3, func() (bool, error) {
+		err = cloudprovider.Wait(time.Second*10, time.Minute*6, func() (bool, error) {
 			err := iVM.Refresh()
 			if err != nil {
 				return false, errors.Wrapf(err, "iVM.Refresh")

pkg/multicloud/ctyun/eip.go

@@ -134,6 +134,11 @@ func (self *SEip) GetINetworkId() string {
 func (self *SEip) GetAssociationType() string {
 	orders, err := self.region.GetOrder(self.WorkOrderResourceID)
 	if err != nil {
+		// bugfix: 由于没有接口可以返向查询出关联的device，这里默认关联的是server？
+		if len(self.PortID) > 0 || len(self.PrivateIPAddress) > 0 {
+			return api.EIP_ASSOCIATE_TYPE_SERVER
+		}
+
 		log.Errorf("SEip.GetAssociationType %s", err)
 		return ""
 	}