elasticips: onecloud: delete op for non-managed eip

yunionio · May 28, 2020 · fa833e6 · fa833e6
1 parent 8e1b6de
commit fa833e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/compute/models/elasticips.go b/pkg/compute/models/elasticips.go
@@ -889,7 +889,7 @@ func (self *SElasticip) startEipAllocateTask(ctx context.Context, userCred mccli
 }
 
 func (self *SElasticip) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
-	log.Infof("Elasticip delete do nothing")
+	// Elasticip delete do nothing
 	return nil
 }
 

diff --git a/pkg/compute/tasks/eip_deallocate_task.go b/pkg/compute/tasks/eip_deallocate_task.go
@@ -48,7 +48,7 @@ func (self *EipDeallocateTask) taskFail(ctx context.Context, eip *models.SElasti
 func (self *EipDeallocateTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
 	eip := obj.(*models.SElasticip)
 
-	if len(eip.ExternalId) > 0 {
+	if eip.ExternalId != "" {
 		expEip, err := eip.GetIEip()
 		if err != nil {
 			if errors.Cause(err) != cloudprovider.ErrNotFound && errors.Cause(err) != cloudprovider.ErrInvalidProvider {
@@ -66,6 +66,10 @@ func (self *EipDeallocateTask) OnInit(ctx context.Context, obj db.IStandaloneMod
 		}
 	}
 
+	if eip.IsManaged() {
+		// TODO clear out guestnics
+	}
+
 	err := eip.RealDelete(ctx, self.UserCred)
 	if err != nil {
 		msg := fmt.Sprintf("fail to delete EIP %s", err)