aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoanna Jeremicz <joanna.jeremicz@nokia.com>2018-09-10 13:30:28 +0200
committerJoanna Jeremicz <joanna.jeremicz@nokia.com>2018-09-11 09:12:24 +0200
commitf6e3d8ab9ecf4553f95ef239585a70dbce0b1a38 (patch)
tree99163583c070d7c4ece1daca24295fb60d47b2eb
parentb4aa71e35ea1fc3898fc1577fd4c8f7a228f34ca (diff)
Add feature toggle support for PNF PnP
Change-Id: Ia6d1866851a2e487ba61fd693d9b1c5038d5703b Issue-ID: VID-301 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/properties/Features.java3
-rw-r--r--vid-app-common/src/main/webapp/WEB-INF/conf/features.properties1
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js3
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js2
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 e08a92e..cc623d4 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 0588ac1..3ca0e6e 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 e3edf83..947e600 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 f2a77e2..b896847 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 ]);
}
}