summaryrefslogtreecommitdiffstats
path: root/vnf-sdk-function-test/src
diff options
context:
space:
mode:
Diffstat (limited to 'vnf-sdk-function-test/src')
-rw-r--r--vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceNode.java12
-rw-r--r--vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceRegisterEntity.java24
-rw-r--r--vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/resource/CommonManager.java2
-rw-r--r--vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/util/ZipCompressor.java2
-rw-r--r--vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/FileUtilTest.java1
-rw-r--r--vnf-sdk-function-test/src/test/resources/59d1e651-df9f-4008-902f-e3b377e6ec30/output.xml15
6 files changed, 38 insertions, 18 deletions
diff --git a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceNode.java b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceNode.java
index 28ae31e..0d38f06 100644
--- a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceNode.java
+++ b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceNode.java
@@ -27,6 +27,12 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@JsonIgnoreProperties(ignoreUnknown = true)
public class ServiceNode {
+
+ private String ip;
+
+ private String port;
+
+ private int ttl;
public String getIp() {
return ip;
@@ -52,9 +58,5 @@ public class ServiceNode {
this.ttl = ttl;
}
- private String ip;
-
- private String port;
-
- private int ttl;
+
}
diff --git a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceRegisterEntity.java b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceRegisterEntity.java
index d32e2af..c6d885a 100644
--- a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceRegisterEntity.java
+++ b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceRegisterEntity.java
@@ -30,6 +30,18 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@JsonIgnoreProperties(ignoreUnknown = true)
public class ServiceRegisterEntity {
+
+ private String serviceName;
+
+ private String version;
+
+ private String url;
+
+ private String protocol;
+
+ private String visualRange;
+
+ private List<ServiceNode> nodes = new ArrayList<ServiceNode>();
public String getServiceName() {
return serviceName;
@@ -79,17 +91,7 @@ public class ServiceRegisterEntity {
this.nodes = nodes;
}
- private String serviceName;
-
- private String version;
-
- private String url;
-
- private String protocol;
-
- private String visualRange;
-
- private List<ServiceNode> nodes = new ArrayList<ServiceNode>();
+
public void setSingleNode(String ip, String port, int ttl) {
ServiceNode node = new ServiceNode();
diff --git a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/resource/CommonManager.java b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/resource/CommonManager.java
index 6dc161c..5d36aa4 100644
--- a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/resource/CommonManager.java
+++ b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/resource/CommonManager.java
@@ -80,7 +80,7 @@ public class CommonManager {
FileUtil.unzip(filePath, tempDir);
LOGGER.info("File path=" + filePath);
- String directories[] = FileUtil.getDirectory(tempDir);
+ String[] directories = FileUtil.getDirectory(tempDir);
if(null != directories) {
filePath = tempDir + File.separator + directories[0];
}
diff --git a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/util/ZipCompressor.java b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/util/ZipCompressor.java
index 0ab292c..94773b3 100644
--- a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/util/ZipCompressor.java
+++ b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/util/ZipCompressor.java
@@ -92,7 +92,7 @@ public class ZipCompressor {
}
try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file))) {
- byte data[] = new byte[BUFFER];
+ byte[] data = new byte[BUFFER];
ZipEntry entry = new ZipEntry(basedir + file.getName());
out.putNextEntry(entry);
diff --git a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/FileUtilTest.java b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/FileUtilTest.java
index 14db973..c14d47e 100644
--- a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/FileUtilTest.java
+++ b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/FileUtilTest.java
@@ -34,6 +34,7 @@ public class FileUtilTest {
@Test
public void testCreateDirectory() {
+
assertTrue(FileUtil.createDirectory(createDirPath));
}
diff --git a/vnf-sdk-function-test/src/test/resources/59d1e651-df9f-4008-902f-e3b377e6ec30/output.xml b/vnf-sdk-function-test/src/test/resources/59d1e651-df9f-4008-902f-e3b377e6ec30/output.xml
index eaeb63e..b526a09 100644
--- a/vnf-sdk-function-test/src/test/resources/59d1e651-df9f-4008-902f-e3b377e6ec30/output.xml
+++ b/vnf-sdk-function-test/src/test/resources/59d1e651-df9f-4008-902f-e3b377e6ec30/output.xml
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2016 Huawei Technologies Co., Ltd. and others. All rights reserved.
+
+ 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.
+-->
<robot generated="20170208 17:49:26.030" generator="Robot 3.0 (Python 2.7.12 on linux2)">
<suite source="/home/root1/test/RobotScript/Sample.robot" id="s1" name="Sample">
<test id="s1-t1" name="Hello World">