diff options
Diffstat (limited to 'vid-app-common/src/main')
3 files changed, 23 insertions, 5 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/MsoConfig.java b/vid-app-common/src/main/java/org/onap/vid/controller/MsoConfig.java index 4e7a77cd3..764be03bb 100644 --- a/vid-app-common/src/main/java/org/onap/vid/controller/MsoConfig.java +++ b/vid-app-common/src/main/java/org/onap/vid/controller/MsoConfig.java @@ -75,8 +75,8 @@ public class MsoConfig { @Bean - public MsoBusinessLogic getMsoBusinessLogic(MsoInterface msoClient){ - return new MsoBusinessLogicImpl(msoClient); + public MsoBusinessLogic getMsoBusinessLogic(MsoInterface msoClient, FeatureManager featureManager){ + return new MsoBusinessLogicImpl(msoClient, featureManager ); } @Bean diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogicImpl.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogicImpl.java index 8f9b98a55..2e141adfd 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogicImpl.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogicImpl.java @@ -88,9 +88,11 @@ import org.onap.vid.mso.rest.RequestList; import org.onap.vid.mso.rest.RequestWrapper; import org.onap.vid.mso.rest.Task; import org.onap.vid.mso.rest.TaskList; +import org.onap.vid.properties.Features; import org.onap.vid.utils.Logging; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; +import org.togglz.core.manager.FeatureManager; public class MsoBusinessLogicImpl implements MsoBusinessLogic { @@ -123,9 +125,13 @@ public class MsoBusinessLogicImpl implements MsoBusinessLogic { */ private final MsoInterface msoClientInterface; + + private final FeatureManager featureManager; + @Autowired - public MsoBusinessLogicImpl(MsoInterface msoClientInterface) { + public MsoBusinessLogicImpl(MsoInterface msoClientInterface, FeatureManager featureManager) { this.msoClientInterface = msoClientInterface; + this.featureManager = featureManager; } public static String validateEndpointPath(String endpointEnvVariable) { @@ -381,9 +387,20 @@ public class MsoBusinessLogicImpl implements MsoBusinessLogic { return dashboardOrchestrationReqs; } + private String simpleNoTaskInfoFilter() + { + if (featureManager.isActive(Features.FLAG_EXP_USE_FORMAT_PARAMETER_FOR_CM_DASHBOARD)) { + return "format=simpleNoTaskInfo&"; + } + + return ""; + + } + private String constructOrchestrationRequestFilter(String filterName, String filterValue) { - return String.format("%sfilter=%s:EQUALS:%s", - SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQS), filterName, filterValue); + + return String.format("%s%sfilter=%s:EQUALS:%s", + SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQS),simpleNoTaskInfoFilter(), filterName, filterValue); } private List<RequestWrapper> getOrchestrationRequestsByFilter(String filterName, String filterValue) { 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 5e966a989..e52571906 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 @@ -90,6 +90,7 @@ public enum Features implements Feature { FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF, FLAG_EXP_TOPOLOGY_TREE_VFMODULE_NAMES_FROM_OTHER_TOSCA_VERSIONS, FLAG_2006_NETWORK_PLATFORM_MULTI_SELECT, + FLAG_EXP_USE_FORMAT_PARAMETER_FOR_CM_DASHBOARD, ; |