Merge pull request #8544 from hamzy/PowerVS-Destroy-DHCP-in-ERROR-state

OCPBUGS-35039: PowerVS: Destroy DHCP in ERROR state

Author: openshift-merge-bot[bot]

pkg/destroy/powervs/dhcp.go

@@ -45,7 +45,34 @@ func (o *ClusterUninstaller) listDHCPNetworks() (cloudResources, error) {
 			continue
 		}
 		if dhcpServer.Network.Name == nil {
+			// https://github.com/IBM-Cloud/power-go-client/blob/master/power/models/p_vm_instance.go#L22
+			var instance *models.PVMInstance
+
 			o.Logger.Debugf("listDHCPNetworks: DHCP has empty Network.Name: %s", *dhcpServer.ID)
+
+			instance, err = o.instanceClient.Get(*dhcpServer.ID)
+			o.Logger.Debugf("listDHCPNetworks: Getting instance %s %v", *dhcpServer.ID, err)
+			if err != nil {
+				continue
+			}
+
+			if instance.Status == nil {
+				continue
+			}
+			// If there is a backing DHCP VM and it has a status, then check for an ERROR state
+			o.Logger.Debugf("listDHCPNetworks: instance.Status: %s", *instance.Status)
+			if *instance.Status != "ERROR" {
+				continue
+			}
+
+			foundOne = true
+			result = append(result, cloudResource{
+				key:      *dhcpServer.ID,
+				name:     *dhcpServer.ID,
+				status:   "VM",
+				typeName: dhcpTypeName,
+				id:       *dhcpServer.ID,
+			})
 			continue
 		}
 
@@ -55,7 +82,7 @@ func (o *ClusterUninstaller) listDHCPNetworks() (cloudResources, error) {
 			result = append(result, cloudResource{
 				key:      *dhcpServer.ID,
 				name:     *dhcpServer.Network.Name,
-				status:   "",
+				status:   "DHCP",
 				typeName: dhcpTypeName,
 				id:       *dhcpServer.ID,
 			})
@@ -101,6 +128,30 @@ func (o *ClusterUninstaller) destroyDHCPNetwork(item cloudResource) error {
 	return nil
 }
 
+func (o *ClusterUninstaller) destroyDHCPVM(item cloudResource) error {
+	var err error
+
+	_, err = o.instanceClient.Get(item.id)
+	if err != nil {
+		o.deletePendingItems(item.typeName, []cloudResource{item})
+		o.Logger.Infof("Deleted DHCP VM %q", item.name)
+		return nil
+	}
+
+	o.Logger.Debugf("Deleting DHCP VM %q", item.name)
+
+	err = o.instanceClient.Delete(item.id)
+	if err != nil {
+		o.Logger.Infof("Error: DHCP o.instanceClient.Delete: %q", err)
+		return err
+	}
+
+	o.deletePendingItems(item.typeName, []cloudResource{item})
+	o.Logger.Infof("Deleted DHCP VM %q", item.name)
+
+	return nil
+}
+
 // destroyDHCPNetworks searches for DHCP networks that are in a previous list
 // the cluster's infra ID.
 func (o *ClusterUninstaller) destroyDHCPNetworks() error {
@@ -132,7 +183,17 @@ func (o *ClusterUninstaller) destroyDHCPNetworks() error {
 			Cap:      leftInContext(ctx),
 			Steps:    math.MaxInt32}
 		err = wait.ExponentialBackoffWithContext(ctx, backoff, func(context.Context) (bool, error) {
-			err2 := o.destroyDHCPNetwork(item)
+			var err2 error
+
+			switch item.status {
+			case "DHCP":
+				err2 = o.destroyDHCPNetwork(item)
+			case "VM":
+				err2 = o.destroyDHCPVM(item)
+			default:
+				err2 = fmt.Errorf("unknown DHCP item status %s", item.status)
+				return true, err2
+			}
 			if err2 == nil {
 				return true, err2
 			}