Merge pull request #128 from oracle/jah/127

Fixes #127 - delete terminal nodes

Author: prydie

pkg/oci/client/client.go

@@ -222,7 +222,8 @@ func (c *client) GetInstanceByNodeName(nodeName string) (*baremetal.Instance, er
 	}
 }
 
-func isInstanceInTerminalState(instance *baremetal.Instance) bool {
+// IsInstanceInTerminalState returns true if the instance is in a terminal state, false otherwise.
+func IsInstanceInTerminalState(instance *baremetal.Instance) bool {
 	return instance.State == baremetal.ResourceTerminated ||
 		instance.State == baremetal.ResourceTerminating ||
 		instance.State == "UNKNOWN"
@@ -231,7 +232,7 @@ func isInstanceInTerminalState(instance *baremetal.Instance) bool {
 func getNonTerminalInstances(instances []baremetal.Instance) []baremetal.Instance {
 	var result []baremetal.Instance
 	for _, instance := range instances {
-		if !isInstanceInTerminalState(&instance) {
+		if !IsInstanceInTerminalState(&instance) {
 			result = append(result, instance)
 		}
 	}
@@ -266,7 +267,7 @@ func (c *client) findInstanceByNodeNameIsVnic(nodeName string) (*baremetal.Insta
 					return nil, err
 				}
 
-				if isInstanceInTerminalState(instance) {
+				if IsInstanceInTerminalState(instance) {
 					glog.Warningf("Instance %q is in state %q which is a terminal state", instance.ID, instance.State)
 					continue
 				}

pkg/oci/client/client_test.go

@@ -53,11 +53,11 @@ func TestInstanceTerminalState(t *testing.T) {
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
-			result := isInstanceInTerminalState(&baremetal.Instance{
+			result := IsInstanceInTerminalState(&baremetal.Instance{
 				State: tc.state,
 			})
 			if result != tc.expected {
-				t.Errorf("isInstanceInTerminalState(%q) = %v ; wanted %v", tc.state, result, tc.expected)
+				t.Errorf("IsInstanceInTerminalState(%q) = %v ; wanted %v", tc.state, result, tc.expected)
 			}
 		})
 	}

pkg/oci/instances.go

@@ -143,6 +143,13 @@ func (cp *CloudProvider) CurrentNodeName(hostname string) (types.NodeName, error
 func (cp *CloudProvider) InstanceExistsByProviderID(providerID string) (bool, error) {
 	glog.V(4).Infof("InstanceExistsByProviderID(%q) called", providerID)
 	instanceID := util.MapProviderIDToInstanceID(providerID)
-	r, err := cp.client.GetInstance(instanceID)
-	return (r != nil), err
+	instance, err := cp.client.GetInstance(instanceID)
+	if client.IsNotFound(err) {
+		return false, nil
+	}
+	if err != nil {
+		return false, err
+	}
+
+	return !client.IsInstanceInTerminalState(instance), nil
 }