Issue #3593 - Bug: auto-upgrade of ha group edge devices does not per…

…form rolling update (#3609)

Signed-off-by: Max McAdam <max@fredcom.com>

Signed-off-by: Max McAdam <max@fredcom.com>

agreementbot/agreementbot.go

@@ -1616,7 +1616,7 @@ func (w *AgreementBotWorker) monitorHAGroupNMPUpdates() int {
 			if err != nil {
 				glog.Errorf(AWlogString(fmt.Sprintf("error deleting nmp status %v/%v/%v: %v", node.OrgId, node.NodeId, node.NMPName, err)))
 			} else {
-				glog.Errorf("removed %v/%v/%v", node.OrgId, node.NodeId, node.NMPName)
+				glog.V(3).Infof(AWlogString(fmt.Sprintf("removed %v/%v/%v from ha nmp upgrade table", node.OrgId, node.NodeId, node.NMPName)))
 			}
 		}
 	}

exchange/node_management_status.go

@@ -12,7 +12,7 @@ func GetNodeManagementPolicyStatus(ec ExchangeContext, orgId string, nodeId stri
 	glog.V(3).Infof("Getting node management policy status for node %v/%v and policy %v", orgId, nodeId, policyName)
 
 	var resp interface{}
-	resp = new(exchangecommon.NodeManagementPolicyStatus)
+	resp = new(exchangecommon.ExchangeNMPStatus)
 
 	_, policyName = cutil.SplitOrgSpecUrl(policyName)
 
@@ -23,7 +23,12 @@ func GetNodeManagementPolicyStatus(ec ExchangeContext, orgId string, nodeId stri
 		return nil, err
 	}
 
-	nmpStatus := resp.(*exchangecommon.NodeManagementPolicyStatus)
+	nmpStatusMap := resp.(*exchangecommon.ExchangeNMPStatus)
+	nmpStatus, ok := nmpStatusMap.ManagementStatus[fmt.Sprintf("%v/%v", orgId, policyName)]
+	if !ok {
+		return nil, fmt.Errorf("Error: status for policy %v/%v not found in exchange status list %v", orgId, policyName, resp)
+	}
+
 	return nmpStatus, nil
 }
 

exchange/rpc.go

@@ -307,6 +307,8 @@ func InvokeExchange(httpClient *http.Client, method string, urlPath string, user
 					case *exchangecommon.NodeManagementPolicyStatus:
 						return nil, nil
 
+					case *exchangecommon.ExchangeNMPStatus:
+						return nil, nil
 					default:
 						return errors.New(fmt.Sprintf("Unknown type of response object %v (%T) passed to invocation of %v at %v with %v", *resp, *resp, method, urlPath, requestBody)), nil
 					}