Pass rAppInstanceId to k8s participant and create the invoker with the instance Id

[nonrtric/plt/rappmanager.git] / rapp-manager-acm / src / main / java / com / oransc / rappmanager / acm / service / AcmDeployer.java

diff --git a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java b/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java
index dea83a4..dce7be8 100755 (executable)
--- a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java
+++ b/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START======================================================================
  * Copyright (C) 2023 Nordix Foundation. All rights reserved.
- * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,12 +133,13 @@ public class AcmDeployer implements RappDeployer {
     @Override
     public boolean deployRappInstance(Rapp rapp, RappInstance rappInstance) {
         try {
-            String instantiationPayload =
-                    rappCsarConfigurationHandler.getInstantiationPayload(rapp, rappInstance.getAcm(),
+            String instantiationPayload = rappCsarConfigurationHandler.getInstantiationPayload(rapp, rappInstance,
                             rapp.getCompositionId());
             AutomationComposition automationComposition =
                     gson.fromJson(instantiationPayload, AutomationComposition.class);
-            dmeAcmInterceptor.injectAutomationComposition(automationComposition, rapp, rappInstance);
+            if (rappInstance.isDMEEnabled()) {
+                dmeAcmInterceptor.injectAutomationComposition(automationComposition, rapp, rappInstance);
+            }
 
             InstantiationResponse instantiationResponse =
                     automationCompositionInstanceApiClient.createCompositionInstance(rapp.getCompositionId(),