From f6e3d8ab9ecf4553f95ef239585a70dbce0b1a38 Mon Sep 17 00:00:00 2001 From: Joanna Jeremicz Date: Mon, 10 Sep 2018 13:30:28 +0200 Subject: Add feature toggle support for PNF PnP Change-Id: Ia6d1866851a2e487ba61fd693d9b1c5038d5703b Issue-ID: VID-301 Signed-off-by: Joanna Jeremicz --- vid-app-common/src/main/java/org/onap/vid/properties/Features.java | 3 ++- vid-app-common/src/main/webapp/WEB-INF/conf/features.properties | 1 + .../src/main/webapp/app/vid/scripts/constants/componentConstants.js | 3 ++- .../src/main/webapp/app/vid/scripts/services/creationService.js | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) 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 e08a92eac..cc623d44f 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 @@ -22,7 +22,8 @@ public enum Features implements Feature { FLAG_COLLECTION_RESOURCE_SUPPORT, FLAG_SHOW_ASSIGNMENTS, FLAG_SHOW_VERIFY_SERVICE, - FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD; + FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD, + FLAG_PNP_INSTANTIATION; public boolean isActive() { return FeatureContext.getFeatureManager().isActive(this); diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties index 0588ac167..3ca0e6e4c 100644 --- a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties +++ b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties @@ -24,3 +24,4 @@ FLAG_SERVICE_MODEL_CACHE = true FLAG_SHOW_ASSIGNMENTS = true FLAG_SHOW_VERIFY_SERVICE=false FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = false +FLAG_PNP_INSTANTIATION = true \ No newline at end of file diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js index e3edf8301..947e60030 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js @@ -242,7 +242,8 @@ appDS2 FLAG_ADD_MSO_TESTAPI_FIELD : "FLAG_ADD_MSO_TESTAPI_FIELD", FLAG_COLLECTION_RESOURCE_SUPPORT : "FLAG_COLLECTION_RESOURCE_SUPPORT", FLAG_SHOW_ASSIGNMENTS: "FLAG_SHOW_ASSIGNMENTS", - FLAG_SHOW_VERIFY_SERVICE: "FLAG_SHOW_VERIFY_SERVICE" + FLAG_SHOW_VERIFY_SERVICE: "FLAG_SHOW_VERIFY_SERVICE", + FLAG_PNP_INSTANTIATION: "FLAG_PNP_INSTANTIATION" } }; diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js index f2a77e22d..b896847d6 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js @@ -245,7 +245,7 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON } //if service model has a pnf, add a PNF ID parameter - if (DataService.getPnf()) { + if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_PNP_INSTANTIATION) && DataService.getPnf()) { parameterList = parameterList.concat([ FIELD.PARAMETER.PNF_ID ]); } } -- cgit 1.2.3-korg