summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--huawei/pom.xml2
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/RestfulConfigureTest.java93
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check2.txt12
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check3.txt12
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check4.txt12
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check5.txt0
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check7.txt12
-rw-r--r--nokia/pom.xml2
-rw-r--r--nokiav2/deployment/pom.xml4
-rw-r--r--nokiav2/driver/pom.xml6
-rw-r--r--nokiav2/driverwar/pom.xml6
-rw-r--r--nokiav2/generatedapis/pom.xml4
-rw-r--r--nokiav2/pom.xml6
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
-rw-r--r--zte/pom.xml2
16 files changed, 159 insertions, 18 deletions
diff --git a/huawei/pom.xml b/huawei/pom.xml
index b6f765ed..275d5cc8 100644
--- a/huawei/pom.xml
+++ b/huawei/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei</groupId>
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/RestfulConfigureTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/RestfulConfigureTest.java
new file mode 100644
index 00000000..9a40cda3
--- /dev/null
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/RestfulConfigureTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2016 Huawei Technologies Co., Ltd.
+ *
+ * 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.
+ */
+
+
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import net.sf.json.JSONException;
+
+public class RestfulConfigureTest {
+
+ @Test
+ public void testRestfulConfigure() {
+ RestfulConfigure rc = new RestfulConfigure();
+ rc.toString();
+ }
+
+ @Test
+ public void testRestfulConfigureStringNoFilePath() {
+ RestfulConfigure rc = new RestfulConfigure("");
+ RestfulOptions rp = rc.getOptions();
+ assertTrue(true);
+ }
+
+ @Test
+ public void testRestfulConfigureStringNoFileExist() {
+ RestfulConfigure rc = new RestfulConfigure("C:/Users/Public/Desktop");
+ RestfulOptions rp = rc.getOptions();
+ assertTrue(true);
+ }
+
+ @Test
+ public void testRestfulConfigureString() {
+ RestfulConfigure rc = new RestfulConfigure("src/test/resources/Check7.txt");
+ RestfulOptions rp = rc.getOptions();
+ assertTrue(true);
+ }
+
+ @Test
+ public void testRestfulConfigureStringNoFile() {
+ RestfulConfigure rc = new RestfulConfigure("src/test/resources/Check1.txt");
+ RestfulOptions rp = rc.getOptions();
+ assertTrue(true);
+ }
+
+ @Test
+ public void testRestfulConfigureStringWrongFile() {
+ RestfulConfigure rc = new RestfulConfigure("src/test/resources/Check2.txt");
+ RestfulOptions rp = rc.getOptions();
+ assertTrue(true);
+ }
+
+ @Test
+ public void testRestfulConfigureStringEmptyFile() {
+ RestfulConfigure rc = new RestfulConfigure("src/test/resources/Check3.txt");
+ RestfulOptions rp = rc.getOptions();
+ assertTrue(true);
+ }
+ @Test
+ public void testRestfulConfigureStringNoHostFile() {
+ RestfulConfigure rc = new RestfulConfigure("src/test/resources/Check4.txt");
+ RestfulOptions rp = rc.getOptions();
+ assertTrue(true);
+ }
+ @Test(expected=JSONException.class)
+ public void testRestfulConfigureStringZeroFile() throws IOException {
+ RestfulConfigure rc = new RestfulConfigure("src/test/resources/Check5.txt");
+ rc.getOptions();
+ }
+ /*@Test
+ public void testRestfulConfigureStringClose() {
+ RestfulConfigure rc = new RestfulConfigure("src/test/resources/Check6.txt");
+ rc.getOptions();
+ }*/
+}
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check2.txt b/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check2.txt
new file mode 100644
index 00000000..926dc205
--- /dev/null
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check2.txt
@@ -0,0 +1,12 @@
+{
+ "defaultServer":
+ {
+ "host":"",
+ "port":"80"
+ },
+"ConnectTimeout":"300000",
+"thread":"10",
+"idletimeout":"500000",
+"timeout":"300000"
+}
+ \ No newline at end of file
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check3.txt b/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check3.txt
new file mode 100644
index 00000000..08e37413
--- /dev/null
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check3.txt
@@ -0,0 +1,12 @@
+{
+ "":
+ {
+ "host":"",
+ "port":""
+ },
+"":"",
+"":"",
+"":"",
+"":""
+}
+ \ No newline at end of file
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check4.txt b/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check4.txt
new file mode 100644
index 00000000..7ccbf2b7
--- /dev/null
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check4.txt
@@ -0,0 +1,12 @@
+{
+ "defaultServer":
+ {
+ "":"127.0.0.1",
+ "port":"80"
+ },
+"ConnectTimeout":"300000",
+"thread":"10",
+"idletimeout":"500000",
+"timeout":"300000"
+}
+ \ No newline at end of file
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check5.txt b/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check5.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check5.txt
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check7.txt b/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check7.txt
new file mode 100644
index 00000000..47c4e08c
--- /dev/null
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/resources/Check7.txt
@@ -0,0 +1,12 @@
+{
+ "defaultServer":
+ {
+ "host":"127.0.0.1",
+ "port":"80"
+ },
+"ConnectTimeout":"300000",
+"thread":"10",
+"idletimeout":"500000",
+"timeout":"300000"
+}
+ \ No newline at end of file
diff --git a/nokia/pom.xml b/nokia/pom.xml
index 7fd5cdfa..c3d3dc5f 100644
--- a/nokia/pom.xml
+++ b/nokia/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia</groupId>
diff --git a/nokiav2/deployment/pom.xml b/nokiav2/deployment/pom.xml
index 2f300e76..abf8ef1d 100644
--- a/nokiav2/deployment/pom.xml
+++ b/nokiav2/deployment/pom.xml
@@ -17,14 +17,14 @@
<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>
<artifactId>deployment</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/deployment</name>
<description>Nokia SVNFM driver deployment files</description>
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
diff --git a/nokiav2/driver/pom.xml b/nokiav2/driver/pom.xml
index 956ef957..1e6b0dc1 100644
--- a/nokiav2/driver/pom.xml
+++ b/nokiav2/driver/pom.xml
@@ -17,14 +17,14 @@
<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>
<artifactId>driver</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/driver</name>
<description>svnfm vnfm driver</description>
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/nokiav2/driverwar/pom.xml b/nokiav2/driverwar/pom.xml
index 7215e3f8..d6866cda 100644
--- a/nokiav2/driverwar/pom.xml
+++ b/nokiav2/driverwar/pom.xml
@@ -18,14 +18,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>driverwar</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/driverwar</name>
<description>svnfm vnfm driver</description>
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>driver</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/nokiav2/generatedapis/pom.xml b/nokiav2/generatedapis/pom.xml
index 294158c5..ee3e65d7 100644
--- a/nokiav2/generatedapis/pom.xml
+++ b/nokiav2/generatedapis/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/generatedapis</name>
<properties>
diff --git a/nokiav2/pom.xml b/nokiav2/pom.xml
index 52a368e7..72ab854d 100644
--- a/nokiav2/pom.xml
+++ b/nokiav2/pom.xml
@@ -18,17 +18,17 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-svnfm-nokiav2</name>
<properties>
<jacoco.version>0.8.0</jacoco.version>
- <spring.boot.version>2.0.2.RELEASE</spring.boot.version>
+ <spring.boot.version>2.0.4.RELEASE</spring.boot.version>
</properties>
<!-- used to test dependency convergence locally
<build>
diff --git a/pom.xml b/pom.xml
index f8f19028..b4aa4c70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-svnfm</name>
<description>vfc-nfvo-driver-vnfm-svnfm</description>
diff --git a/version.properties b/version.properties
index d7c69cd5..2cddbb0d 100644
--- a/version.properties
+++ b/version.properties
@@ -18,7 +18,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=1
+minor=2
patch=0
base_version=${major}.${minor}.${patch}
diff --git a/zte/pom.xml b/zte/pom.xml
index 6af4bcca..e1d45b55 100644
--- a/zte/pom.xml
+++ b/zte/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.zte</groupId>