From e8f5a9430b375fe8d62fb7498dbe61fb74043704 Mon Sep 17 00:00:00 2001 From: Murali-P Date: Thu, 16 Feb 2017 17:49:33 +0530 Subject: Update License Resolved:VNFSDK-21 VNF SDK Function test Change-Id: Ic1f9e91270170f18c40fdfdeae9b6c1479388c18 Signed-off-by: Murali-P --- distribution/pom.xml | 15 ++++++++++++++ distribution/standalone/pom.xml | 15 ++++++++++++++ .../src/main/assembly/find_kill_process.bat | 15 ++++++++++++++ distribution/standalone/src/main/assembly/run.bat | 17 ++++++++++++++- distribution/standalone/src/main/assembly/run.sh | 16 +++++++++++++++ distribution/standalone/src/main/assembly/stop.bat | 15 ++++++++++++++ distribution/standalone/src/main/assembly/stop.sh | 15 ++++++++++++++ pom.xml | 15 ++++++++++++++ vnf-sdk-function-test/pom.xml | 15 ++++++++++++++ .../externalservice/entity/ServiceNode.java | 12 ++++++----- .../entity/ServiceRegisterEntity.java | 24 ++++++++++++---------- .../vnfsdk/functest/resource/CommonManager.java | 2 +- .../openo/vnfsdk/functest/util/ZipCompressor.java | 2 +- .../org/openo/vnfsdk/functests/FileUtilTest.java | 1 + .../output.xml | 15 ++++++++++++++ 15 files changed, 175 insertions(+), 19 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 09361ae..535f3e3 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -1,4 +1,19 @@ + org.openo.vnf-sdk.function-test diff --git a/distribution/standalone/pom.xml b/distribution/standalone/pom.xml index 12c0432..c5e1fa4 100644 --- a/distribution/standalone/pom.xml +++ b/distribution/standalone/pom.xml @@ -1,4 +1,19 @@ + org.openo.vnf-sdk.function-test diff --git a/distribution/standalone/src/main/assembly/find_kill_process.bat b/distribution/standalone/src/main/assembly/find_kill_process.bat index 4a4baaf..f64eb62 100644 --- a/distribution/standalone/src/main/assembly/find_kill_process.bat +++ b/distribution/standalone/src/main/assembly/find_kill_process.bat @@ -1,3 +1,18 @@ +::============================================================================== +:: Copyright 2017 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. +::============================================================================== echo %1 | findstr %2 >NUL echo ERRORLEVEL=%ERRORLEVEL% diff --git a/distribution/standalone/src/main/assembly/run.bat b/distribution/standalone/src/main/assembly/run.bat index 3ce5172..1fda07c 100644 --- a/distribution/standalone/src/main/assembly/run.bat +++ b/distribution/standalone/src/main/assembly/run.bat @@ -1,4 +1,19 @@ - +::============================================================================== +:: Copyright 2017 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. +::============================================================================== + @echo off title vnfsdk-functest diff --git a/distribution/standalone/src/main/assembly/run.sh b/distribution/standalone/src/main/assembly/run.sh index 021a843..f8e294a 100644 --- a/distribution/standalone/src/main/assembly/run.sh +++ b/distribution/standalone/src/main/assembly/run.sh @@ -1,3 +1,19 @@ +< + diff --git a/vnf-sdk-function-test/pom.xml b/vnf-sdk-function-test/pom.xml index a42e36b..a1aa46e 100644 --- a/vnf-sdk-function-test/pom.xml +++ b/vnf-sdk-function-test/pom.xml @@ -1,4 +1,19 @@ + 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 nodes = new ArrayList(); 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 nodes = new ArrayList(); + 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 @@ + -- cgit 1.2.3-korg