diff options
38 files changed, 230 insertions, 247 deletions
@@ -58,4 +58,4 @@ tsc: link: 'https://lists.onap.org/g/onap-tsc/message/4257' - type: 'Removal' name: 'Daniel Rose' - link: 'https://lists.onap.org/g/onap-tsc/message/4257' + link: 'https://lists.onap.org/g/onap-tsc/message/4251' diff --git a/deliveries/pom.xml b/deliveries/pom.xml index 42af6ab31..fa046fa18 100755 --- a/deliveries/pom.xml +++ b/deliveries/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.vid</groupId> <artifactId>vid-parent</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.0.1-SNAPSHOT</version> </parent> <packaging>pom</packaging> diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile index 106b8a394..62feb8c3c 100755 --- a/deliveries/src/main/docker/docker-files/Dockerfile +++ b/deliveries/src/main/docker/docker-files/Dockerfile @@ -85,13 +85,11 @@ ENV JAVA_OPTS="-Xmx1536m -Xms1536m" ENV CATALINA_OPTS="-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME} -Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/tmp" -ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME} -ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME} ADD maven/config/server.xml ${VID_TOMCAT_PATH} ADD maven/scripts/*.sh /tmp/vid/ ADD maven/artifacts/vid.war /tmp/vid/stage/ -RUN chown onap:onap /tmp/vid /usr/local/tomcat /opt/app -R +RUN chown onap:onap /tmp/vid /usr/local/tomcat -R RUN chmod +x /tmp/vid/localize.sh USER onap CMD ["/tmp/vid/localize.sh"] diff --git a/deliveries/src/main/docker/docker-files/docker-compose.yml b/deliveries/src/main/docker/docker-files/docker-compose.yml index 8d321cfb5..a62636c49 100755 --- a/deliveries/src/main/docker/docker-files/docker-compose.yml +++ b/deliveries/src/main/docker/docker-files/docker-compose.yml @@ -16,6 +16,8 @@ services: ASDC_CLIENT_REST_PORT: 1080 VID_AAI_URL: http://vid-simulator:1080 VID_MSO_SERVER_URL: http://vid-simulator:1080 + volumes: + - ../../../../../epsdk-app-onap/src/main/webapp/WEB-INF/cert:/opt/app/vid/etc vid-mariadb: image: mariadb:10 diff --git a/docs/installation.rst b/docs/installation.rst index aef512dfe..55d9f225c 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -17,7 +17,7 @@ Please follow the instructions given below, for installing VID using a Docker im docker pull mariadb:10 docker login -u docker -p docker nexus3.onap.org:10001 - docker pull nexus3.onap.org:10001/onap/vid:5.0.0 + docker pull nexus3.onap.org:10001/onap/vid:5.0.1 2. Install by running following command (Use the path for the lf_config folder under the VID git repository as CONFIG_PATH) @@ -27,7 +27,7 @@ Please follow the instructions given below, for installing VID using a Docker im docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=YOUR_PASSWORD -e MYSQL_ROOT_PASSWORD=ROOT_PASSWORD -v CONFIG_PATH/vid-my.cnf:/etc/mysql/my.cnf -v /var/lib/mysql -d mariadb:10 #start VID server - docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:5.0.0 + docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:5.0.1 Or use docker-compose: diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 3893b42d6..8161f2931 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -3,7 +3,7 @@ VID Release Notes ================= -Version: 5.0.0 +Version: El-Alto (5.0.x) -------------- **Resolved Issues** diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index 61d249549..3885b2749 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -8,7 +8,7 @@ the Portal team. --> <groupId>org.onap.vid</groupId> <artifactId>epsdk-app-onap</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.0.1-SNAPSHOT</version> <packaging>war</packaging> <name>ECOMP SDK Webapp for OpenSource</name> <description>ECOMP SDK Web Application for public release</description> @@ -24,9 +24,9 @@ <encoding>UTF-8</encoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <epsdk.version>2.4.0</epsdk.version> - <jackson.version>2.9.8</jackson.version> - <springframework.version>5.1.6.RELEASE</springframework.version> + <epsdk.version>2.5.0</epsdk.version> + <jackson.version>2.9.9</jackson.version> + <springframework.version>5.1.9.RELEASE</springframework.version> <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5: org.springframework.orm.hibernate4.HibernateTransactionManager so following orm.version lets epsdk-core find it --> @@ -370,7 +370,7 @@ <dependency> <groupId>io.searchbox</groupId> <artifactId>jest</artifactId> - <version>2.0.0</version> + <version>6.3.1</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -381,7 +381,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.1</version> </dependency> <dependency> <groupId>junit</groupId> @@ -391,17 +391,17 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20160212</version> + <version>20190722</version> </dependency> <dependency> <groupId>org.liquibase</groupId> <artifactId>liquibase-core</artifactId> - <version>3.5.5</version> + <version>3.7.0</version> </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <version>2.2.1</version> + <version>2.3.1</version> <exclusions> <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 --> <exclusion> @@ -414,7 +414,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.7.12</version> + <version>1.7.27</version> </dependency> <!-- springframework to override epsdk-app-common's and epsdk-core's versions --> @@ -468,7 +468,7 @@ <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>2.2.3</version> + <version>2.3.1</version> </dependency> </dependencies> diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java index 7c1b5c693..ca317dde2 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java @@ -37,11 +37,12 @@ */ package org.onap.portalapp.conf; +import java.util.TimeZone; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; import org.onap.portalsdk.core.conf.AppInitializer; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import java.util.TimeZone; - public class ExternalAppInitializer extends AppInitializer { private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppInitializer.class); @@ -54,6 +55,12 @@ public class ExternalAppInitializer extends AppInitializer { return new Class[] { appConfigClass }; } + @Override + public void onStartup(ServletContext servletContext) throws ServletException { + super.onStartup(servletContext); + setDefaultTimeZoneToUTC(); + } + //set time zone to UTC so Dates would be written to DB in UTC timezone private void setDefaultTimeZoneToUTC() { System.setProperty("user.timezone", "UTC"); diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java index 9f8f7279a..02fbfa96d 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java @@ -3,6 +3,7 @@ * ONAP Portal SDK * =================================================================== * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019 IBM. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -74,8 +75,7 @@ public class RegistryAdapter { public List<Trigger> addCoreTriggers() { // On startup of the application after crash recovery, invoke workflow // schedule trigger - List<Trigger> triggers = getWorkflowScheduleService().triggerWorkflowScheduling(); - return triggers; + return getWorkflowScheduleService().triggerWorkflowScheduling(); } public void setSchedulerBean(final SchedulerFactoryBean schedulerBean) { diff --git a/epsdk-app-onap/src/main/resources/portal.properties b/epsdk-app-onap/src/main/resources/portal.properties index edb35807b..22f109466 100755 --- a/epsdk-app-onap/src/main/resources/portal.properties +++ b/epsdk-app-onap/src/main/resources/portal.properties @@ -59,7 +59,7 @@ portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm
# URL of the ECOMP Portal REST API
-ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
+ecomp_rest_url = http://localhost:8080/vidSimulator/ONAPPORTAL/auxapi/
# Non AAF Mode
role_access_centralized = local
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties index 14a3b0954..ea9a25703 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties @@ -1,6 +1,6 @@ asdc.client.type=REST
asdc.client.rest.protocol=http
-asdc.client.rest.host=
+asdc.client.rest.host=localhost
asdc.client.rest.port=8080
-asdc.client.rest.auth=
+asdc.client.rest.auth=dmlkOnZpZA==
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 0fe2f4e15..4d54d8eb5 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 @@ -19,40 +19,18 @@ ### # Properties read by ECOMP Core library, ecompSDK-core.jar # testing - props 1.0 -########################################################################## -# The following properties should NOT be changed by partner applications. -########################################################################## ########################################################################## # The following properties MAY require changes by partner applications. ########################################################################## -#Oracle -#db.userName=quantumbd -#db.password=c1syn2yhmr -#db.connectionURL=jdbc:oracle:thin:todo.link -#db.hib.dialect=org.hibernate.dialect.Oracle10gDialect -#db.driver=oracle.jdbc.driver.OracleDriver -#Hibernate -#hb.dialect=org.hibernate.dialect.Oracle10gDialect -#hb.show_sql=true - -#Postgre -#db.userName=XXXX -#db.password=XXXX -#db.connectionURL=jdbc:postgresql://XXXX/XX -#db.hib.dialect=org.hibernate.dialect.PostgreSQLDialect -#db.driver=org.postgresql.Driver -#hb.dialect=org.hibernate.dialect.PostgreSQLDialect -#hb.show_sql=true - cookie_domain = onap.org -#Mysql +#mysql db.driver = org.mariadb.jdbc.Driver db.connectionURL = jdbc:mariadb://localhost:3306/vid_openecomp_epsdk db.userName = euser db.password = euser -#db.hib.dialect = org.hibernate.dialect.MySQLDialect +db.hib.dialect = org.hibernate.dialect.MySQLDialect db.min_pool_size = 5 db.max_pool_size = 10 hb.dialect = org.hibernate.dialect.MySQLDialect @@ -62,16 +40,6 @@ hb.idle_connection_test_period = 3600 app_display_name = VID files_path = /tmp -# menu settings -#menu_query_name = menuData -#menu_properties_file_location = /WEB-INF/fusion/menu/ -#application_menu_set_name = APP -#application_menu_attribute_name = applicationMenuData -#application_menu_properties_name = menu.properties -#business_direct_menu_set_name = BD -#business_direct_menu_properties_name = bd.menu.properties -#business_direct_menu_attribute_name = businessDirectMenuData - application_name = Virtual Infrastructure Deployment application_user_id = 30000 post_default_role_id = 16 @@ -86,23 +54,18 @@ cache_switch = 199 cache_load_on_startup = false user_name = fullName + decryption_key = AGLDdG4D04BKm2IxIWEr8o== #element map files element_map_file_path = app/fusionapp/files/ element_map_icon_path = app/fusionapp/icons/ -role_management_activated = false +role_management_activated = true #aai related properties -#aai.server.url.base=https://aai.api.openecomp.org:8443/aai/ -#aai.server.url=https://aai.api.openecomp.org:8443/aai/v8/ -#aai.oldserver.url.base=https://aai.api.openecomp.org:8443/aai/servers/ -#aai.oldserver.url=https://aai.api.openecomp.org:8443/aai/servers/v3/ aai.server.url.base=http://localhost:1080/aai/ -aai.server.url=http://localhost:1080/aai/v13/ -aai.oldserver.url.base=https://104.239.249.183:8443/aai/servers/ -aai.oldserver.url=https://104.239.249.183:8443/aai/servers/v3/ +aai.server.url=http://localhost:1080/aai/v14/ aai.truststore.filename=tomcat_keystore aai.truststore.passwd.x=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp aai.keystore.filename=tomcat_keystore @@ -112,15 +75,14 @@ aai.vid.passwd.x=OBF:1jm91i0v1jl9 aai.use.client.cert=false aai.vnf.provstatus=PREPROV,NVTPROV,PROV,CAPPED +# ECOMP Portal Shared Context REST API URL +ecomp_shared_context_rest_url= https://www.openecomp.org:8080/ecompportal/context #Cron Schedules log_cron = 0 0/1 * * * ?; mylogins_feed_cron = 0 0/60 * * * ?; #sessiontimeout_feed_cron = 0 * * * * ? * my_login_feed_output_dir = /tmp/MyLogins -# ECOMP Portal Shared Context REST API URL -ecomp_shared_context_rest_url= https://www.openecomp.org:8080/ecompportal/context - # Link shown in Help menu contact_us_link = https://www.openecomp.org/EcompPortal/ECOMP+Portal+Home homepage_contact_us_url = mailto:portal@lists.onap.org @@ -133,39 +95,33 @@ homepage_contact_us_url = mailto:portal@lists.onap.org instance_uuid=292b461a-2954-4b63-a3f9-f916c7ad3bc0 - -#authenticate user server -authenticate_user_server=http://todo_enter_auth_server_hostname:8383/openid-connect-server-webapp/allUsers - #MSO related properties -#simulator -#mso.server.url=http://localhost:8089 -#dev2dev -#good -mso.server.url=https://mso.api.simpledemo.onap.org:8443/onap/so/infra -mso.polling.interval.msecs=2000 -mso.max.polls=3 +mso.server.url=http://localhost:1080/mso +mso.polling.interval.msecs=10000 +mso.max.polls=10 mso.user.name=infraportal mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz + #E2E is v3 mso.restapi.svc.e2einstance=/e2eServiceInstances/v3 mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances -mso.restapi.vnf.instance=/serviceInstances/v6/<service_instance_id>/vnfs -mso.restapi.vnf.changemanagement.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type> -mso.restapi.network.instance=/serviceInstances/v6/<service_instance_id>/networks +mso.restapi.vnf.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs +mso.restapi.vnf.changemanagement.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type> +mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut -mso.restapi.vf.module.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules +mso.restapi.vf.module.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/workflows/<workflow_UUID> -mso.restapi.volume.group.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups -mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups -mso.restapi.get.orc.req=/orchestrationRequests/v6 -mso.restapi.get.orc.reqs=/orchestrationRequests/v6? +mso.restapi.volume.group.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/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/<request_id>/resume mso.restapi.get.man.tasks=/tasks/v1 -mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations +mso.restapi.configurations=/serviceInstances/v7/<service_instance_id>/configurations mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id> mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id> + mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7 mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign @@ -193,13 +149,22 @@ 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 - +scheduler.server.url=http://localhost:1080/scheduler +scheduler.delete.schedule=/v1/ChangeManagement/schedules/%s scheduler.submit.new.vnf.change=/v1/ChangeManagement/schedules/{scheduleId}/approvals scheduler.get.schedules=/v1/ChangeManagement/schedules/scheduleDetails/ -features.set.filename=onap.features.properties +asdc.model.namespace=org.openecomp. +sdc.svc.api.path=sdc/v1/catalog/services + +env.mode=dev + +features.set.filename=dev.features.properties +# vid instantiation job with 'in-progress' status will be marked as failed after specified time +# vid.job.max.hoursInProgress should be set to 0 to disable "in-progress timeout" +# In case of not numeric value, the default value (24) will be used +vid.asyncJob.maxHoursInProgress=24 vid.asyncJob.howLongToKeepOldJobsInDays=7 # thread definition - count and timeout (in seconds) 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 54359c2fb..e3d46aa72 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 @@ -1,21 +1,26 @@ -#DB Info -#db.userName=XXXX -#db.password=XXXX -#db.connectionURL=jdbc:oracle:thin:@XXXX/XX -#db.hib.dialect=org.hibernate.dialect.Oracle10gDialect -#db.driver=oracle.jdbc.driver.OracleDriver -#Hibernate -#hb.dialect=org.hibernate.dialect.Oracle10gDialect -#hb.show_sql=true - -#Postgre -#db.userName=XXXX -#db.password=XXXX -#db.connectionURL=jdbc:postgresql://XXXX/XX -#db.hib.dialect=org.hibernate.dialect.PostgreSQLDialect -#db.driver=org.postgresql.Driver -#hb.dialect=org.hibernate.dialect.PostgreSQLDialect -#hb.show_sql=true +### +# ================================================================================ +# 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 @@ -33,16 +38,6 @@ hb.idle_connection_test_period = 3600 app_display_name = ${VID_APP_DISPLAY_NAME} files_path = /tmp -# menu settings -#menu_query_name = menuData -#menu_properties_file_location = /WEB-INF/fusion/menu/ -#application_menu_set_name = APP -#application_menu_attribute_name = applicationMenuData -#application_menu_properties_name = menu.properties -#business_direct_menu_set_name = BD -#business_direct_menu_properties_name = bd.menu.properties -#business_direct_menu_attribute_name = businessDirectMenuData - application_name = Virtual Infrastructure Deployment application_user_id = 30000 post_default_role_id = 16 @@ -54,7 +49,6 @@ 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 @@ -83,15 +77,16 @@ aai.vnf.provstatus=${AAI_VNF_PROVSTATUS} # ECOMP Portal Shared Context REST API URL ecomp_shared_context_rest_url=${VID_ECOMP_SHARED_CONTEXT_REST_URL} -# Link shown in Help menu -contact_us_link=${VID_CONTACT_US_LINK} -homepage_contact_us_url= mailto:portal@lists.onap.org #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 @@ -101,29 +96,29 @@ instance_uuid=292b461a-2954-4b63-a3f9-f916c7ad3bc0 #MSO related properties -#simulator 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.svc.instance=/serviceInstantiation/v7/serviceInstances mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances -mso.restapi.vnf.instance=/serviceInstances/v6/<service_instance_id>/vnfs -mso.restapi.vnf.changemanagement.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type> -mso.restapi.network.instance=/serviceInstances/v6/<service_instance_id>/networks +mso.restapi.vnf.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs +mso.restapi.vnf.changemanagement.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type> +mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut -mso.restapi.vf.module.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules +mso.restapi.vf.module.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/workflows/<workflow_UUID> -mso.restapi.volume.group.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups -mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups -mso.restapi.get.orc.req=/orchestrationRequests/v6 -mso.restapi.get.orc.reqs=/orchestrationRequests/v6? +mso.restapi.volume.group.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/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/<request_id>/resume mso.restapi.get.man.tasks=/tasks/v1 -mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations +mso.restapi.configurations=/serviceInstances/v7/<service_instance_id>/configurations mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id> mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id> @@ -154,8 +149,12 @@ 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) diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties index 295674ed8..60ac15449 100644 --- a/epsdk-app-onap/version.properties +++ b/epsdk-app-onap/version.properties @@ -4,7 +4,7 @@ major=5 minor=0 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vid</groupId> <artifactId>vid-parent</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.0.1-SNAPSHOT</version> <packaging>pom</packaging> <name>vid</name> @@ -86,7 +86,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <build.version>5.0.0-SNAPSHOT</build.version> + <build.version>5.0.1-SNAPSHOT</build.version> <nexusproxy>https://nexus.onap.org</nexusproxy> <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath> <releaseNexusPath>content/repositories/releases/</releaseNexusPath> @@ -211,7 +211,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> @@ -221,9 +221,9 @@ <artifactId>logback-classic</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.2</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.4</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> @@ -233,7 +233,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.7</version> + <version>4.5.9</version> </dependency> </dependencies> </project> diff --git a/version.properties b/version.properties index 295674ed8..60ac15449 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=5 minor=0 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index 5f69ff162..34699f98c 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -9,7 +9,7 @@ inherit from a parent maven module. --> <groupId>org.onap.vid</groupId> <artifactId>vid-app-common</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.0.1-SNAPSHOT</version> <packaging>war</packaging> <name>VID Common</name> <description>VID Common code for opensource version</description> @@ -25,16 +25,17 @@ <encoding>UTF-8</encoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <epsdk.version>2.4.0</epsdk.version> - <springframework.version>5.1.6.RELEASE</springframework.version> + <epsdk.version>2.5.0</epsdk.version> + <springframework.version>5.1.9.RELEASE</springframework.version> <springframework.orm.version>4.3.22.RELEASE</springframework.orm.version> <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5: org.springframework.orm.hibernate4.HibernateTransactionManager so following orm.version lets epsdk-core find it --> <hibernate.version>4.3.11.Final</hibernate.version> - <jackson.version>2.9.8</jackson.version> - <jersey.version>2.28</jersey.version> + <jackson.version>2.9.9</jackson.version> + <jersey.version>2.29</jersey.version> <surefire.version>2.22.1</surefire.version> + <selenium.version>3.141.59</selenium.version> <sonar.coverage.exclusions>**/webapp/**/*,**/*.js</sonar.coverage.exclusions> <!-- Skip assembling the zip by default --> @@ -495,7 +496,7 @@ <dependency> <groupId>com.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>4.1</version> + <version>4.6</version> </dependency> <!-- HTTP client --> @@ -508,16 +509,17 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>4.5.9</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpasyncclient</artifactId> - <version>4.0.2</version> + <version>4.1.4</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.5.7</version> + <version>4.5.9</version> </dependency> <dependency> <groupId>com.xebialabs.restito</groupId> @@ -528,7 +530,7 @@ <dependency> <groupId>org.jeasy</groupId> <artifactId>easy-random-core</artifactId> - <version>4.0.0.RC1</version> + <version>4.0.0</version> <scope>test</scope> </dependency> @@ -536,7 +538,7 @@ <dependency> <groupId>io.vavr</groupId> <artifactId>vavr</artifactId> - <version>0.9.2</version> + <version>0.10.2</version> </dependency> <!-- SDK overlay war --> @@ -626,7 +628,7 @@ <dependency> <groupId>io.searchbox</groupId> <artifactId>jest</artifactId> - <version>2.0.0</version> + <version>6.3.1</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -637,7 +639,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.1</version> <scope>provided</scope> </dependency> <dependency> @@ -649,7 +651,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>2.6</version> <!--<scope>test</scope>--> </dependency> <dependency> @@ -661,12 +663,12 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20160212</version> + <version>20190722</version> </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <version>2.2.1</version> + <version>2.3.1</version> <exclusions> <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 --> <exclusion> @@ -679,7 +681,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.7.12</version> + <version>1.7.27</version> </dependency> <!-- springframework to override epsdk-app-common's and epsdk-core's versions --> @@ -763,13 +765,13 @@ <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> - <version>2.53.1</version> + <version>${selenium.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-api</artifactId> - <version>2.53.1</version> + <version>${selenium.version}</version> <scope>test</scope> </dependency> <dependency> @@ -787,17 +789,17 @@ <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-firefox-driver</artifactId> - <version>2.53.1</version> + <version>${selenium.version}</version> </dependency> <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> - <version>1.4.01</version> + <version>2.0.2</version> </dependency> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.16</version> + <version>1.24</version> </dependency> <dependency> <groupId>org.skyscreamer</groupId> @@ -808,13 +810,13 @@ <dependency> <groupId>org.onap.sdc.sdc-tosca</groupId> <artifactId>sdc-tosca</artifactId> - <version>1.5.1</version> + <version>1.6.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> <artifactId>json-unit</artifactId> - <version>2.2.0</version> + <version>2.8.0</version> <scope>test</scope> </dependency> <dependency> @@ -831,7 +833,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.1</version> + <version>1.7</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -839,6 +841,11 @@ <version>1.0</version> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.4</version> + </dependency> + <dependency> <groupId>org.hamcrest</groupId> <artifactId>java-hamcrest</artifactId> <version>2.0.0.0</version> @@ -847,29 +854,30 @@ <dependency> <groupId>org.togglz</groupId> <artifactId>togglz-spring-core</artifactId> - <version>2.5.0.Final</version> + <version>2.6.1.Final</version> </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.196</version> + <version>1.4.199</version> <scope>test</scope> </dependency> <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>2.2.11</version> + <version>2.3.1</version> </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.10.0</version> + <version>3.13.2</version> <scope>test</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <version>28.0-jre</version> </dependency> <dependency> <groupId>io.springfox</groupId> diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java index b118901a4..2f69e397c 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2018 - 2019 Nokia. All rights reserved. + * Modifications Copyright (C) 2019 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,13 +36,13 @@ import java.util.UUID; import static org.onap.vid.utils.Logging.REQUEST_ID_HEADER_KEY; public class PombaRestInterface extends AAIRestInterface { + + private Client client = null; public PombaRestInterface (HttpsAuthClient httpsAuthClientFactory, ServletRequestHelper servletRequestHelper, SystemPropertyHelper systemPropertyHelper) { super(httpsAuthClientFactory, servletRequestHelper, systemPropertyHelper); } - private Client client = null; - @Override protected void initRestClient() { diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java b/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java index d03362ba8..af665f849 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java @@ -3,6 +3,7 @@ * VID * ================================================================================ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +32,8 @@ import java.util.List; * Created by Oren on 7/5/17. */ public class SubscriberListWithFilterData { + + public List<SubscriberWithFilter> customer; public SubscriberListWithFilterData(SubscriberList subscriberList, RoleValidator roleValidator){ List<Subscriber> subscribers = subscriberList != null ? subscriberList.customer : new ArrayList<>(); @@ -46,5 +49,4 @@ public class SubscriberListWithFilterData { } } - public List<SubscriberWithFilter> customer; } diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java index 83a3cae1d..4d49b5806 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java @@ -37,7 +37,7 @@ public enum ResourceType { INSTANCE_GROUP("instance-groups", "instance-group-name"), VOLUME_GROUP("volume-groups", "volume-group-name"); - private static Map<String, ResourceType> AAI_FORMAT_MAP = Stream + private static final Map<String, ResourceType> AAI_FORMAT_MAP = Stream .of(ResourceType.values()) .collect(Collectors.toMap(s -> s.aaiFormat, Function.identity())); diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java index 8a674609d..400e788d0 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java @@ -34,7 +34,7 @@ public class SSLContextProvider { private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SSLContextProvider.class); - public SSLContext getSslContext(String keystorePath, String keystorePassword, HttpClientMode httpClientMode) throws HttpClientBuilderException { + public SSLContext getSslContext(String keystorePath, String keystorePassword, HttpClientMode httpClientMode){ try { final SSLContext ctx = SSLContext.getInstance("TLSv1.2"); KeyManager[] keyManagers = getKeyManagerFactory(keystorePath, keystorePassword, httpClientMode); diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Group.java b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Group.java index e1d2544b7..132987a22 100644 --- a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Group.java +++ b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Group.java @@ -38,7 +38,7 @@ public class Group { private ToscaMetadata metadata; /** The vf module type. */ - private String vf_module_type; + private String vfModuleType; /** The properties. */ private Map<String, Object> properties; @@ -103,7 +103,7 @@ public class Group { * @return the vf module type */ public String getvf_module_type() { - return vf_module_type; + return vfModuleType; } /** @@ -111,8 +111,8 @@ public class Group { * * @param vf_module_type the new vf module type */ - public void setvf_module_type(String vf_module_type) { - this.vf_module_type = vf_module_type; + public void setvf_module_type(String vfModuleType) { + this.vfModuleType = vfModuleType; } /** diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java index 5171b7ac8..626816f7f 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java @@ -49,7 +49,8 @@ public class MsoUtil { if (httpResponse.getRawBody() != null) { try { T body = httpResponse.getBody(); - String entityStr = body instanceof String ? (String) body : JACKSON_OBJECT_MAPPER.writeValueAsString(httpResponse.getBody()); + String entityStr = (body instanceof String || body==null) ? (String) body : + JACKSON_OBJECT_MAPPER.writeValueAsString(httpResponse.getBody()); msoResponseWrapper.setEntity(entityStr); } catch(JsonProcessingException e) { ExceptionUtils.rethrow(e); diff --git a/vid-app-common/src/main/webapp/WEB-INF/web.xml b/vid-app-common/src/main/webapp/WEB-INF/web.xml deleted file mode 100755 index 7f0a40ef2..000000000 --- a/vid-app-common/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
-
- <display-name>vid-common</display-name>
-
- <!-- The app can function on a HA cluster -->
- <distributable />
-
- <session-config>
- <session-timeout>7</session-timeout>
- <tracking-mode>COOKIE</tracking-mode>
- </session-config>
-
-</web-app>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js index 072adf305..e66b8ff6c 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js @@ -531,7 +531,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER", $scope.isPermitted = first.isPermitted;
deferred.resolve(first.isPermitted);
} else {
- deferred.reject("some error while resolveIfIsPermitted")
+ deferred.reject("some error while resolveIfIsPermitted");
}
});
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js index e545aadb1..6b45a7479 100644 --- a/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js @@ -119,8 +119,7 @@ }); return deferred.promise; - }; - + }; this.postChangeManagementNow = function (requestData, vnfName) { var url = COMPONENT.CHANGE_MANAGEMENT_OPERATION_NO_SCHEDULER.replace('@vnfName', vnfName); return $http.post(url, requestData) diff --git a/vid-app-common/src/test/resources/WEB-INF/web.xml b/vid-app-common/src/test/resources/WEB-INF/web.xml deleted file mode 100644 index 273544d6f..000000000 --- a/vid-app-common/src/test/resources/WEB-INF/web.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd" version="2.5"> - - <display-name>ecomp-sdk-app-att</display-name> - <distributable/> - <session-config> - <session-timeout>7</session-timeout> - <tracking-mode>COOKIE</tracking-mode> - </session-config> -</web-app>
\ No newline at end of file diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties index 295674ed8..60ac15449 100755 --- a/vid-app-common/version.properties +++ b/vid-app-common/version.properties @@ -4,7 +4,7 @@ major=5 minor=0 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml index a6ca977b1..81ec4a6d8 100644 --- a/vid-automation/pom.xml +++ b/vid-automation/pom.xml @@ -6,8 +6,8 @@ <artifactId>automationTest</artifactId> <version>1.0-SNAPSHOT</version> <properties> - <springframework.version>5.1.6.RELEASE</springframework.version> - <jersey.version>2.28</jersey.version> + <springframework.version>5.1.9.RELEASE</springframework.version> + <jersey.version>2.29</jersey.version> <jackson.version>2.9.9</jackson.version> <aspectj.version>1.8.10</aspectj.version> <selenium.version>3.6.0</selenium.version> diff --git a/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java b/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java index 087449624..4fede294d 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java +++ b/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java @@ -130,7 +130,7 @@ public class SimulatorApi { presets.forEach( preset-> { try {registerToSimulatorAndAssertSuccess(preset.getClass().getCanonicalName(), preset.generateScenario());} - catch (RuntimeException e) { + catch (Throwable e) { throw new RuntimeException("Failed to register preset "+preset.getClass().getName(), e); } } diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json index 91413a070..8bda092ba 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json @@ -71,4 +71,4 @@ } } } -]
\ No newline at end of file +] diff --git a/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java index 329291838..8201bcfa0 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java @@ -14,7 +14,9 @@ import org.testng.annotations.Test; import vid.automation.test.infra.FeatureTogglingTest; import vid.automation.test.infra.Features; +import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals; import static net.javacrumbs.jsonunit.JsonMatchers.jsonStringEquals; +import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; @@ -79,7 +81,9 @@ public class SdcApiTest extends BaseApiTest { ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + A_LA_CARTE_INSTANTIATION_TYPE_UUID), String.class); Assert.assertEquals(response.getStatusCode(), HttpStatus.OK); String aLaCarteInstantiationTypeExpectedResponse = loadResourceAsString(A_LA_CARTE_INSTANTIATION_TYPE_EXPECTED_RESPONSE); - assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(turnOffInstantiationUI(aLaCarteInstantiationTypeExpectedResponse)))); + assertThat(response.getBody(), jsonEquals(aLaCarteInstantiationTypeExpectedResponse) + .when(IGNORING_ARRAY_ORDER) + .whenIgnoringPaths("service.vidNotions.instantiationUI")); } diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml index 4e966754c..8cb3c37b8 100644 --- a/vid-ext-services-simulator/pom.xml +++ b/vid-ext-services-simulator/pom.xml @@ -12,7 +12,7 @@ <properties> <encoding>UTF-8</encoding> - <springframework.version>5.1.6.RELEASE</springframework.version> + <springframework.version>5.1.9.RELEASE</springframework.version> <hibernate.version>5.3.4.Final</hibernate.version> <jackson.version>2.9.8</jackson.version> <!-- Skip assembling the zip by default --> diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java index 06c72cbd4..3845c7419 100644 --- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java @@ -1,8 +1,41 @@ package org.onap.simulator.controller; +import static org.mockserver.integration.ClientAndServer.startClientAndServer; +import static org.mockserver.matchers.Times.exactly; +import static org.mockserver.model.JsonBody.json; + import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URLEncoder; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Scanner; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; +import javax.persistence.TypedQuery; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.mockserver.integration.ClientAndServer; import org.mockserver.matchers.MatchType; import org.mockserver.matchers.Times; @@ -20,36 +53,22 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.http.*; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import org.springframework.web.servlet.View; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.TypedQuery; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URLEncoder; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.mockserver.integration.ClientAndServer.startClientAndServer; -import static org.mockserver.matchers.Times.exactly; -import static org.mockserver.model.JsonBody.json; - @RestController @Component public class SimulatorController { @@ -245,8 +264,14 @@ public class SimulatorController { return new ResponseEntity<>(jsonString, HttpStatus.OK); } + //*******portal role access simulator end + @RequestMapping(value = {"/ecompportal_att/auxapi//{ver}/getSessionSlotCheckInterval", "/ONAPPORTAL/auxapi//{ver}/getSessionSlotCheckInterval"}, method = RequestMethod.GET) + @ResponseBody + public String getSessionSlotCheckInterval() { + return "300000"; + } @RequestMapping(value = {"/**"}) public ResponseEntity redirectToMockServer(HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-PasqualeVmxVpeBvService488-csar-annotations.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-PasqualeVmxVpeBvService488-csar-annotations.zip Binary files differnew file mode 100644 index 000000000..a1f1f5d83 --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-PasqualeVmxVpeBvService488-csar-annotations.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar.zip Binary files differnew file mode 100644 index 000000000..2967a50ec --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar_ecomp_false6.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar_ecomp_false6.zip Binary files differnew file mode 100644 index 000000000..dfd929875 --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar_ecomp_false6.zip diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml index 38c0f7f0c..d1398cc35 100644 --- a/vid-webpack-master/pom.xml +++ b/vid-webpack-master/pom.xml @@ -9,7 +9,7 @@ inherit from a parent maven module. --> <groupId>org.onap.vid</groupId> <artifactId>vid-webpack-master</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.0.1-SNAPSHOT</version> <packaging>war</packaging> <name>VID UI</name> <description>VID UI</description> |