Choose external network

catalogue/src/main/java/org/openbaton/catalogue/mano/common/AbstractVirtualLink.java

@@ -68,6 +68,16 @@ public abstract class AbstractVirtualLink extends BaseEntity {
 
   private String cidr;
 
+  private String poolName;
+
+  public String getPoolName() {
+    return poolName;
+  }
+
+  public void setPoolName(String poolName) {
+    this.poolName = poolName;
+  }
+
   public String getCidr() {
     return cidr;
   }
@@ -157,6 +167,9 @@ public String toString() {
         + ", cidr='"
         + cidr
         + '\''
+        + ", poolName='"
+        + poolName
+        + '\''
         + "} "
         + super.toString();
   }

catalogue/src/main/java/org/openbaton/catalogue/mano/descriptor/VirtualLinkDescriptor.java

@@ -44,9 +44,6 @@ public String toString() {
         + ", descriptor_version='"
         + descriptor_version
         + '\''
-        + ", poolName='"
-        + poolName
-        + '\''
         + ", number_of_endpoints="
         + number_of_endpoints
         + ", connection="
@@ -62,9 +59,6 @@ public String toString() {
   /** Version of this VLD */
   private String descriptor_version;
 
-  /** Public ip pool */
-  private String poolName;
-
   public List<String> getDns() {
     return dns;
   }
@@ -91,14 +85,6 @@ public void setDns(List<String> dns) {
 
   public VirtualLinkDescriptor() {}
 
-  public String getPoolName() {
-    return poolName;
-  }
-
-  public void setPoolName(String poolName) {
-    this.poolName = poolName;
-  }
-
   public String getName() {
     return name;
   }

catalogue/src/main/java/org/openbaton/catalogue/nfvo/networks/Subnet.java

@@ -30,6 +30,7 @@ public class Subnet extends BaseEntity {
   private String networkId;
   private String cidr;
   private String gatewayIp;
+  private String externalNetworkName;
 
   public Subnet() {}
 
@@ -84,6 +85,14 @@ public void setDns(List<String> dns) {
     this.dns = dns;
   }
 
+  public String getExternalNetworkName() {
+    return externalNetworkName;
+  }
+
+  public void setExternalNetworkName(String externalNetworkName) {
+    this.externalNetworkName = externalNetworkName;
+  }
+
   @Override
   public String toString() {
     return "Subnet{"
@@ -102,6 +111,9 @@ public String toString() {
         + ", gatewayIp='"
         + gatewayIp
         + '\''
+        + ", externalNetworkName='"
+        + externalNetworkName
+        + '\''
         + "} "
         + super.toString();
   }

common/src/main/java/org/openbaton/nfvo/common/utils/viminstance/VimInstanceUtils.java

@@ -3,6 +3,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 import org.apache.commons.net.util.SubnetUtils;
+import org.openbaton.catalogue.mano.common.AbstractVirtualLink;
 import org.openbaton.catalogue.mano.descriptor.InternalVirtualLink;
 import org.openbaton.catalogue.mano.descriptor.NetworkServiceDescriptor;
 import org.openbaton.catalogue.mano.descriptor.VNFDConnectionPoint;
@@ -126,6 +127,7 @@ public static void updateBaseNetworks(BaseNetwork networkOld, BaseNetwork networ
             subnetNfvo.setNetworkId(subnetNew.getNetworkId());
             subnetNfvo.setGatewayIp(subnetNew.getGatewayIp());
             subnetNfvo.setCidr(subnetNew.getCidr());
+            subnetNfvo.setExternalNetworkName(subnetNew.getExternalNetworkName());
             found_subnet = true;
             break;
           }
@@ -217,23 +219,26 @@ public static BaseNetwork createBaseNetwork(
       HashSet<Subnet> subnets = new HashSet<>();
       Subnet subnet = new Subnet();
       subnet.setName(String.format("%s_subnet", vnfdConnectionPoint.getVirtual_link_reference()));
-      subnet.setCidr(
-          getCidrFromVLName(
+      AbstractVirtualLink avl =
+          getVLFromVLName(
               vnfdConnectionPoint.getVirtual_link_reference(),
               networkServiceDescriptor,
-              virtualNetworkFunctionDescriptor));
+              virtualNetworkFunctionDescriptor);
+      subnet.setCidr(avl.getCidr());
+      subnet.setExternalNetworkName(avl.getPoolName());
       subnets.add(subnet);
       network.setSubnets(subnets);
       network.setName(vnfdConnectionPoint.getVirtual_link_reference());
       return network;
     } else if (vimInstance instanceof DockerVimInstance) {
       DockerNetwork networkdc = new DockerNetwork();
       networkdc.setName(vnfdConnectionPoint.getVirtual_link_reference());
-      networkdc.setSubnet(
-          getCidrFromVLName(
+      AbstractVirtualLink avl =
+          getVLFromVLName(
               vnfdConnectionPoint.getVirtual_link_reference(),
               networkServiceDescriptor,
-              virtualNetworkFunctionDescriptor));
+              virtualNetworkFunctionDescriptor);
+      networkdc.setSubnet(avl.getCidr());
       return networkdc;
     } else {
       BaseNetwork networkb = new BaseNetwork();
@@ -254,19 +259,22 @@ public static BaseNetwork createBaseNetwork(
       Subnet subnet = new Subnet();
       subnet.setName(String.format("%s_subnet", vlr.getName()));
       subnet.setDns(vlr.getDns());
-      subnet.setCidr(
-          getCidrFromVLName(
-              vlr.getName(), networkServiceDescriptor, virtualNetworkFunctionDescriptor));
+      AbstractVirtualLink avl =
+          getVLFromVLName(
+              vlr.getName(), networkServiceDescriptor, virtualNetworkFunctionDescriptor);
+      subnet.setCidr(avl.getCidr());
+      subnet.setExternalNetworkName(avl.getPoolName());
       subnets.add(subnet);
       network.setSubnets(subnets);
       network.setName(vlr.getName());
       return network;
     } else if (vimInstance instanceof DockerVimInstance) {
       DockerNetwork networkdc = new DockerNetwork();
       networkdc.setName(vlr.getName());
-      networkdc.setSubnet(
-          getCidrFromVLName(
-              vlr.getName(), networkServiceDescriptor, virtualNetworkFunctionDescriptor));
+      AbstractVirtualLink avl =
+          getVLFromVLName(
+              vlr.getName(), networkServiceDescriptor, virtualNetworkFunctionDescriptor);
+      networkdc.setSubnet(avl.getCidr());
       return networkdc;
     } else {
       BaseNetwork networkb = new BaseNetwork();
@@ -275,19 +283,20 @@ public static BaseNetwork createBaseNetwork(
     }
   }
 
-  private static String getCidrFromVLName(
+  private static AbstractVirtualLink getVLFromVLName(
       String virtual_link_reference,
       NetworkServiceDescriptor networkServiceDescriptor,
       VirtualNetworkFunctionDescriptor virtualNetworkFunctionDescriptor)
       throws BadRequestException {
+
     for (VirtualLinkDescriptor vld : networkServiceDescriptor.getVld()) {
       if (vld.getName().equals(virtual_link_reference)) {
-        return vld.getCidr();
+        return vld;
       }
     }
     for (InternalVirtualLink ivl : virtualNetworkFunctionDescriptor.getVirtual_link()) {
       if (ivl.getName().equals(virtual_link_reference)) {
-        return ivl.getCidr();
+        return ivl;
       }
     }
     throw new BadRequestException(

vim-impl/src/main/java/org/openbaton/vim_impl/vim/GenericVIM.java

@@ -588,16 +588,16 @@ public BaseNetwork add(BaseVimInstance vimInstance, BaseNetwork network) throws
           e);
     }
     if (network instanceof Network) {
-      Network osNetowork = (Network) network;
+      Network osNetwork = (Network) network;
       log.debug(
           "Creating Subnets for Network with name: "
               + network.getName()
               + " on VimInstance "
               + vimInstance.getName()
               + " -> Subnets: "
-              + osNetowork.getSubnets());
+              + osNetwork.getSubnets());
       Set<Subnet> createdSubnets = new HashSet<>();
-      for (Subnet subnet : osNetowork.getSubnets()) {
+      for (Subnet subnet : osNetwork.getSubnets()) {
         try {
           log.debug(
               "Creating Subnet with name: "
@@ -659,7 +659,7 @@ public BaseNetwork add(BaseVimInstance vimInstance, BaseNetwork network) throws
               + " on VimInstnace "
               + vimInstance.getName()
               + " -> Subnets: "
-              + osNetowork.getSubnets());
+              + osNetwork.getSubnets());
     }
     return createdNetwork;
   }