From 4767d1d53673d8cb8a5a23544fbd634eac5f6203 Mon Sep 17 00:00:00 2001
From: wanyaoqi <wanyaoqi@yunionyun.com>
Date: Mon, 30 Dec 2019 11:19:20 +0800
Subject: [PATCH] public cloud support postpaid expire

---
 pkg/compute/guestdrivers/base.go      | 5 ++---
 pkg/compute/guestdrivers/esxi.go      | 9 ---------
 pkg/compute/guestdrivers/kvm.go       | 9 ---------
 pkg/compute/guestdrivers/openstack.go | 9 ---------
 pkg/compute/guestdrivers/zstack.go    | 9 ---------
 5 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/pkg/compute/guestdrivers/base.go b/pkg/compute/guestdrivers/base.go
index 2d36760cc7..06a5e16364 100644
--- a/pkg/compute/guestdrivers/base.go
+++ b/pkg/compute/guestdrivers/base.go
@@ -251,7 +251,7 @@ func (self *SBaseGuestDriver) IsSupportedBillingCycle(bc billing.SBillingCycle)
 }
 
 func (self *SBaseGuestDriver) IsSupportPostpaidExpire() bool {
-	return false
+	return true
 }
 
 func (self *SBaseGuestDriver) RequestRenewInstance(guest *models.SGuest, bc billing.SBillingCycle) (time.Time, error) {
@@ -324,6 +324,5 @@ func (self *SBaseGuestDriver) RequestSyncSecgroupsOnHost(ctx context.Context, gu
 
 func (self *SBaseGuestDriver) CancelExpireTime(
 	ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest) error {
-
-	return httperrors.NewBadRequestError("unsupport cancel expire time")
+	return guest.CancelExpireTime(ctx, userCred)
 }
diff --git a/pkg/compute/guestdrivers/esxi.go b/pkg/compute/guestdrivers/esxi.go
index fbabdbd083..4ae510e395 100644
--- a/pkg/compute/guestdrivers/esxi.go
+++ b/pkg/compute/guestdrivers/esxi.go
@@ -284,15 +284,6 @@ func (self *SESXiGuestDriver) RequestAssociateEip(ctx context.Context, userCred
 	return fmt.Errorf("ESXiGuestDriver not support associate eip")
 }
 
-func (self *SESXiGuestDriver) CancelExpireTime(
-	ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest) error {
-	return guest.CancelExpireTime(ctx, userCred)
-}
-
-func (self *SESXiGuestDriver) IsSupportPostpaidExpire() bool {
-	return true
-}
-
 func (self *SESXiGuestDriver) IsSupportCdrom(guest *models.SGuest) (bool, error) {
 	return false, nil
 }
diff --git a/pkg/compute/guestdrivers/kvm.go b/pkg/compute/guestdrivers/kvm.go
index ca78b06e29..16f254a388 100644
--- a/pkg/compute/guestdrivers/kvm.go
+++ b/pkg/compute/guestdrivers/kvm.go
@@ -484,15 +484,6 @@ func (self *SKVMGuestDriver) OnGuestChangeCpuMemFailed(ctx context.Context, gues
 	return nil
 }
 
-func (self *SKVMGuestDriver) CancelExpireTime(
-	ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest) error {
-	return guest.CancelExpireTime(ctx, userCred)
-}
-
 func (self *SKVMGuestDriver) IsSupportCdrom(guest *models.SGuest) (bool, error) {
 	return true, nil
 }
-
-func (self *SKVMGuestDriver) IsSupportPostpaidExpire() bool {
-	return true
-}
diff --git a/pkg/compute/guestdrivers/openstack.go b/pkg/compute/guestdrivers/openstack.go
index 12b5094f5d..2f52011fa5 100644
--- a/pkg/compute/guestdrivers/openstack.go
+++ b/pkg/compute/guestdrivers/openstack.go
@@ -321,12 +321,3 @@ func (self *SOpenStackGuestDriver) AllowReconfigGuest() bool {
 func (self *SOpenStackGuestDriver) IsSupportedBillingCycle(bc billing.SBillingCycle) bool {
 	return false
 }
-
-func (self *SOpenStackGuestDriver) IsSupportPostpaidExpire() bool {
-	return true
-}
-
-func (self *SOpenStackGuestDriver) CancelExpireTime(
-	ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest) error {
-	return guest.CancelExpireTime(ctx, userCred)
-}
diff --git a/pkg/compute/guestdrivers/zstack.go b/pkg/compute/guestdrivers/zstack.go
index 73be144540..ee4a1492a2 100644
--- a/pkg/compute/guestdrivers/zstack.go
+++ b/pkg/compute/guestdrivers/zstack.go
@@ -169,12 +169,3 @@ func (self *SZStackGuestDriver) AllowReconfigGuest() bool {
 func (self *SZStackGuestDriver) IsSupportedBillingCycle(bc billing.SBillingCycle) bool {
 	return false
 }
-
-func (self *SZStackGuestDriver) IsSupportPostpaidExpire() bool {
-	return true
-}
-
-func (self *SZStackGuestDriver) CancelExpireTime(
-	ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest) error {
-	return guest.CancelExpireTime(ctx, userCred)
-}