Merge pull request #265 from SolaceProducts/moodiRealist/DATAGO-103120-sap-cfgpush

DATAGO-103120: configPush to federated accounts from the primary account

Author: moodiRealist

service/application/src/main/java/com/solace/maas/ep/common/messages/CommandMessage.java

@@ -21,6 +21,7 @@ public class CommandMessage extends MOPMessage implements CommandMessageWithReso
     private JobStatus status;
     private List<CommandBundle> commandBundles;
     private List<EventBrokerResourceConfiguration> resources;
+    private String originOrgId;
 
     public CommandMessage() {
         super();

service/application/src/main/java/com/solace/maas/ep/event/management/agent/command/CommandManager.java

@@ -229,6 +229,7 @@ private void finalizeAndSendResponse(CommandRequest requestBO) {
         response.setOrgId(requestBO.getOrgId());
         response.setTraceId(MDC.get(TRACE_ID));
         response.setActorId(MDC.get(ACTOR_ID));
+        response.setOriginOrgId(requestBO.getOriginOrgId());
         commandPublisher.sendCommandResponse(response, topicVars);
         meterRegistry.counter(MAAS_EMA_CONFIG_PUSH_EVENT_SENT, ORG_ID_TAG, response.getOrgId(),
                 STATUS_TAG, response.getStatus().name()).increment();

service/plugin/src/main/java/com/solace/maas/ep/event/management/agent/plugin/command/model/CommandRequest.java

@@ -23,6 +23,7 @@ public class CommandRequest {
     private Instant createdTime;
     private Instant updatedTime;
     private String orgId;
+    private String originOrgId;
 
     public long getLifetime(TemporalUnit timeUnit) {
         if (createdTime == null) {