summaryrefslogtreecommitdiffstats
path: root/runtime-acm
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2022-12-20 09:55:45 +0000
committerGerrit Code Review <gerrit@onap.org>2022-12-20 09:55:45 +0000
commite70bf5c909a4d5abcbc7adcbb4aa120c2e045660 (patch)
tree2622919eb5c86d6400cab8ff35795bd8c75cd730 /runtime-acm
parentba5988ab370f3dc5e5214823046e897d25aba0bf (diff)
parente18a523f4fc8075dc5022871fa96ca8754c2c979 (diff)
Merge "Refactor instanceId as primary key in JpaAutomationComposition"
Diffstat (limited to 'runtime-acm')
-rw-r--r--runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java6
-rw-r--r--runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/InstantiationController.java2
-rw-r--r--runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java4
-rw-r--r--runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java8
4 files changed, 10 insertions, 10 deletions
diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java
index 374c94f5d..b723dba7f 100644
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java
@@ -201,10 +201,10 @@ public class AutomationCompositionInstantiationProvider {
* @return the automation compositions
*/
@Transactional(readOnly = true)
- public AutomationCompositions getAutomationCompositions(String name, String version) {
+ public AutomationCompositions getAutomationCompositions(UUID compositionId, String name, String version) {
var automationCompositions = new AutomationCompositions();
- automationCompositions
- .setAutomationCompositionList(automationCompositionProvider.getAutomationCompositions(name, version));
+ automationCompositions.setAutomationCompositionList(
+ automationCompositionProvider.getAutomationCompositions(compositionId, name, version));
return automationCompositions;
}
diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/InstantiationController.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/InstantiationController.java
index e9f1eaac0..1ff7c019e 100644
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/InstantiationController.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/InstantiationController.java
@@ -92,7 +92,7 @@ public class InstantiationController extends AbstractRestController implements A
public ResponseEntity<AutomationCompositions> queryCompositionInstances(UUID compositionId, String name,
String version, UUID requestId) {
- return ResponseEntity.ok().body(provider.getAutomationCompositions(name, version));
+ return ResponseEntity.ok().body(provider.getAutomationCompositions(compositionId, name, version));
}
/**
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java
index 0657c7e0c..c14d64069 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java
@@ -109,10 +109,10 @@ class AutomationCompositionInstantiationProviderTest {
verify(acProvider).createAutomationComposition(automationCompositionCreate);
- when(acProvider.getAutomationCompositions(automationCompositionCreate.getName(),
+ when(acProvider.getAutomationCompositions(compositionId, automationCompositionCreate.getName(),
automationCompositionCreate.getVersion())).thenReturn(List.of(automationCompositionCreate));
- var automationCompositionsGet = instantiationProvider.getAutomationCompositions(
+ var automationCompositionsGet = instantiationProvider.getAutomationCompositions(compositionId,
automationCompositionCreate.getName(), automationCompositionCreate.getVersion());
assertThat(automationCompositionCreate)
.isEqualTo(automationCompositionsGet.getAutomationCompositionList().get(0));
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java
index 47d465c32..9bc29d9ce 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java
@@ -240,7 +240,7 @@ class InstantiationControllerTest extends CommonRestController {
var instResponse = resp.readEntity(InstantiationResponse.class);
InstantiationUtils.assertInstantiationResponse(instResponse, automationComposition);
- var automationCompositionsFromDb = instantiationProvider.getAutomationCompositions(
+ var automationCompositionsFromDb = instantiationProvider.getAutomationCompositions(compositionId,
automationComposition.getKey().getName(), automationComposition.getKey().getVersion());
assertNotNull(automationCompositionsFromDb);
@@ -263,7 +263,7 @@ class InstantiationControllerTest extends CommonRestController {
instResponse = resp.readEntity(InstantiationResponse.class);
InstantiationUtils.assertInstantiationResponse(instResponse, automationCompositionFromRsc);
- var automationCompositionsFromDb = instantiationProvider.getAutomationCompositions(
+ var automationCompositionsFromDb = instantiationProvider.getAutomationCompositions(compositionId,
automationCompositionFromRsc.getKey().getName(), automationCompositionFromRsc.getKey().getVersion());
assertThat(automationCompositionsFromDb.getAutomationCompositionList()).isEmpty();
}
@@ -332,8 +332,8 @@ class InstantiationControllerTest extends CommonRestController {
// check passive state on DB
var toscaConceptIdentifier = instResponse.getAffectedAutomationComposition();
- var automationCompositionsGet = instantiationProvider
- .getAutomationCompositions(toscaConceptIdentifier.getName(), toscaConceptIdentifier.getVersion());
+ var automationCompositionsGet = instantiationProvider.getAutomationCompositions(compositionId,
+ toscaConceptIdentifier.getName(), toscaConceptIdentifier.getVersion());
assertThat(automationCompositionsGet.getAutomationCompositionList()).hasSize(1);
assertEquals(command.getOrderedState(),
automationCompositionsGet.getAutomationCompositionList().get(0).getOrderedState());