summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdeliveries/pom.xml2
-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/aai/util/AAIRestInterface.java4
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/util/SystemPropertyHelper.java8
-rw-r--r--vid-app-common/src/main/resources/adiod.zipbin81489 -> 79510 bytes
-rw-r--r--vid-app-common/src/main/resources/csar317927061915233480.zipbin63368 -> 61779 bytes
-rw-r--r--vid-app-common/src/main/resources/csar3933948645405128424.zipbin104292 -> 102261 bytes
-rw-r--r--vid-app-common/src/main/resources/service-AmpPhSvc-csar.zipbin68824 -> 67244 bytes
-rw-r--r--vid-app-common/src/main/resources/service-VdbeSrv-csar.zipbin72231 -> 70825 bytes
-rw-r--r--vid-app-common/src/main/resources/service-vf-csar.zipbin58693 -> 57116 bytes
-rw-r--r--vid-app-common/src/main/resources/service-vf-with-annotations.zipbin119155 -> 117760 bytes
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js1
-rw-r--r--vid-app-common/src/test/java/org/onap/vid/aai/util/SingleAAIRestInterfaceTest.java1
-rwxr-xr-xvid-app-common/version.properties2
-rw-r--r--vid-automation/pom.xml10
-rw-r--r--vid-webpack-master/LICENSE2
-rw-r--r--vid-webpack-master/README.md2
-rw-r--r--vid-webpack-master/package.json2
22 files changed, 28 insertions, 18 deletions
diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index ef35eeccd..3768b8124 100755
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -62,7 +62,7 @@
<descriptor>assembly/assembly-for-plugin.xml</descriptor>
</assembly>
<tags>
- <tag>2.0-STAGING-latest</tag>
+ <tag>3.0-STAGING-latest</tag>
</tags>
</build>
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 2ec04fe1e..050c3c5a9 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>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-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 6a0ca5f32..02144f0fe 100644
--- a/epsdk-app-onap/version.properties
+++ b/epsdk-app-onap/version.properties
@@ -2,7 +2,7 @@
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
# because they are used in Jenkins, whose plug-in doesn't support
-major=2
+major=3
minor=0
patch=0
diff --git a/pom.xml b/pom.xml
index 74ff5708b..f16ca6051 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <build.version>2.0.0-SNAPSHOT</build.version>
+ <build.version>3.0.0-SNAPSHOT</build.version>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -267,5 +267,5 @@
<version>4.5.3</version>
</dependency>
</dependencies>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</project>
diff --git a/version.properties b/version.properties
index 6a0ca5f32..02144f0fe 100644
--- a/version.properties
+++ b/version.properties
@@ -2,7 +2,7 @@
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
# because they are used in Jenkins, whose plug-in doesn't support
-major=2
+major=3
minor=0
patch=0
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 9a6210b10..57d3de1fd 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>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-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/aai/util/AAIRestInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java
index 6b17c932a..f5625ce21 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java
@@ -309,7 +309,7 @@ public class AAIRestInterface {
*/
public Response RestPost(String fromAppId, String path, String payload, boolean xml) {
String methodName = "RestPost";
- String url=systemPropertyHelper.getFullServicePath(path);
+ String url=systemPropertyHelper.getServiceBasePath(path);
String transId = UUID.randomUUID().toString();
logger.debug(EELFLoggerDelegate.debugLogger, methodName + START_STRING);
@@ -317,7 +317,7 @@ public class AAIRestInterface {
try {
initRestClient();
Logging.logRequest(outgoingRequestsLogger, HttpMethod.POST, url, payload);
- response = authenticateRequest(client.target(systemPropertyHelper.getFullServicePath(path))
+ response = authenticateRequest(client.target(systemPropertyHelper.getServiceBasePath(path))
.request()
.accept(xml ? MediaType.APPLICATION_XML : MediaType.APPLICATION_JSON)
.header(TRANSACTION_ID_HEADER, transId)
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/util/SystemPropertyHelper.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/SystemPropertyHelper.java
index ebf39c409..4d43d3ba2 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/util/SystemPropertyHelper.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/SystemPropertyHelper.java
@@ -38,6 +38,10 @@ public class SystemPropertyHelper {
return getSystemProperty(AAIProperties.AAI_SERVER_URL);
}
+ public Optional<String> getAAIServerBaseUrl(){
+ return getSystemProperty(AAIProperties.AAI_SERVER_URL_BASE);
+ }
+
public Optional<String> getAAIVIDUsername(){
return getSystemProperty(AAIProperties.AAI_VID_USERNAME);
}
@@ -70,6 +74,10 @@ public class SystemPropertyHelper {
return getAAIServerUrl().orElse("") + path;
}
+ public String getServiceBasePath(String path) {
+ return getAAIServerBaseUrl().orElse("") + path;
+ }
+
public String getEncodedCredentials() throws InvalidPropertyException, UnsupportedEncodingException {
String vidUsername = getAAIVIDUsername().orElseThrow(InvalidPropertyException::new);
String vidPassword = Password.deobfuscate(getAAIVIDPasswd().orElseThrow(InvalidPropertyException::new));
diff --git a/vid-app-common/src/main/resources/adiod.zip b/vid-app-common/src/main/resources/adiod.zip
index 415fa4833..6c928a354 100644
--- a/vid-app-common/src/main/resources/adiod.zip
+++ b/vid-app-common/src/main/resources/adiod.zip
Binary files differ
diff --git a/vid-app-common/src/main/resources/csar317927061915233480.zip b/vid-app-common/src/main/resources/csar317927061915233480.zip
index 36ac9f9bc..ce58b17dc 100644
--- a/vid-app-common/src/main/resources/csar317927061915233480.zip
+++ b/vid-app-common/src/main/resources/csar317927061915233480.zip
Binary files differ
diff --git a/vid-app-common/src/main/resources/csar3933948645405128424.zip b/vid-app-common/src/main/resources/csar3933948645405128424.zip
index b92d5339f..ee9b4fb0c 100644
--- a/vid-app-common/src/main/resources/csar3933948645405128424.zip
+++ b/vid-app-common/src/main/resources/csar3933948645405128424.zip
Binary files differ
diff --git a/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip b/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip
index 6d5002c6c..1591a48ff 100644
--- a/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip
+++ b/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip
Binary files differ
diff --git a/vid-app-common/src/main/resources/service-VdbeSrv-csar.zip b/vid-app-common/src/main/resources/service-VdbeSrv-csar.zip
index 3defd1e90..0b8db2789 100644
--- a/vid-app-common/src/main/resources/service-VdbeSrv-csar.zip
+++ b/vid-app-common/src/main/resources/service-VdbeSrv-csar.zip
Binary files differ
diff --git a/vid-app-common/src/main/resources/service-vf-csar.zip b/vid-app-common/src/main/resources/service-vf-csar.zip
index f66d08464..c3a9fbbe9 100644
--- a/vid-app-common/src/main/resources/service-vf-csar.zip
+++ b/vid-app-common/src/main/resources/service-vf-csar.zip
Binary files differ
diff --git a/vid-app-common/src/main/resources/service-vf-with-annotations.zip b/vid-app-common/src/main/resources/service-vf-with-annotations.zip
index a742d60cb..a6fcce7ae 100644
--- a/vid-app-common/src/main/resources/service-vf-with-annotations.zip
+++ b/vid-app-common/src/main/resources/service-vf-with-annotations.zip
Binary files differ
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
index c85e86529..89660fb18 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
@@ -187,6 +187,7 @@
"category":serviceModel.service.category
});
DataService.setALaCarte (true);
+ DataService.setPnf(!angular.equals(serviceModel.pnfs, {}));
$scope.createType = COMPONENT.A_LA_CARTE;
var broadcastType = COMPONENT.CREATE_COMPONENT;
if (AsdcService.isMacro(serviceModel)) {
diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/util/SingleAAIRestInterfaceTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/util/SingleAAIRestInterfaceTest.java
index 288b891c0..cd2b8ff28 100644
--- a/vid-app-common/src/test/java/org/onap/vid/aai/util/SingleAAIRestInterfaceTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/util/SingleAAIRestInterfaceTest.java
@@ -302,6 +302,7 @@ public class SingleAAIRestInterfaceTest {
when(systemPropertyHelper.getAAIVIDUsername()).thenReturn(Optional.of("user"));
when(systemPropertyHelper.getEncodedCredentials()).thenReturn("someCredentials");
when(systemPropertyHelper.getFullServicePath(Mockito.anyString())).thenReturn("http://localhost/path");
+ when(systemPropertyHelper.getServiceBasePath(Mockito.anyString())).thenReturn("http://localhost/path");
}
} \ No newline at end of file
diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties
index 6a0ca5f32..02144f0fe 100755
--- a/vid-app-common/version.properties
+++ b/vid-app-common/version.properties
@@ -2,7 +2,7 @@
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
# because they are used in Jenkins, whose plug-in doesn't support
-major=2
+major=3
minor=0
patch=0
diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml
index bf34a4f78..75d48a4b5 100644
--- a/vid-automation/pom.xml
+++ b/vid-automation/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vid</groupId>
@@ -12,7 +10,7 @@
<jersey.version>2.23.1</jersey.version>
<jackson.version>2.6.3</jackson.version>
<aspectj.version>1.8.10</aspectj.version>
-
+
</properties>
@@ -20,7 +18,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>23.0</version>
+
</dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
@@ -230,4 +228,4 @@
</plugin>
</plugins>
</build>
-</project> \ No newline at end of file
+</project>
diff --git a/vid-webpack-master/LICENSE b/vid-webpack-master/LICENSE
index ad6b74029..90ec86ce4 100644
--- a/vid-webpack-master/LICENSE
+++ b/vid-webpack-master/LICENSE
@@ -1,3 +1,5 @@
+The vid-webpack-master project is provided under the Apache License, version 2.0 (Apache-2.0). It includes code from the angular-webpack template files, which were originally provided under the following license:
+
The MIT License (MIT)
Copyright (c) 2016 Preboot team
diff --git a/vid-webpack-master/README.md b/vid-webpack-master/README.md
index 5c37773bd..25a7588b4 100644
--- a/vid-webpack-master/README.md
+++ b/vid-webpack-master/README.md
@@ -145,5 +145,5 @@ We have good experience using these editors:
* [Sublime Text](http://www.sublimetext.com/3) with [Typescript-Sublime-Plugin](https://github.com/Microsoft/Typescript-Sublime-plugin#installation)
# License
+The vid-webpack-master project is provided under the Apache License, version 2.0 (Apache-2.0). It includes code from the angular-webpack template files, which were originally provided under the MIT license.
-[MIT](/LICENSE)
diff --git a/vid-webpack-master/package.json b/vid-webpack-master/package.json
index 8cb4b927d..168ad95e0 100644
--- a/vid-webpack-master/package.json
+++ b/vid-webpack-master/package.json
@@ -1,7 +1,7 @@
{
"name": "vid-cli",
"version": "0.0.0",
- "license": "MIT",
+ "license": "Apache-2.0",
"scripts": {
"ng": "ng",
"start": "ng serve --port 4201",