aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INFO.yaml2
-rwxr-xr-xdeliveries/pom.xml2
-rwxr-xr-xdeliveries/src/main/docker/docker-files/Dockerfile4
-rwxr-xr-xdeliveries/src/main/docker/docker-files/docker-compose.yml2
-rw-r--r--docs/installation.rst4
-rw-r--r--docs/release-notes.rst2
-rwxr-xr-xepsdk-app-onap/pom.xml2
-rw-r--r--epsdk-app-onap/version.properties2
-rw-r--r--pom.xml4
-rw-r--r--version.properties2
-rwxr-xr-xvid-app-common/pom.xml2
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Input.java27
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js2
-rwxr-xr-xvid-app-common/version.properties2
-rw-r--r--vid-webpack-master/pom.xml2
15 files changed, 31 insertions, 30 deletions
diff --git a/INFO.yaml b/INFO.yaml
index 4e953a46c..b6217507b 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -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 db123b44b..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>
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}
diff --git a/pom.xml b/pom.xml
index 50965c946..35387ba52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
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 c0c4958d5..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>
diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Input.java b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Input.java
index 7980ece5a..51766413f 100644
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Input.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Input.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,16 +32,11 @@ import java.util.List;
* The Class Input.
*/
public class Input {
-
- public Input(org.onap.sdc.toscaparser.api.parameters.Input input, List<Property> properties){
- this.type = input.getType();
- this.description = input.getDescription();
- this._default = input.getDefault();
- this.inputProperties = new InputProperties(properties);
- this.fromInputName = input.getName();
- }
-
- /** The type. */
+
+ /** The entry schema. */
+ private Input entry_schema;
+
+ /** The type. */
private String type;
/** The description. */
@@ -48,9 +44,6 @@ public class Input {
/** The default. */
private Object _default;
-
- /** The entry schema. */
- private Input entry_schema;
private InputProperties inputProperties;
@@ -68,6 +61,14 @@ public class Input {
private String templateInvariantUUID;
private String templateCustomizationUUID;
+ public Input(org.onap.sdc.toscaparser.api.parameters.Input input, List<Property> properties){
+ this.type = input.getType();
+ this.description = input.getDescription();
+ this._default = input.getDefault();
+ this.inputProperties = new InputProperties(properties);
+ this.fromInputName = input.getName();
+ }
+
/**
* Instantiates a new input.
*/
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/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-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>