diff options
| author |   Ofir Sonsino <os0695@intl.att.com> | 2018-09-05 15:26:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-05 15:26:40 +0000 |
| commit | 0905994ccab18237255f21c292a1616f92ec4856 (patch) | |
| tree | f28c41a9bd5a86409aac514d15dfc7b60d6452c1 /vid-app-common/src/main | |
| parent | 630945c6aed25172bdccb9b11b32417564e0bfde (diff) | |
| parent | 436646fcc88913246d75e03fe4be308545e0d13e (diff) | |
Merge changes from topic 'portalsdk2.4'
* changes:
Fix features.properties
Upgrade portal SDK to 2.4
Diffstat (limited to 'vid-app-common/src/main')
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/utils/DaoUtils.java | 2 | ||||
| -rw-r--r-- | vid-app-common/src/main/webapp/WEB-INF/conf/features.properties | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/utils/DaoUtils.java b/vid-app-common/src/main/java/org/onap/vid/utils/DaoUtils.java index c8a91626b..8aa0e892a 100644 --- a/vid-app-common/src/main/java/org/onap/vid/utils/DaoUtils.java +++ b/vid-app-common/src/main/java/org/onap/vid/utils/DaoUtils.java @@ -4,7 +4,7 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.onap.vid.exceptions.GenericUncheckedException; -import org.onap.portalsdk.core.FusionObject; +import org.onap.portalsdk.core.domain.FusionObject; import java.util.HashMap; import java.util.function.Function; 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 de466beae..0588ac167 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 @@ -9,3 +9,18 @@ # - featureFlags.filename = ci.features.properties # - featureFlags.filename = ist.features.properties # - featureFlags.filename = e2e.features.properties + +FLAG_ASYNC_INSTANTIATION = true +FLAG_ASYNC_JOBS = false +FLAG_REGION_ID_FROM_REMOTE = true +CREATE_INSTANCE_TEST = false +EMPTY_DRAWING_BOARD_TEST = false +FLAG_ADVANCED_PORTS_FILTER = true +FLAG_ADD_MSO_TESTAPI_FIELD = true +FLAG_UNASSIGN_SERVICE = true +FLAG_COLLECTION_RESOURCE_SUPPORT = true +FLAG_NETWORK_TO_ASYNC_INSTANTIATION = true +FLAG_SERVICE_MODEL_CACHE = true +FLAG_SHOW_ASSIGNMENTS = true +FLAG_SHOW_VERIFY_SERVICE=false +FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = false |