diff --git a/src/main/java/org/openbaton/integration/test/IntegrationTestManager.java b/src/main/java/org/openbaton/integration/test/IntegrationTestManager.java index 923003a2..27544118 100644 --- a/src/main/java/org/openbaton/integration/test/IntegrationTestManager.java +++ b/src/main/java/org/openbaton/integration/test/IntegrationTestManager.java @@ -15,6 +15,10 @@ */ package org.openbaton.integration.test; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.net.URL; +import java.util.Properties; import org.ini4j.Ini; import org.ini4j.Profile; import org.openbaton.integration.test.utils.SubTask; @@ -22,14 +26,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.net.URL; -import java.util.Properties; - /** * Created by mob on 18.08.15. + * *

+ * *

This class loads the test scenario from an .ini file. */ public class IntegrationTestManager { @@ -106,7 +107,11 @@ private SubTask loadInstance(Properties properties, Profile.Section currentChild String classNamePath = classPath + "." + nameClass; Class currentClass = MainIntegrationTest.class.getClassLoader().loadClass(classNamePath); instance = (SubTask) currentClass.getConstructor(Properties.class).newInstance(properties); - } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { + } catch (ClassNotFoundException + | InstantiationException + | IllegalAccessException + | NoSuchMethodException + | InvocationTargetException e) { log("Problem during class loading: " + e.getMessage(), "error"); } return instance; diff --git a/src/main/java/org/openbaton/integration/test/MainIntegrationTest.java b/src/main/java/org/openbaton/integration/test/MainIntegrationTest.java index d7e4aaca..f819d5aa 100644 --- a/src/main/java/org/openbaton/integration/test/MainIntegrationTest.java +++ b/src/main/java/org/openbaton/integration/test/MainIntegrationTest.java @@ -19,7 +19,6 @@ import java.net.URL; import java.util.*; import java.util.concurrent.TimeUnit; - import org.openbaton.catalogue.mano.descriptor.NetworkServiceDescriptor; import org.openbaton.catalogue.mano.descriptor.VirtualNetworkFunctionDescriptor; import org.openbaton.catalogue.mano.record.NetworkServiceRecord; @@ -61,8 +60,7 @@ public class MainIntegrationTest { * @return The {@code Properties} object filled * @throws IOException In case of IOException while opening the properties file */ - private static Properties loadProperties() - throws IOException { + private static Properties loadProperties() throws IOException { String propertiesFile; // Checking whether external properties file exists @@ -240,7 +238,7 @@ public static void main(String[] args) throws Exception { String name = splittedUrl[splittedUrl.length - 1]; if (clArgs.size() > 0 && !clArgs.contains( - name)) // if test names are passed through the command line, only these will be executed + name)) // if test names are passed through the command line, only these will be executed { continue; } @@ -254,10 +252,10 @@ public static void main(String[] args) throws Exception { + name + " finished correctly :) in " + String.format( - "%d min, %d sec", - TimeUnit.MILLISECONDS.toMinutes(stopTime), - TimeUnit.MILLISECONDS.toSeconds(stopTime) - - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(stopTime))) + "%d min, %d sec", + TimeUnit.MILLISECONDS.toMinutes(stopTime), + TimeUnit.MILLISECONDS.toSeconds(stopTime) + - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(stopTime))) + "\n"); results.put(name, "SUCCESS"); } else { diff --git a/src/main/java/org/openbaton/integration/test/testers/NetworkServiceRecordDelete.java b/src/main/java/org/openbaton/integration/test/testers/NetworkServiceRecordDelete.java index 9537888f..7f59449b 100644 --- a/src/main/java/org/openbaton/integration/test/testers/NetworkServiceRecordDelete.java +++ b/src/main/java/org/openbaton/integration/test/testers/NetworkServiceRecordDelete.java @@ -15,7 +15,6 @@ */ package org.openbaton.integration.test.testers; -import java.io.FileNotFoundException; import java.util.Properties; import org.ini4j.Profile; import org.openbaton.catalogue.mano.record.NetworkServiceRecord; diff --git a/src/main/java/org/openbaton/integration/test/testers/ScaleOut.java b/src/main/java/org/openbaton/integration/test/testers/ScaleOut.java index 8409b943..0fc47b0f 100644 --- a/src/main/java/org/openbaton/integration/test/testers/ScaleOut.java +++ b/src/main/java/org/openbaton/integration/test/testers/ScaleOut.java @@ -98,8 +98,7 @@ private VNFComponent createVNFComponent() { VNFDConnectionPoint vnfdConnectionPoint = new VNFDConnectionPoint(); if (virtualLink.equals("")) log.warn("Virtual link is empty"); vnfdConnectionPoint.setVirtual_link_reference(virtualLink); - if(floatingIp!=null) - vnfdConnectionPoint.setFloatingIp(floatingIp); + if (floatingIp != null) vnfdConnectionPoint.setFloatingIp(floatingIp); vnfdConnectionPointSet.add(vnfdConnectionPoint); vnfc.setConnection_point(vnfdConnectionPointSet); return vnfc; diff --git a/src/main/java/org/openbaton/integration/test/utils/Utils.java b/src/main/java/org/openbaton/integration/test/utils/Utils.java index 16c440f4..aa4bc683 100755 --- a/src/main/java/org/openbaton/integration/test/utils/Utils.java +++ b/src/main/java/org/openbaton/integration/test/utils/Utils.java @@ -21,7 +21,6 @@ import java.net.Socket; import java.net.URL; import java.util.*; -import org.openbaton.catalogue.security.Project; import org.openbaton.catalogue.security.User; import org.openbaton.sdk.NFVORequestor; import org.openbaton.sdk.api.exception.SDKException; @@ -107,8 +106,7 @@ public static LinkedList getURLFileList(String location) { log.trace("Found dir " + dir.getName()); log.trace("Found dir " + dir.getAbsolutePath()); - File[] iniFiles = - dir.listFiles((dir1, name) -> name.endsWith(".ini")); + File[] iniFiles = dir.listFiles((dir1, name) -> name.endsWith(".ini")); LinkedList urls = new LinkedList<>(); if (iniFiles == null) return urls; for (File f : iniFiles) { @@ -154,6 +152,10 @@ public static List getFileNames(List iniFileURLs) { } public static boolean checkFileExists(String filename) { + if (filename == null) { + log.warn("Given filename is null."); + return false; + } File f = new File(filename); if (f.exists()) { log.debug("File or folder " + filename + " exists"); @@ -163,18 +165,33 @@ public static boolean checkFileExists(String filename) { return false; } - public static String getProjectIdByName(NFVORequestor requestor, String projectName) throws SDKException { - return requestor.getProjectAgent().findAll().stream().filter(p -> p.getName().equals(projectName)).findFirst().orElseThrow(() -> new SDKException("Did not find a project named " + projectName)).getId(); + public static String getProjectIdByName(NFVORequestor requestor, String projectName) + throws SDKException { + return requestor + .getProjectAgent() + .findAll() + .stream() + .filter(p -> p.getName().equals(projectName)) + .findFirst() + .orElseThrow(() -> new SDKException("Did not find a project named " + projectName)) + .getId(); } - public static String getUserIdByName(NFVORequestor requestor, String userName) throws SDKException { + public static String getUserIdByName(NFVORequestor requestor, String userName) + throws SDKException { User u = getUserByName(requestor, userName); if (u == null) return ""; else return u.getId(); } public static User getUserByName(NFVORequestor requestor, String userName) throws SDKException { - return requestor.getUserAgent().findAll().stream().filter(u -> u.getUsername().equals(userName)).findFirst().orElseThrow(() -> new SDKException("Did not find a user named " + userName)); + return requestor + .getUserAgent() + .findAll() + .stream() + .filter(u -> u.getUsername().equals(userName)) + .findFirst() + .orElseThrow(() -> new SDKException("Did not find a user named " + userName)); } public static TextTable getResultsTable(String[] columns, Map content) { diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-dummy-requires-provides.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-dummy-requires-provides.json index 64df2d9b..a459aa96 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-dummy-requires-provides.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-dummy-requires-provides.json @@ -42,8 +42,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ @@ -98,8 +97,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-dummy.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-dummy.json index cab7ed6b..878b5c3b 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-dummy.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-dummy.json @@ -42,8 +42,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ @@ -98,8 +97,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-real.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-real.json index 9d2dd9fb..3add705e 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-real.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-iperf-real.json @@ -43,8 +43,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ @@ -112,8 +111,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-ncat-complex.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-ncat-complex.json index 0189c5fc..a556e20c 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-ncat-complex.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-ncat-complex.json @@ -51,9 +51,6 @@ } ] } - ], - "vimInstanceName": [ - "vim-instance" ] } ], @@ -118,9 +115,6 @@ } ] } - ], - "vimInstanceName": [ - "vim-instance" ] } ], @@ -191,9 +185,6 @@ } ] } - ], - "vimInstanceName": [ - "vim-instance" ] } ], @@ -262,9 +253,6 @@ } ] } - ], - "vimInstanceName": [ - "vim-instance" ] } ], @@ -337,9 +325,6 @@ } ] } - ], - "vimInstanceName": [ - "vim-instance" ] } ], diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-ncat-scaling.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-ncat-scaling.json index 102e1f82..31521ba6 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-ncat-scaling.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-ncat-scaling.json @@ -49,8 +49,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ @@ -111,8 +110,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-sipp-real-fms-heal.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-sipp-real-fms-heal.json index e93f2df1..5384bb56 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-sipp-real-fms-heal.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-sipp-real-fms-heal.json @@ -48,8 +48,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "configurations": { @@ -150,7 +149,6 @@ ] } ], - "vimInstanceName":["vim-instance"], "monitoring_parameter":[ "net.udp.listen[5060]" ], diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-with-many-dependencies.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-with-many-dependencies.json index 07061012..e8c3fe6e 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-with-many-dependencies.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-with-many-dependencies.json @@ -14,7 +14,6 @@ "vm_image":[ "ubuntu-14.04-server-cloudimg-amd64-disk1" ], - "vimInstanceName":["vim-instance"], "scale_in_out":3, "vnfc":[ { @@ -79,7 +78,6 @@ ], "lifecycle_event":[ ], - "vimInstanceName":["vim-instance"], "scale_in_out":3, "vnfc":[ { @@ -145,7 +143,6 @@ "vm_image":[ "ubuntu-14.04-server-cloudimg-amd64-disk1" ], - "vimInstanceName":["vim-instance"], "scale_in_out":3, "vnfc":[ { @@ -206,7 +203,6 @@ "vm_image":[ "ubuntu-14.04-server-cloudimg-amd64-disk1" ], - "vimInstanceName":["vim-instance"], "scale_in_out":3, "vnfc":[ { @@ -270,7 +266,6 @@ "vm_image":[ "ubuntu-14.04-server-cloudimg-amd64-disk1" ], - "vimInstanceName":["vim-instance"], "scale_in_out":3, "vnfc":[ { @@ -332,7 +327,6 @@ "vm_image":[ "ubuntu-14.04-server-cloudimg-amd64-disk1" ], - "vimInstanceName":["vim-instance"], "scale_in_out":3, "vnfc":[ { @@ -396,7 +390,6 @@ "vm_image":[ "ubuntu-14.04-server-cloudimg-amd64-disk1" ], - "vimInstanceName":["vim-instance"], "scale_in_out":1, "vnfc":[ { @@ -459,7 +452,6 @@ "vm_image":[ "ubuntu-14.04-server-cloudimg-amd64-disk1" ], - "vimInstanceName":["vim-instance"], "scale_in_out":3, "vnfc":[ { @@ -525,7 +517,6 @@ "vm_image":[ "ubuntu-14.04-server-cloudimg-amd64-disk1" ], - "vimInstanceName":["vim-instance"], "scale_in_out":3, "vnfc":[ { @@ -591,7 +582,6 @@ "vm_image":[ "ubuntu-14.04-server-cloudimg-amd64-disk1" ], - "vimInstanceName":["vim-instance"], "scale_in_out":6, "vnfc":[ { @@ -654,7 +644,6 @@ "vm_image":[ "ubuntu-14.04-server-cloudimg-amd64-disk1" ], - "vimInstanceName":["vim-instance"], "scale_in_out":1, "vnfc":[ { diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-wrong-lifecycle-name.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-wrong-lifecycle-name.json index 1ed507c0..97655537 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-wrong-lifecycle-name.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor-wrong-lifecycle-name.json @@ -49,8 +49,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_configure.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_configure.json index c3e794ef..d1dc7059 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_configure.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_configure.json @@ -44,8 +44,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ @@ -114,8 +113,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_instantiate.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_instantiate.json index a7d53240..ed8e10e1 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_instantiate.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_instantiate.json @@ -44,8 +44,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ @@ -115,8 +114,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ diff --git a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_start.json b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_start.json index 0c7549b0..2cdcead5 100644 --- a/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_start.json +++ b/src/main/resources/network-service-descriptors/NetworkServiceDescriptor_fail_in_start.json @@ -44,8 +44,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[ @@ -120,8 +119,7 @@ } ] } - ], - "vimInstanceName":["vim-instance"] + ] } ], "virtual_link":[