summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmichai Hemli <amichai.hemli@intl.att.com>2020-03-01 16:36:19 +0200
committerAmichai Hemli <amichai.hemli@intl.att.com>2020-03-01 17:14:07 +0200
commitdecd21f501cbd5df2ec7436cce98b0a75f61ee29 (patch)
tree95db7900ba2c9d5df067280dc3de036b503c7b3d
parentf4a7b8b3469b291a21229f26636f2082ba933652 (diff)
when signaling the frontend about templates check the correct flag FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE
Issue-ID: VID-739 Signed-off-by: Amichai Hemli <amichai.hemli@intl.att.com> Change-Id: Iaed25f1932eed675310c8d0003d415352991d19e
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/InstantiationTemplatesService.java2
-rw-r--r--vid-app-common/src/test/java/org/onap/vid/services/InstantiationTemplatesServiceTest.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/InstantiationTemplatesService.java b/vid-app-common/src/main/java/org/onap/vid/services/InstantiationTemplatesService.java
index 17520eef4..8837798ef 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/InstantiationTemplatesService.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/InstantiationTemplatesService.java
@@ -76,7 +76,7 @@ public class InstantiationTemplatesService {
}
public Collection<Service> setOnEachServiceIsTemplateExists(Collection<Service> services){
- if (!featureManager.isActive(Features.FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE)){
+ if (!featureManager.isActive(Features.FLAG_2004_INSTANTIATION_TEMPLATES_POPUP)){
return unsetTemplateExistsToAllServices(services);
}
diff --git a/vid-app-common/src/test/java/org/onap/vid/services/InstantiationTemplatesServiceTest.java b/vid-app-common/src/test/java/org/onap/vid/services/InstantiationTemplatesServiceTest.java
index de9fc2bcb..48895fe84 100644
--- a/vid-app-common/src/test/java/org/onap/vid/services/InstantiationTemplatesServiceTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/services/InstantiationTemplatesServiceTest.java
@@ -140,7 +140,7 @@ public class InstantiationTemplatesServiceTest {
@Test
public void setTemplatesExistance_givenCollection__flagIsActive_thenSameCollectionReturnedWithTemplateExistsProperty(){
- when(featureManager.isActive(Features.FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE)).thenReturn(true);
+ when(featureManager.isActive(Features.FLAG_2004_INSTANTIATION_TEMPLATES_POPUP)).thenReturn(true);
when(asyncInstantiationRepository.getAllTemplatesServiceModelIds()).thenReturn(ImmutableSet.of("1", "2"));
Collection<Service> actualCollection = instantiationTemplatesService.setOnEachServiceIsTemplateExists(createGivenCollection());
assertThat(actualCollection, containsInAnyOrder(
@@ -151,7 +151,7 @@ public class InstantiationTemplatesServiceTest {
@Test
public void setTemplatesExistance_givenCollection_flagIsNotActive_thenTemplatesExistNotAdded(){
- when(featureManager.isActive(Features.FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE)).thenReturn(false);
+ when(featureManager.isActive(Features.FLAG_2004_INSTANTIATION_TEMPLATES_POPUP)).thenReturn(false);
Collection<Service> actualCollection = instantiationTemplatesService.setOnEachServiceIsTemplateExists(createGivenCollection());
assertThat("was " + actualCollection, actualCollection, containsInAnyOrder(
allOf(hasProperty("uuid", is("1")), hasProperty("isInstantiationTemplateExists", is(false))),