summaryrefslogtreecommitdiffstats
path: root/vid-app-common/src/main
diff options
context:
space:
mode:
authorAmichai Hemli <ah0398@intl.att.com>2019-08-29 15:37:50 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-29 15:37:50 +0000
commit3d175558e53176c4e7dbea9475ea4b8fbfeb249a (patch)
tree0340ccd5ccf11072da4f01f511973d21f5972abe /vid-app-common/src/main
parentbdd1d2c30961d6b7e3e8777e3659dce7d32da61f (diff)
parent955722b6ddf8ddeab3d1904f5514a5be9226a59f (diff)
Merge "edit of macro services in new view edit screen"
Diffstat (limited to 'vid-app-common/src/main')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/asdc/parser/VidNotionsBuilder.java13
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/properties/Features.java1
2 files changed, 7 insertions, 7 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/parser/VidNotionsBuilder.java b/vid-app-common/src/main/java/org/onap/vid/asdc/parser/VidNotionsBuilder.java
index c9c2649ae..d35c8df9c 100644
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/parser/VidNotionsBuilder.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/parser/VidNotionsBuilder.java
@@ -170,16 +170,15 @@ public class VidNotionsBuilder {
return VidNotions.InstantiationUI.SERVICE_WITH_VNF_GROUPING;
}
- if (featureManager.isActive(Features.FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI) &&
- featureManager.isActive(Features.FLAG_1908_RESUME_MACRO_SERVICE) &&
- isServiceWithCollectionResource(serviceModel)) {
- return VidNotions.InstantiationUI.SERVICE_WITH_COLLECTION_RESOURCE;
+ if (featureManager.isActive(Features.FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT) &&
+ isMacro(serviceModel) &&
+ !isTransportService(csarHelper) &&
+ //till new view/edit would support fabric service activation
+ !hasFabricConfiguration(csarHelper)) {
+ return VidNotions.InstantiationUI.MACRO_SERVICE;
}
if (featureManager.isActive(Features.FLAG_1902_NEW_VIEW_EDIT)) {
- if (isMacro(serviceModel) && !isMacroExcludedFromAsyncFlow(serviceModel)) {
- return VidNotions.InstantiationUI.MACRO_SERVICE;
- }
VidNotions.InstantiationUI instantiationUISuggestion = suggestInstantiationUI(csarHelper, serviceModel);
if (instantiationUISuggestion!=VidNotions.InstantiationUI.LEGACY) {
return instantiationUISuggestion;
diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
index bc3c6c8ec..f8eaabfda 100644
--- a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
+++ b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
@@ -70,6 +70,7 @@ public enum Features implements Feature {
FLAG_1908_RELEASE_TENANT_ISOLATION,
FLAG_1908_A_LA_CARTE_VNF_NEW_INSTANTIATION_UI,
FLAG_FLASH_REPLACE_VF_MODULE,
+ FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT,
FLAG_PNP_INSTANTIATION,
FLAG_HANDLE_SO_WORKFLOWS,
FLAG_CREATE_ERROR_REPORTS