Changing the MTPNC error message

Author: shreyashastantram

cns/middlewares/k8sSwiftV2.go

@@ -28,7 +28,7 @@ var (
 	errGetMTPNC                 = errors.New(NetworkNotReadyErrorMsg + " - failed to get MTPNC")
 	errInvalidSWIFTv2NICType    = errors.New("invalid NIC type for SWIFT v2 scenario")
 	errInvalidMTPNCPrefixLength = errors.New("invalid prefix length for MTPNC primaryIP, must be 32")
-	errMTPNCTerminating         = errors.New("MTPNC in terminating state")
+	errMTPNCDeleting            = errors.New(NetworkNotReadyErrorMsg + "found mtpnc for previous pod pending deletion, waiting for new mtpnc to be ready")
 )
 
 type K8sSWIFTv2Middleware struct {
@@ -55,8 +55,8 @@ func (k *K8sSWIFTv2Middleware) GetPodInfoForIPConfigsRequest(ctx context.Context
 		if respCode != types.Success {
 			return nil, respCode, message
 		}
-		if mtpnc.IsTerminating() {
-			return nil, types.UnexpectedError, errMTPNCTerminating.Error()
+		if mtpnc.IsDeleting() {
+			return nil, types.UnexpectedError, errMTPNCDeleting.Error()
 		}
 		// update ipConfigRequest
 		respCode, message = k.UpdateIPConfigRequest(mtpnc, req)

crd/multitenancy/api/v1alpha1/utils.go

@@ -10,6 +10,6 @@ func (m *MultitenantPodNetworkConfig) IsReady() bool {
 	return !reflect.DeepEqual(m.Status, MultitenantPodNetworkConfigStatus{})
 }
 
-func (m *MultitenantPodNetworkConfig) IsTerminating() bool {
+func (m *MultitenantPodNetworkConfig) IsDeleting() bool {
 	return !m.DeletionTimestamp.IsZero()
 }