move method to utils class and make it static

openbaton · Jan 28, 2019 · a25d9f0 · a25d9f0
1 parent 9b3e2d9
commit a25d9f0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 44 deletions.
diff --git a/common/src/main/java/org/openbaton/nfvo/common/utils/viminstance/VimInstanceUtils.java b/common/src/main/java/org/openbaton/nfvo/common/utils/viminstance/VimInstanceUtils.java
@@ -57,6 +57,11 @@ public static void handlePrivateInfo(BaseVimInstance vim) {
     }
   }
 
+  public static String getVimNameWithoutAvailabilityZone(String vimName) {
+    if (vimName.contains(":")) return vimName.split(":")[0];
+    return vimName;
+  }
+
   public static void updatePrivateInfo(BaseVimInstance vimNew, BaseVimInstance vimOld) {
     if (vimNew
         .getClass()

diff --git a/core/core-impl/src/main/java/org/openbaton/nfvo/core/api/NetworkServiceRecordManagement.java b/core/core-impl/src/main/java/org/openbaton/nfvo/core/api/NetworkServiceRecordManagement.java
@@ -16,6 +16,8 @@
 
 package org.openbaton.nfvo.core.api;
 
+import static org.openbaton.nfvo.common.utils.viminstance.VimInstanceUtils.getVimNameWithoutAvailabilityZone;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -310,7 +312,7 @@ private NetworkServiceRecord scaleOutNsr(
         // vduVimInstances now contains all possible vim instance names for a specific vdu
         for (String vimInstanceName : instanceNames) {
 
-          String name = nsdUtils.getVimNameWithoutAvailabilityZone(vimInstanceName);
+          String name = getVimNameWithoutAvailabilityZone(vimInstanceName);
           BaseVimInstance vimInstance =
               vimInstanceRepository.findByProjectIdAndName(vdu.getProjectId(), name);
 
@@ -541,7 +543,7 @@ public void addVNFCInstance(
       List<String> finalVimInstanceNames = new ArrayList<>();
       vimInstanceNames.forEach(
           n -> {
-            finalVimInstanceNames.add(nsdUtils.getVimNameWithoutAvailabilityZone(n));
+            finalVimInstanceNames.add(getVimNameWithoutAvailabilityZone(n));
           });
       if (vimInstanceRepository
           .findByProjectId(projectId)
@@ -1220,7 +1222,7 @@ private NetworkServiceRecord deployNSR(
           // vduVimInstances now contains all possible vim instance names for a specific vdu
           for (String vimInstanceName : instanceNames) {
 
-            String name = nsdUtils.getVimNameWithoutAvailabilityZone(vimInstanceName);
+            String name = getVimNameWithoutAvailabilityZone(vimInstanceName);
             BaseVimInstance vimInstance =
                 vimInstanceRepository.findByProjectIdAndName(vdu.getProjectId(), name);
 
@@ -1593,9 +1595,7 @@ private Set<String> checkIfVimAreSupportedByPackage(
       for (BaseVimInstance vimInstance :
           vimInstanceRepository.findByProjectId(vnfd.getProjectId())) {
 
-        if (nsdUtils
-            .getVimNameWithoutAvailabilityZone(vimInstanceName)
-            .equals(vimInstance.getName())) {
+        if (getVimNameWithoutAvailabilityZone(vimInstanceName).equals(vimInstance.getName())) {
           log.debug("Found vim instance " + vimInstance.getName());
           log.debug(
               "Checking if "

diff --git a/core/core-impl/src/main/java/org/openbaton/nfvo/core/utils/NSDUtils.java b/core/core-impl/src/main/java/org/openbaton/nfvo/core/utils/NSDUtils.java
@@ -16,6 +16,8 @@
 
 package org.openbaton.nfvo.core.utils;
 
+import static org.openbaton.nfvo.common.utils.viminstance.VimInstanceUtils.getVimNameWithoutAvailabilityZone;
+
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -577,11 +579,6 @@ private BaseVimInstance checkIntegrityVimInstance(
     return vimInstance;
   }
 
-  public String getVimNameWithoutAvailabilityZone(String vimName) {
-    if (vimName.contains(":")) return vimName.split(":")[0];
-    return vimName;
-  }
-
   private void checkIntegrityVDU(VirtualNetworkFunctionDescriptor virtualNetworkFunctionDescriptor)
       throws NetworkServiceIntegrityException {
     int i = 1;
@@ -720,33 +717,6 @@ private boolean checkIntegrityCidr(
     return false;
   }
 
-  //                for (VNFComponent vnfComponent : virtualDeploymentUnit.getVnfc()) {
-  //                  for (VNFDConnectionPoint connectionPoint : vnfComponent.getConnection_point())
-  // {
-  //                    if (!internalVirtualLink.contains(
-  //                        connectionPoint.getVirtual_link_reference())) {
-  //                      throw new NetworkServiceIntegrityException(
-  //                          "Regarding the VirtualNetworkFunctionDescriptor "
-  //                              + virtualNetworkFunctionDescriptor.getName()
-  //                              + ": in one of the VirtualDeploymentUnit, the "
-  //                              + "virtualLinkReference "
-  //                              + connectionPoint.getVirtual_link_reference()
-  //                              + " of a VNFComponent is not contained in the "
-  //                              + "InternalVirtualLink "
-  //                              + internalVirtualLink);
-  //                    }
-  //                  }
-  //                }
-  //      if (!virtualLinkDescriptors.containsAll(internalVirtualLink)) {
-  //        throw new NetworkServiceIntegrityException(
-  //            "Regarding the VirtualNetworkFunctionDescriptor "
-  //                + virtualNetworkFunctionDescriptor.getName()
-  //                + ": the InternalVirtualLinks "
-  //                + internalVirtualLink
-  //                + " are not contained in the VirtualLinkDescriptors "
-  //                + virtualLinkDescriptors);
-  //      }
-
   private void checkIntegrityLifecycleEvents(
       VirtualNetworkFunctionDescriptor virtualNetworkFunctionDescriptor)
       throws NetworkServiceIntegrityException {

diff --git a/.../test/java/org/openbaton/nfvo/core/test/NetworkServiceRecordManagementClassSuiteTest.java b/.../test/java/org/openbaton/nfvo/core/test/NetworkServiceRecordManagementClassSuiteTest.java
@@ -277,8 +277,6 @@ public void nsrManagementOnboardTest1()
                 add(vnfmManagerEndpoint);
               }
             });
-    when(nsdUtils.getVimNameWithoutAvailabilityZone(anyString()))
-        .thenReturn(createVimInstance().getName());
     nsrManagement.onboard(nsd_exp, projectId, null, null, null, null);
   }
 
@@ -343,8 +341,6 @@ public void nsrManagementOnboardTest2()
                 add(createVimInstance());
               }
             });
-    when(nsdUtils.getVimNameWithoutAvailabilityZone(anyString()))
-        .thenReturn(createVimInstance().getName());
     /** Real Method */
     nsrManagement.onboard(networkServiceDescriptor.getId(), projectId, null, null, null, null);
   }
@@ -409,8 +405,6 @@ public void nsrManagementOnboardTest3()
                 add(vnfmManagerEndpoint);
               }
             });
-    when(nsdUtils.getVimNameWithoutAvailabilityZone(anyString()))
-        .thenReturn(createVimInstance().getName());
     nsrManagement.onboard(networkServiceDescriptor.getId(), projectId, null, null, null, null);
   }