From e601bbdc43bae9a08e2e10c5139a6f76b47860d7 Mon Sep 17 00:00:00 2001 From: Einat Vinouze Date: Tue, 16 Jul 2019 17:17:36 +0300 Subject: Implant vid-app-common org.onap.vid.job (main and test) Issue-ID: VID-378 Change-Id: I41b0bdc2c4e3635f3f3319b1cd63cefc61912dfc Signed-off-by: Einat Vinouze Signed-off-by: Ittay Stern --- .../src/main/webapp/WEB-INF/conf/system.properties | 32 ++++++++-------------- .../webapp/WEB-INF/conf/system_template.properties | 8 ++++++ 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'epsdk-app-onap/src') diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties index 5c78c253f..976ec7504 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties @@ -23,21 +23,6 @@ # The following properties should NOT be changed by partner applications. ########################################################################## -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 = AGLDdG4D04BKm2IxIWEr8o== - ########################################################################## # The following properties MAY require changes by partner applications. ########################################################################## @@ -122,12 +107,11 @@ aai.truststore.filename=tomcat_keystore aai.truststore.passwd.x=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp aai.keystore.filename=tomcat_keystore aai.keystore.passwd.x=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp - aai.vid.username=VID aai.vid.passwd.x=OBF:1jm91i0v1jl9 - aai.use.client.cert=false aai.vnf.provstatus=PREPROV,NVTPROV,PROV,CAPPED + #Cron Schedules log_cron = 0 0/1 * * * ?; mylogins_feed_cron = 0 0/60 * * * ?; @@ -169,17 +153,18 @@ mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInsta mso.restapi.vnf.instance=/serviceInstances/v6//vnfs mso.restapi.vnf.changemanagement.instance=/serviceInstances/v6//vnfs// mso.restapi.network.instance=/serviceInstances/v6//networks -mso.restapi.vf.module.instance=/serviceInstances/v6//vnfs//vfModules mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances//vnfs//vfModules/scaleOut +mso.restapi.vf.module.instance=/serviceInstances/v6//vnfs//vfModules mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances//vnfs//workflows/ mso.restapi.volume.group.instance=/serviceInstances/v6//vnfs//volumeGroups mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups mso.restapi.get.orc.req=/orchestrationRequests/v6 mso.restapi.get.orc.reqs=/orchestrationRequests/v6? +mso.restapi.resume.orc.req=/orchestrationRequests/v7//resume mso.restapi.get.man.tasks=/tasks/v1 mso.restapi.configurations=/serviceInstances/v6//configurations mso.restapi.configuration.instance=${mso.restapi.configurations}/ - +mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId= mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7 mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign @@ -193,7 +178,7 @@ mso.restapi.operationalEnvironment.create=${mso.restapi.cloudResourcesApiRoot}/o mso.restapi.cloudResourcesRequestsApiRoot=/cloudResourcesRequests/v1 mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.cloudResourcesRequestsApiRoot}?requestId= -mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId= + mso.displayTestAPIOnScreen=true mso.defaultTestAPI=GR_API mso.maxOpenedInstantiationRequests=20 @@ -204,6 +189,7 @@ vid.truststore.filename=/opt/app/vid/etc/org.onap.vid.trust.jks vid.truststore.passwd.x=OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2 mso.dme2.client.timeout=30000 mso.dme2.client.read.timeout=120000 + scheduler.create.new.vnf.change.instance=/v1/ChangeManagement/schedules/ scheduler.get.time.slots=/v1/ChangeManagement/schedules/ scheduler.server.url=http://BYO.scheduler:8989/scheduler @@ -211,3 +197,9 @@ scheduler.server.url=http://BYO.scheduler:8989/scheduler scheduler.submit.new.vnf.change=/v1/ChangeManagement/schedules/{scheduleId}/approvals scheduler.get.schedules=/v1/ChangeManagement/schedules/scheduleDetails/ scheduler.basic.auth= + +vid.asyncJob.howLongToKeepOldJobsInDays=7 + +# thread definition - count and timeout (in seconds) +vid.thread.count=50 +vid.thread.timeout=30 \ No newline at end of file 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 index 2af6798d2..e25b84944 100755 --- 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 @@ -119,10 +119,12 @@ mso.restapi.volume.group.instance=/serviceInstances/v6//vnf mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups mso.restapi.get.orc.req=/orchestrationRequests/v6 mso.restapi.get.orc.reqs=/orchestrationRequests/v6? +mso.restapi.resume.orc.req=/orchestrationRequests/v7//resume mso.restapi.get.man.tasks=/tasks/v1 mso.restapi.configurations=/serviceInstances/v6//configurations mso.restapi.configuration.instance=${mso.restapi.configurations}/ mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId= + mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7 mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign @@ -150,3 +152,9 @@ mso.dme2.client.read.timeout=${MSO_DME2_CLIENT_READ_TIMEOUT} mso.dme2.server.url=${MSO_DME2_SERVER_URL} mso.dme2.enabled=${MSO_DME2_ENABLED} scheduler.basic.auth=${SCHEDULER_BASIC_AUTH} + +vid.asyncJob.howLongToKeepOldJobsInDays=7 + +# thread definition - count and timeout (in seconds) +vid.thread.count=50 +vid.thread.timeout=30 \ No newline at end of file -- cgit 1.2.3-korg