Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 8 insertions, 31 deletions

diff --git a/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties b/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties
index 3d8e8155a..f35bf2d64 100644
--- a/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties
+++ b/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties
@@ -1,50 +1,27 @@
-# domain settings
-#domain_class_location = com.att.fusion.domain.
-
-# validator settings
-#default_error_message = Default error message
-
 # login settings
-login_method_csp            = csp
-login_method_web_junction   = web_junction
 login_method_backdoor       = backdoor
+login_method_web_junction       = login_method_web_junction
+login_method_csp       = login_method_csp
 login_method_attribute_name = login_method
+authentication_mechanism = BOTH
+role_function_list = role_funcion_list
 
 #login message
 login.error.hrid.empty = Login failed, please contact system administrator. 
 login.error.hrid.not-found = User not found, please contact system administrator.
 login.error.user.inactive = Account is disabled, please contact system administrator.
 
-# CSP settings
-csp_cookie_name          = attESSec
-csp_gate_keeper_data_key = MgmtSysCtr
-csp_gate_keeper_prod_key = PROD
-csp_login_url            = https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogin/?sysName=MgmtSysCtr&retURL=
-csp_logout_url           = https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogout/?retURL=
-
-authentication_mechanism = BOTH
-
-#csp_gate_keeper_prod_key = DEVL
-user_attribute_name      = user
-#csp_login_url = https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogin/?sysName=MgmtSysCtr&retURL=
-#csp_logout_url = https://webtest.csp.att.com/empsvcs/hrpinmgt/pagLogout/?retURL=
-
-# Web Junction settings
-#web_junction_user_id_header_name = iv-user
-
 # User Session settings
-#user_attribute_name           = user
+user_attribute_name           = user
 roles_attribute_name          = roles
 role_functions_attribute_name = role_functions
-role_function_list            = role_function_list
 #client_device_attribute_name  = client_device
 #client_device_emulation       = false
-#client_device_type_to_emulate = com.att.fusion.web.clientdevice.mobile.IPhoneDevice
 
-# POST settings
+# Import-user LDAP settings
 post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory
-post_provider_url            = ldap://ldap.webphone.att.com:389
-post_security_principal      = ou=people,o=att,c=us
+post_provider_url            = ldap://ldap.mycompany.com:389
+post_security_principal      = ou=people,o=mycompany,c=us
 post_max_result_size         = 499
 
 # menu settings