diff options
author | Ashlee Young <ashlee@onosfw.com> | 2015-10-09 18:32:44 -0700 |
---|---|---|
committer | Ashlee Young <ashlee@onosfw.com> | 2015-10-09 18:32:44 -0700 |
commit | 6a07d2d622eaa06953f3353e39c080984076e8de (patch) | |
tree | bfb50a2090fce186c2cc545a400c969bf2ea702b /framework/src/onos/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkAdminService.java | |
parent | e6d71622143ff9b2421a1abbe8434b954b5b1099 (diff) |
Updated master to commit id 6ee8aa3e67ce89908a8c93aa9445c6f71a18f986
Change-Id: I94b055ee2f298daf71e2ec794fd0f2495bd8081f
Diffstat (limited to 'framework/src/onos/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkAdminService.java')
-rw-r--r-- | framework/src/onos/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkAdminService.java | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/framework/src/onos/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkAdminService.java b/framework/src/onos/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkAdminService.java index 1e3648b5..07c399c0 100644 --- a/framework/src/onos/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkAdminService.java +++ b/framework/src/onos/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkAdminService.java @@ -16,14 +16,11 @@ package org.onosproject.incubator.net.virtual; import com.google.common.annotations.Beta; -import org.onosproject.incubator.net.tunnel.Tunnel; +import org.onosproject.incubator.net.tunnel.TunnelId; import org.onosproject.net.ConnectPoint; import org.onosproject.net.DeviceId; import org.onosproject.net.Port; import org.onosproject.net.PortNumber; -import org.onosproject.net.device.DeviceDescription; -import org.onosproject.net.device.PortDescription; -import org.onosproject.net.link.LinkDescription; import java.util.Set; @@ -76,12 +73,12 @@ public interface VirtualNetworkAdminService extends VirtualNetworkService { * Creates a new virtual device within the specified network. The device id * must be unique within the bounds of the network. * - * @param networkId network identifier - * @param description device description + * @param networkId network identifier + * @param deviceId device identifier * @return newly created device * @throws org.onlab.util.ItemNotFoundException if no such network found */ - VirtualDevice createVirtualDevice(NetworkId networkId, DeviceDescription description); + VirtualDevice createVirtualDevice(NetworkId networkId, DeviceId deviceId); /** * Removes the specified virtual device and all its ports and affiliated links. @@ -96,14 +93,16 @@ public interface VirtualNetworkAdminService extends VirtualNetworkService { /** * Creates a new virtual link within the specified network. * - * @param networkId network identifier - * @param description link description - * @param realizedBy tunnel using which this link is realized + * @param networkId network identifier + * @param src source connection point + * @param dst destination connection point + * @param realizedBy identifier of the tunnel using which this link is realized * @return newly created virtual link * @throws org.onlab.util.ItemNotFoundException if no such network found */ - VirtualLink createVirtualLink(NetworkId networkId, LinkDescription description, - Tunnel realizedBy); + VirtualLink createVirtualLink(NetworkId networkId, + ConnectPoint src, ConnectPoint dst, + TunnelId realizedBy); // TODO: Discuss whether we should provide an alternate createVirtualLink // which is backed by a Path instead; I'm leaning towards not doing that. @@ -119,20 +118,17 @@ public interface VirtualNetworkAdminService extends VirtualNetworkService { void removeVirtualLink(NetworkId networkId, ConnectPoint src, ConnectPoint dst); /** - * Creates a new virtual port on the specified device. Note that the port - * description can only request the resources which the underlying port - * port is capable of providing. It is, however, permissible to request - * only portion of those resources. + * Creates a new virtual port on the specified device. * - * @param networkId network identifier - * @param deviceId device identifier - * @param description port description - * @param realizedBy underlying port using which this virtual port is realized + * @param networkId network identifier + * @param deviceId device identifier + * @param portNumber port number + * @param realizedBy underlying port using which this virtual port is realized * @return newly created port * @throws org.onlab.util.ItemNotFoundException if no such network or device found */ VirtualPort createVirtualPort(NetworkId networkId, DeviceId deviceId, - PortDescription description, Port realizedBy); + PortNumber portNumber, Port realizedBy); /** * Removes the specified virtual port. |