2 files changed, 25 insertions, 22 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/PombaClientImpl.java b/vid-app-common/src/main/java/org/onap/vid/aai/PombaClientImpl.java
index 000628d8a..15fda829c 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/PombaClientImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/PombaClientImpl.java
@@ -1,13 +1,13 @@
+
 package org.onap.vid.aai;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import javax.servlet.ServletContext;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.portalsdk.core.util.SystemProperties;
 import org.onap.vid.model.PombaInstance.PombaRequest;
+import org.onap.vid.utils.SystemPropertiesWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.servlet.ServletContext;
-
 public class PombaClientImpl implements PombaClientInterface {
 
     protected String fromAppId = "VidAaiController";
@@ -19,13 +19,14 @@ public class PombaClientImpl implements PombaClientInterface {
     @Autowired
     PombaRestInterface pombaRestInterface;
 
+    @Autowired
+    SystemPropertiesWrapper systemPropertiesWrapper;
 
     @Override
     public void verify(PombaRequest request) {
         String methodName = "doAaiPost";
         logger.debug(EELFLoggerDelegate.debugLogger, methodName + " start");
-        String uri = SystemProperties.getProperty("pomba.server.url");
-
+        String uri = systemPropertiesWrapper.getProperty("pomba.server.url");
 
         try {
             pombaRestInterface.RestPost(fromAppId, uri, new ObjectMapper().writeValueAsString(request));
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 87b2d6014..36f607f62 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
@@ -12,34 +12,36 @@
 
 FLAG_PNP_INSTANTIATION = true
 
-FLAG_ASYNC_INSTANTIATION = true
-FLAG_ASYNC_JOBS = true
 CREATE_INSTANCE_TEST = false
-EMPTY_DRAWING_BOARD_TEST = false
 FLAG_ADD_MSO_TESTAPI_FIELD = true
 FLAG_UNASSIGN_SERVICE = true
-FLAG_COLLECTION_RESOURCE_SUPPORT = true
-FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false
 FLAG_SERVICE_MODEL_CACHE = true
 FLAG_SHOW_ASSIGNMENTS = true
 FLAG_SHOW_VERIFY_SERVICE = false
-FLAG_DUPLICATE_VNF = true
-FLAG_DEFAULT_VNF = true
-FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = true
 FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true
-FLAG_A_LA_CARTE_AUDIT_INFO=true
-FLAG_5G_IN_NEW_INSTANTIATION_UI = true
 FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS = true
-FLAG_ASYNC_ALACARTE_VNF = true
-FLAG_ASYNC_ALACARTE_VFMODULE= true
-FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF = true
-FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI=false
 FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST=true
 FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY=true
 FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = true
 FLAG_1810_AAI_LOCAL_CACHE = true
-FLAG_1902_NEW_VIEW_EDIT=false
 FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
 
-FLAG_SUPPLEMENTARY_FILE = true
-FLAG_1902_VNF_GROUPING = true
+# Modern UI (Drawing-Board; View/Edit)
+# - - - - - - - - - - - - - - - - - -
+FLAG_COLLECTION_RESOURCE_SUPPORT = false
+FLAG_ASYNC_INSTANTIATION = false
+FLAG_ASYNC_JOBS = false
+EMPTY_DRAWING_BOARD_TEST = false
+FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false
+FLAG_DUPLICATE_VNF = false
+FLAG_DEFAULT_VNF = false
+FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = false
+FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF = false
+FLAG_A_LA_CARTE_AUDIT_INFO = false
+FLAG_5G_IN_NEW_INSTANTIATION_UI = false
+FLAG_ASYNC_ALACARTE_VNF = false
+FLAG_ASYNC_ALACARTE_VFMODULE = false
+FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI = false
+FLAG_SUPPLEMENTARY_FILE = false
+FLAG_1902_NEW_VIEW_EDIT=false
+FLAG_1902_VNF_GROUPING = false