From 62bb1f83ba6658184d23bbaa465eb80011de3b2b Mon Sep 17 00:00:00 2001 From: "Ikramullah, Ikram (fi241c)" Date: Thu, 5 Nov 2020 01:50:41 -0500 Subject: Fix for VID-890 VID was using sed based replacement for the environment variables exposed to its scripts. This was causing many issus with special characters. This has been fixed. Issue-ID: VID-890 Change-Id: I17fb9621bd5b1e6f4b7278df1fd77c617ce9a26d Signed-off-by: Ikramullah, Ikram --- .../src/main/resources/cache_template.ccf | 30 ---- .../src/main/resources/portal_template.properties | 35 ----- .../webapp/WEB-INF/conf/asdc_template.properties | 6 - .../webapp/WEB-INF/conf/quartz_template.properties | 36 ----- .../webapp/WEB-INF/conf/system_template.properties | 158 --------------------- 5 files changed, 265 deletions(-) delete mode 100755 epsdk-app-onap/src/main/resources/cache_template.ccf delete mode 100755 epsdk-app-onap/src/main/resources/portal_template.properties delete mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc_template.properties delete mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties delete mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties (limited to 'epsdk-app-onap/src') diff --git a/epsdk-app-onap/src/main/resources/cache_template.ccf b/epsdk-app-onap/src/main/resources/cache_template.ccf deleted file mode 100755 index 0ff68b83f..000000000 --- a/epsdk-app-onap/src/main/resources/cache_template.ccf +++ /dev/null @@ -1,30 +0,0 @@ -# DEFAULT CACHE REGION -jcs.default=DC -jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes -jcs.default.cacheattributes.MaxObjects=1000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache -jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes -jcs.default.elementattributes.IsEternal=true -jcs.default.elementattributes.IsSpool=true - - -# MEMORY SHRINKING CONFIGURATION (Commented) -#jcs.default.cacheattributes.UseMemoryShrinker=true -#jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 -#jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -#jcs.default.cacheattributes.MaxSpoolPerRun=500 -#jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes -#jcs.default.elementattributes.IsEternal=false - - -# AUXILLARY CACHE CONFIGURATION -jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes -jcs.auxiliary.DC.attributes.DiskPath=${CACHE_DIRECTORY} - - -# PRE-DEFINED REGION FOR LOOKUP DATA -jcs.region.lookUpObjectCache=DC -jcs.region.lookUpObjectCache.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes -jcs.region.lookUpObjectCache.cacheattributes.MaxObjects=4000 -jcs.region.lookUpObjectCache.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache diff --git a/epsdk-app-onap/src/main/resources/portal_template.properties b/epsdk-app-onap/src/main/resources/portal_template.properties deleted file mode 100755 index 51f39494c..000000000 --- a/epsdk-app-onap/src/main/resources/portal_template.properties +++ /dev/null @@ -1,35 +0,0 @@ -# Properties read by ECOMP Framework library, ecompFW.jar - -portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl -portal.api.prefix = /api -max.idle.time = 5 -user.attribute.name = user_attribute -decryption_key = ${VID_DECRYPTION_KEY} - -# Log On for single sign on -ecomp_redirect_url = ${VID_ECOMP_REDIRECT_URL} - - -# URL of the ECOMP Portal REST API -ecomp_rest_url = ${VID_ECOMP_REST_URL} - -# AAF Mode -role_access_centralized = ${VID_ROLE_ACCESS_CENTRALIZED} - -# UEB servers -ueb_url_list = ${VID_UEB_URL_LIST} - -# ECOMP Portal listens here -ecomp_portal_inbox_name = ${VID_ECOMP_PORTAL_INBOX_NAME} - -# Replace these 3 default values with the ones for your specific App, -# as shown on the on-boarding page on the ECOMP Portal website. -ueb_app_key = ${VID_UEB_APP_KEY} -ueb_app_secret = ${VID_UEB_APP_SECRET} -ueb_app_mailbox_name = ${VID_UEB_APP_MAILBOX_NAME} -# Consumer group name for UEB topic. -# Use the special tag to generate a unique one for each sdk-app server. -ueb_app_consumer_group_name = ${VID_UEB_CONSUMER_GROUP} - -ueb_listeners_enable = ${VID_UEB_LISTENERS_ENABLE} -ueb_rest_for_function_menu = true diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc_template.properties deleted file mode 100755 index 4015da4e6..000000000 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc_template.properties +++ /dev/null @@ -1,6 +0,0 @@ -asdc.client.type=${ASDC_CLIENT_TYPE} - -asdc.client.rest.protocol=${ASDC_CLIENT_REST_PROTOCOL} -asdc.client.rest.host=${ASDC_CLIENT_REST_HOST} -asdc.client.rest.port=${ASDC_CLIENT_REST_PORT} -asdc.client.rest.auth=${ASDC_CLIENT_REST_AUTH} diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties deleted file mode 100755 index 0332a1c5a..000000000 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################# -# Quartz configurations for Quantum Work Flow # -################################################################################# - -org.quartz.scheduler.instanceId = AUTO - -################################################################################# -# Main configurations -org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool -org.quartz.threadPool.threadCount = 30 - -============================================================================ -# Configure JobStore -#============================================================================ - -org.quartz.jobStore.misfireThreshold = 60000 - -org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX -org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate -org.quartz.jobStore.useProperties = false -#org.quartz.jobStore.dataSource = myDS -org.quartz.jobStore.tablePrefix = FN_QZ_ - -org.quartz.jobStore.isClustered = true -org.quartz.jobStore.clusterCheckinInterval = 20000 - -#============================================================================ -# Configure Datasources -#============================================================================ - -org.quartz.dataSource.myDS.driver = org.mariadb.jdbc.Driver -org.quartz.dataSource.myDS.URL = jdbc:mariadb://${VID_MYSQL_HOST}:${VID_MYSQL_PORT}/${VID_MYSQL_DBNAME} -org.quartz.dataSource.myDS.user = ${VID_MYSQL_USER} -org.quartz.dataSource.myDS.password = ${VID_MYSQL_PASS} -org.quartz.dataSource.myDS.maxConnections = ${VID_MYSQL_MAXCONNECTIONS} -org.quartz.dataSource.myDS.validationQuery=select 0 from dual diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties deleted file mode 100755 index 8ca30a339..000000000 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties +++ /dev/null @@ -1,158 +0,0 @@ -### -# ================================================================================ -# eCOMP Portal SDK -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ================================================================================ -### - -########################################################################## -# The following properties MAY require changes by partner applications. -########################################################################## - -cookie_domain = onap.org -#mysql -db.driver = org.mariadb.jdbc.Driver -db.connectionURL = jdbc:mariadb://${VID_MYSQL_HOST}:${VID_MYSQL_PORT}/${VID_MYSQL_DBNAME} -db.userName = ${VID_MYSQL_USER} -db.password = ${VID_MYSQL_PASS} -db.hib.dialect = org.hibernate.dialect.MySQLDialect -db.min_pool_size = 5 -db.max_pool_size = 10 -hb.dialect = org.hibernate.dialect.MySQLDialect - -hb.show_sql = false # this property is set in logger configuration to keep console output clean -hb.idle_connection_test_period = 3600 -app_display_name = ${VID_APP_DISPLAY_NAME} -files_path = /tmp - -application_name = Virtual Infrastructure Deployment -application_user_id = 30000 -post_default_role_id = 16 -clustered = true - -#Enable Fusion Mobile capabilities for the application -mobile_enable = false - -# Cache config file is needed on the classpath -cache_config_file_path = /WEB-INF/classes/cache.ccf -cache_switch = 199 -cache_load_on_startup = false - -user_name = fullName - -decryption_key = ${VID_DECRYPTION_KEY} - -#element map files -element_map_file_path = /tmp -element_map_icon_path = app/vid/icons/ - -role_management_activated = false - -#aai related properties -aai.server.url.base=${VID_AAI_URL}/aai/ -aai.server.url=${VID_AAI_URL}/aai/v19/ -aai.truststore.filename=${AAI_TRUSTSTORE_FILENAME} -aai.truststore.passwd.x=${AAI_TRUSTSTORE_PASSWD_X} -aai.keystore.filename=${AAI_KEYSTORE_FILENAME} -aai.keystore.passwd.x=${AAI_KEYSTORE_PASSWD_X} -aai.vid.username=${AAI_VID_UID} -aai.vid.passwd.x=${AAI_VID_PASSWD_X} -aai.use.client.cert=${AAI_USE_CLIENT_CERT} -aai.vnf.provstatus=${AAI_VNF_PROVSTATUS} - -# ECOMP Portal Shared Context REST API URL -ecomp_shared_context_rest_url=${VID_ECOMP_SHARED_CONTEXT_REST_URL} -#Cron Schedules -log_cron = 0 0/1 * * * ?; -mylogins_feed_cron = 0 0/60 * * * ?; -#sessiontimeout_feed_cron = 0 * * * * ? * -my_login_feed_output_dir = ${VID_MYLOGIN_FEED_DIRECTORY} - -# Link shown in Help menu -contact_us_link=${VID_CONTACT_US_LINK} -homepage_contact_us_url= mailto:portal@lists.onap.org - -# An Unique 128-bit value defined to identify a specific version -# of an application deployed on a specific virtual machine. -# This value must be generated and updated by the application -# which is using the ECOMP SDK at the time of its deployment. -# Online Unique UUID generator - https://www.uuidgenerator.net/ -instance_uuid=292b461a-2954-4b63-a3f9-f916c7ad3bc0 - - -#MSO related properties -mso.server.url=${VID_MSO_SERVER_URL} -mso.polling.interval.msecs=${MSO_POLLING_INTERVAL_MSECS} -mso.max.polls=10 -mso.user.name=${VID_MSO_USER} -mso.password.x=${VID_MSO_PASS} - -#E2E is v3 -mso.restapi.svc.e2einstance=/e2eServiceInstances/v3 -mso.restapi.service.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances -mso.restapi.vnf.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances//vnfs -mso.restapi.vnf.changemanagement.instance=${mso.restapi.service.instance}//vnfs// -mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances//networks -mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances//vnfs//vfModules/scaleOut -mso.restapi.vf.module.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances//vnfs//vfModules -mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances//vnfs//workflows/ -mso.restapi.volume.group.instance=${mso.restapi.vnf.instance}//volumeGroups -mso.restapi.instance.group=${mso.restapi.serviceInstantiationApiRoot}/instanceGroups -mso.restapi.get.orc.req=/orchestrationRequests/v7 -mso.restapi.get.orc.reqs=/orchestrationRequests/v7? -mso.restapi.resume.orc.req=/orchestrationRequests/v7//resume -mso.restapi.get.man.tasks=/tasks/v1 -mso.restapi.configurations=${mso.restapi.service.instance}//configurations -mso.restapi.configuration.instance=${mso.restapi.configurations}/ -mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId= - -mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7 -mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign - -mso.restapi.cloudResourcesApiRoot=/cloudResources/v1 -mso.restapi.operationalEnvironment=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments/ - -mso.restapi.operationalEnvironment.activate=${mso.restapi.operationalEnvironment}/activate -mso.restapi.operationalEnvironment.deactivate=${mso.restapi.operationalEnvironment}/deactivate -mso.restapi.operationalEnvironment.create=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments - -mso.restapi.cloudResourcesRequestsApiRoot=/cloudResourcesRequests/v1 -mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.cloudResourcesRequestsApiRoot}?requestId= - -mso.displayTestAPIOnScreen=true -mso.defaultTestAPI=GR_API -mso.maxOpenedInstantiationRequests=200 -mso.asyncPollingIntervalSeconds=1 -refreshTimeInstantiationDashboard=10 - -vid.truststore.filename=${VID_TRUSTSTORE_FILE} -vid.truststore.passwd.x=${VID_TRUSTSTORE_PASS} -mso.dme2.client.timeout=${MSO_DME2_CLIENT_TIMEOUT} -mso.dme2.client.read.timeout=${MSO_DME2_CLIENT_READ_TIMEOUT} -mso.dme2.server.url=${MSO_DME2_SERVER_URL} -mso.dme2.enabled=${MSO_DME2_ENABLED} - -asdc.model.namespace=org.openecomp. -sdc.svc.api.path=sdc/v1/catalog/services - -features.set.filename=onap.features.properties - -vid.asyncJob.maxHoursInProgress=24 -vid.asyncJob.howLongToKeepOldJobsInDays=7 - -# thread definition - count and timeout (in seconds) -vid.thread.count=50 -vid.thread.timeout=30 -- cgit 1.2.3-korg