[ONOS-5686] Re-naming and re-constructing virtual network classes
Changes.
1. Named *Service classes in the impementation package re-named as
*Manager
2. VirtualTopologyProvider is renamed as DefaultVirtualNetworkProvider
Change-Id: Ic8663aee793d0b8f87ffea3df7f71c8ac77362ca
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceService.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManager.java
similarity index 86%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceService.java
rename to incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManager.java
index c466502..81bf123 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceService.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManager.java
@@ -22,6 +22,7 @@
import org.onosproject.incubator.net.virtual.VirtualNetwork;
import org.onosproject.incubator.net.virtual.VirtualNetworkService;
import org.onosproject.incubator.net.virtual.VirtualPort;
+import org.onosproject.incubator.net.virtual.VnetService;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.MastershipRole;
@@ -41,7 +42,8 @@
/**
* Device service implementation built on the virtual network service.
*/
-public class VirtualNetworkDeviceService extends AbstractListenerManager<DeviceEvent, DeviceListener>
+public class VirtualNetworkDeviceManager
+ extends AbstractListenerManager<DeviceEvent, DeviceListener>
implements DeviceService, VnetService {
private static final String NETWORK_NULL = "Network ID cannot be null";
@@ -58,7 +60,8 @@
* @param virtualNetworkManager virtual network manager service
* @param network virtual network
*/
- public VirtualNetworkDeviceService(VirtualNetworkService virtualNetworkManager, VirtualNetwork network) {
+ public VirtualNetworkDeviceManager(VirtualNetworkService virtualNetworkManager,
+ VirtualNetwork network) {
checkNotNull(network, NETWORK_NULL);
this.network = network;
this.manager = virtualNetworkManager;
@@ -71,7 +74,8 @@
@Override
public Iterable<Device> getDevices() {
- return manager.getVirtualDevices(this.network.id()).stream().collect(Collectors.toSet());
+ return manager.getVirtualDevices(
+ this.network.id()).stream().collect(Collectors.toSet());
}
@Override
@@ -96,7 +100,8 @@
@Override
public Device getDevice(DeviceId deviceId) {
checkNotNull(deviceId, DEVICE_NULL);
- Optional<VirtualDevice> foundDevice = manager.getVirtualDevices(this.network.id())
+ Optional<VirtualDevice> foundDevice =
+ manager.getVirtualDevices(this.network.id())
.stream()
.filter(device -> deviceId.equals(device.id()))
.findFirst();
@@ -136,7 +141,8 @@
}
@Override
- public PortStatistics getStatisticsForPort(DeviceId deviceId, PortNumber portNumber) {
+ public PortStatistics getStatisticsForPort(DeviceId deviceId,
+ PortNumber portNumber) {
checkNotNull(deviceId, DEVICE_NULL);
checkNotNull(deviceId, PORT_NUMBER_NULL);
// TODO not supported at the moment.
@@ -144,7 +150,8 @@
}
@Override
- public PortStatistics getDeltaStatisticsForPort(DeviceId deviceId, PortNumber portNumber) {
+ public PortStatistics getDeltaStatisticsForPort(DeviceId deviceId,
+ PortNumber portNumber) {
checkNotNull(deviceId, DEVICE_NULL);
checkNotNull(deviceId, PORT_NUMBER_NULL);
// TODO not supported at the moment.
@@ -155,7 +162,8 @@
public Port getPort(DeviceId deviceId, PortNumber portNumber) {
checkNotNull(deviceId, DEVICE_NULL);
- Optional<VirtualPort> foundPort = manager.getVirtualPorts(this.network.id(), deviceId)
+ Optional<VirtualPort> foundPort =
+ manager.getVirtualPorts(this.network.id(), deviceId)
.stream()
.filter(port -> port.number().equals(portNumber))
.findFirst();
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkHostService.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkHostManager.java
similarity index 90%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkHostService.java
rename to incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkHostManager.java
index 6642c5a..92c165f7 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkHostService.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkHostManager.java
@@ -23,6 +23,7 @@
import org.onosproject.incubator.net.virtual.VirtualHost;
import org.onosproject.incubator.net.virtual.VirtualNetwork;
import org.onosproject.incubator.net.virtual.VirtualNetworkService;
+import org.onosproject.incubator.net.virtual.VnetService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Host;
@@ -43,7 +44,8 @@
/**
* Host service implementation built on the virtual network service.
*/
-public class VirtualNetworkHostService extends AbstractListenerManager<HostEvent, HostListener>
+public class VirtualNetworkHostManager
+ extends AbstractListenerManager<HostEvent, HostListener>
implements HostService, VnetService {
private static final String NETWORK_NULL = "Network ID cannot be null";
@@ -58,7 +60,8 @@
* @param virtualNetworkManager virtual network manager service
* @param network virtual network
*/
- public VirtualNetworkHostService(VirtualNetworkService virtualNetworkManager, VirtualNetwork network) {
+ public VirtualNetworkHostManager(VirtualNetworkService virtualNetworkManager,
+ VirtualNetwork network) {
checkNotNull(network, NETWORK_NULL);
this.network = network;
this.manager = virtualNetworkManager;
@@ -78,7 +81,8 @@
@Override
public Host getHost(HostId hostId) {
checkNotNull(hostId, HOST_NULL);
- Optional<VirtualHost> foundHost = manager.getVirtualHosts(this.network.id())
+ Optional<VirtualHost> foundHost =
+ manager.getVirtualHosts(this.network.id())
.stream()
.filter(host -> hostId.equals(host.id()))
.findFirst();
@@ -94,7 +98,8 @@
* @return collection of virtual hosts.
*/
private Collection<Host> getHostsColl() {
- return manager.getVirtualHosts(this.network.id()).stream().collect(Collectors.toSet());
+ return manager.getVirtualHosts(this.network.id())
+ .stream().collect(Collectors.toSet());
}
/**
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkIntentService.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkIntentManager.java
similarity index 96%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkIntentService.java
rename to incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkIntentManager.java
index dc75b04..7b00e1d 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkIntentService.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkIntentManager.java
@@ -24,6 +24,7 @@
import org.onosproject.incubator.net.virtual.VirtualNetworkService;
import org.onosproject.incubator.net.virtual.VirtualNetworkStore;
import org.onosproject.incubator.net.virtual.VirtualPort;
+import org.onosproject.incubator.net.virtual.VnetService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Port;
@@ -48,7 +49,8 @@
/**
* Intent service implementation built on the virtual network service.
*/
-public class VirtualNetworkIntentService extends AbstractListenerManager<IntentEvent, IntentListener>
+public class VirtualNetworkIntentManager
+ extends AbstractListenerManager<IntentEvent, IntentListener>
implements IntentService, VnetService {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -76,7 +78,8 @@
* @param network virtual network
* @param serviceDirectory service directory
*/
- public VirtualNetworkIntentService(VirtualNetworkService virtualNetworkManager, VirtualNetwork network,
+ public VirtualNetworkIntentManager(VirtualNetworkService virtualNetworkManager,
+ VirtualNetwork network,
ServiceDirectory serviceDirectory) {
checkNotNull(network, NETWORK_NULL);
this.network = network;
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkLinkService.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkLinkManager.java
similarity index 92%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkLinkService.java
rename to incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkLinkManager.java
index 7af0267..b89a06f 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkLinkService.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkLinkManager.java
@@ -20,6 +20,7 @@
import org.onosproject.incubator.net.virtual.VirtualLink;
import org.onosproject.incubator.net.virtual.VirtualNetwork;
import org.onosproject.incubator.net.virtual.VirtualNetworkService;
+import org.onosproject.incubator.net.virtual.VnetService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link;
@@ -36,7 +37,8 @@
/**
* Link service implementation built on the virtual network service.
*/
-public class VirtualNetworkLinkService extends AbstractListenerManager<LinkEvent, LinkListener>
+public class VirtualNetworkLinkManager
+ extends AbstractListenerManager<LinkEvent, LinkListener>
implements LinkService, VnetService {
private static final String NETWORK_NULL = "Network ID cannot be null";
@@ -52,7 +54,8 @@
* @param virtualNetworkManager virtual network manager service
* @param network virtual network
*/
- public VirtualNetworkLinkService(VirtualNetworkService virtualNetworkManager, VirtualNetwork network) {
+ public VirtualNetworkLinkManager(VirtualNetworkService virtualNetworkManager,
+ VirtualNetwork network) {
checkNotNull(network, NETWORK_NULL);
this.network = network;
this.manager = virtualNetworkManager;
@@ -70,7 +73,8 @@
@Override
public Iterable<Link> getLinks() {
- return manager.getVirtualLinks(this.network.id()).stream().collect(Collectors.toSet());
+ return manager.getVirtualLinks(this.network.id())
+ .stream().collect(Collectors.toSet());
}
@Override
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManager.java
index b75c2d5..8ef2b52 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManager.java
@@ -45,6 +45,7 @@
import org.onosproject.incubator.net.virtual.VirtualNetworkStore;
import org.onosproject.incubator.net.virtual.VirtualNetworkStoreDelegate;
import org.onosproject.incubator.net.virtual.VirtualPort;
+import org.onosproject.incubator.net.virtual.VnetService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.HostId;
@@ -76,9 +77,10 @@
@Component(immediate = true)
@Service
public class VirtualNetworkManager
- extends AbstractListenerProviderRegistry<VirtualNetworkEvent, VirtualNetworkListener,
- VirtualNetworkProvider, VirtualNetworkProviderService>
- implements VirtualNetworkService, VirtualNetworkAdminService, VirtualNetworkProviderRegistry {
+ extends AbstractListenerProviderRegistry<VirtualNetworkEvent,
+ VirtualNetworkListener, VirtualNetworkProvider, VirtualNetworkProviderService>
+ implements VirtualNetworkService, VirtualNetworkAdminService,
+ VirtualNetworkProviderRegistry {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -93,7 +95,8 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected IntentService intentService;
- private final InternalVirtualIntentListener intentListener = new InternalVirtualIntentListener();
+ private final InternalVirtualIntentListener intentListener =
+ new InternalVirtualIntentListener();
private VirtualNetworkStoreDelegate delegate = this::post;
@@ -178,8 +181,9 @@
}
@Override
- public VirtualHost createVirtualHost(NetworkId networkId, HostId hostId, MacAddress mac,
- VlanId vlan, HostLocation location, Set<IpAddress> ips) {
+ public VirtualHost createVirtualHost(NetworkId networkId, HostId hostId,
+ MacAddress mac, VlanId vlan,
+ HostLocation location, Set<IpAddress> ips) {
checkNotNull(networkId, NETWORK_NULL);
checkNotNull(hostId, DEVICE_NULL);
return store.addHost(networkId, hostId, mac, vlan, location, ips);
@@ -251,7 +255,8 @@
}
@Override
- public void removeVirtualLink(NetworkId networkId, ConnectPoint src, ConnectPoint dst) {
+ public void removeVirtualLink(NetworkId networkId, ConnectPoint src,
+ ConnectPoint dst) {
checkNotNull(networkId, NETWORK_NULL);
checkNotNull(src, LINK_POINT_NULL);
checkNotNull(dst, LINK_POINT_NULL);
@@ -279,7 +284,8 @@
}
@Override
- public void removeVirtualPort(NetworkId networkId, DeviceId deviceId, PortNumber portNumber) {
+ public void removeVirtualPort(NetworkId networkId, DeviceId deviceId,
+ PortNumber portNumber) {
checkNotNull(networkId, NETWORK_NULL);
checkNotNull(deviceId, DEVICE_NULL);
checkNotNull(portNumber, "Port number cannot be null");
@@ -374,17 +380,18 @@
checkNotNull(network, NETWORK_NULL);
VnetService service;
if (serviceKey.serviceClass.equals(DeviceService.class)) {
- service = new VirtualNetworkDeviceService(this, network);
+ service = new VirtualNetworkDeviceManager(this, network);
} else if (serviceKey.serviceClass.equals(LinkService.class)) {
- service = new VirtualNetworkLinkService(this, network);
+ service = new VirtualNetworkLinkManager(this, network);
} else if (serviceKey.serviceClass.equals(TopologyService.class)) {
- service = new VirtualNetworkTopologyService(this, network);
+ service = new VirtualNetworkTopologyManager(this, network);
} else if (serviceKey.serviceClass.equals(IntentService.class)) {
- service = new VirtualNetworkIntentService(this, network, new DefaultServiceDirectory());
+ service = new VirtualNetworkIntentManager(
+ this, network, new DefaultServiceDirectory());
} else if (serviceKey.serviceClass.equals(HostService.class)) {
- service = new VirtualNetworkHostService(this, network);
+ service = new VirtualNetworkHostManager(this, network);
} else if (serviceKey.serviceClass.equals(PathService.class)) {
- service = new VirtualNetworkPathService(this, network);
+ service = new VirtualNetworkPathManager(this, network);
} else {
return null;
}
@@ -406,6 +413,7 @@
* @param serviceClass service class
*/
public ServiceKey(NetworkId networkId, Class serviceClass) {
+
checkNotNull(networkId, NETWORK_NULL);
this.networkId = networkId;
this.serviceClass = serviceClass;
@@ -434,6 +442,7 @@
* Internal intent event listener.
*/
private class InternalVirtualIntentListener implements IntentListener {
+
@Override
public void event(IntentEvent event) {
@@ -481,7 +490,8 @@
@Override
- protected VirtualNetworkProviderService createProviderService(VirtualNetworkProvider provider) {
+ protected VirtualNetworkProviderService
+ createProviderService(VirtualNetworkProvider provider) {
return new InternalVirtualNetworkProviderService(provider);
}
@@ -502,7 +512,6 @@
@Override
public void topologyChanged(Set<Set<ConnectPoint>> clusters) {
-
Set<TenantId> tenantIds = getTenantIds();
tenantIds.forEach(tenantId -> {
Set<VirtualNetwork> virtualNetworks = getVirtualNetworks(tenantId);
@@ -511,10 +520,13 @@
Set<VirtualLink> virtualLinks = getVirtualLinks(virtualNetwork.id());
virtualLinks.forEach(virtualLink -> {
- if (isVirtualLinkInCluster(virtualNetwork.id(), virtualLink, clusters)) {
- store.updateLink(virtualLink, virtualLink.tunnelId(), Link.State.ACTIVE);
+ if (isVirtualLinkInCluster(virtualNetwork.id(),
+ virtualLink, clusters)) {
+ store.updateLink(virtualLink, virtualLink.tunnelId(),
+ Link.State.ACTIVE);
} else {
- store.updateLink(virtualLink, virtualLink.tunnelId(), Link.State.INACTIVE);
+ store.updateLink(virtualLink, virtualLink.tunnelId(),
+ Link.State.INACTIVE);
}
});
});
@@ -522,7 +534,8 @@
}
/**
- * Determines if the virtual link (both source and destination connect point) is in a cluster.
+ * Determines if the virtual link (both source and destination connect point)
+ * is in a cluster.
*
* @param networkId virtual network identifier
* @param virtualLink virtual link
@@ -531,8 +544,10 @@
*/
private boolean isVirtualLinkInCluster(NetworkId networkId, VirtualLink virtualLink,
Set<Set<ConnectPoint>> clusters) {
- ConnectPoint srcPhysicalCp = mapVirtualToPhysicalPort(networkId, virtualLink.src());
- ConnectPoint dstPhysicalCp = mapVirtualToPhysicalPort(networkId, virtualLink.dst());
+ ConnectPoint srcPhysicalCp =
+ mapVirtualToPhysicalPort(networkId, virtualLink.src());
+ ConnectPoint dstPhysicalCp =
+ mapVirtualToPhysicalPort(networkId, virtualLink.dst());
final boolean[] foundSrc = {false};
final boolean[] foundDst = {false};
@@ -552,8 +567,8 @@
}
@Override
- public void tunnelUp(NetworkId networkId, ConnectPoint src, ConnectPoint dst, TunnelId tunnelId) {
-
+ public void tunnelUp(NetworkId networkId, ConnectPoint src,
+ ConnectPoint dst, TunnelId tunnelId) {
ConnectPoint srcVirtualCp = mapPhysicalToVirtualToPort(networkId, src);
ConnectPoint dstVirtualCp = mapPhysicalToVirtualToPort(networkId, dst);
if ((srcVirtualCp == null) || (dstVirtualCp == null)) {
@@ -567,7 +582,8 @@
}
@Override
- public void tunnelDown(NetworkId networkId, ConnectPoint src, ConnectPoint dst, TunnelId tunnelId) {
+ public void tunnelDown(NetworkId networkId, ConnectPoint src,
+ ConnectPoint dst, TunnelId tunnelId) {
ConnectPoint srcVirtualCp = mapPhysicalToVirtualToPort(networkId, src);
ConnectPoint dstVirtualCp = mapPhysicalToVirtualToPort(networkId, dst);
if ((srcVirtualCp == null) || (dstVirtualCp == null)) {
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPathService.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPathManager.java
similarity index 86%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPathService.java
rename to incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPathManager.java
index 62f3bdf..ad81141 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPathService.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPathManager.java
@@ -17,6 +17,7 @@
import org.onosproject.incubator.net.virtual.VirtualNetwork;
import org.onosproject.incubator.net.virtual.VirtualNetworkService;
+import org.onosproject.incubator.net.virtual.VnetService;
import org.onosproject.net.DisjointPath;
import org.onosproject.net.ElementId;
import org.onosproject.net.Link;
@@ -35,7 +36,8 @@
/**
* Path service implementation built on the virtual network service.
*/
-public class VirtualNetworkPathService extends AbstractPathService
+public class VirtualNetworkPathManager
+ extends AbstractPathService
implements PathService, VnetService {
private static final String NETWORK_NULL = "Network ID cannot be null";
@@ -49,7 +51,8 @@
* @param network virtual network
*/
- public VirtualNetworkPathService(VirtualNetworkService virtualNetworkManager, VirtualNetwork network) {
+ public VirtualNetworkPathManager(VirtualNetworkService virtualNetworkManager,
+ VirtualNetwork network) {
checkNotNull(network, NETWORK_NULL);
this.network = network;
topologyService = virtualNetworkManager.get(network.id(), TopologyService.class);
@@ -67,7 +70,8 @@
}
@Override
- public Set<DisjointPath> getDisjointPaths(ElementId src, ElementId dst, Map<Link, Object> riskProfile) {
+ public Set<DisjointPath> getDisjointPaths(ElementId src, ElementId dst,
+ Map<Link, Object> riskProfile) {
return getDisjointPaths(src, dst, null, riskProfile);
}
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyService.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyManager.java
similarity index 90%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyService.java
rename to incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyManager.java
index 972b5dc..e49fa6f 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyService.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyManager.java
@@ -20,6 +20,7 @@
import org.onosproject.event.AbstractListenerManager;
import org.onosproject.incubator.net.virtual.VirtualNetwork;
import org.onosproject.incubator.net.virtual.VirtualNetworkService;
+import org.onosproject.incubator.net.virtual.VnetService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
@@ -47,7 +48,8 @@
/**
* Topology service implementation built on the virtual network service.
*/
-public class VirtualNetworkTopologyService extends AbstractListenerManager<TopologyEvent, TopologyListener>
+public class VirtualNetworkTopologyManager
+ extends AbstractListenerManager<TopologyEvent, TopologyListener>
implements TopologyService, VnetService {
private static final String NETWORK_NULL = "Network ID cannot be null";
@@ -67,7 +69,8 @@
* @param virtualNetworkManager virtual network manager service
* @param network virtual network
*/
- public VirtualNetworkTopologyService(VirtualNetworkService virtualNetworkManager, VirtualNetwork network) {
+ public VirtualNetworkTopologyManager(VirtualNetworkService virtualNetworkManager,
+ VirtualNetwork network) {
checkNotNull(network, NETWORK_NULL);
this.network = network;
this.manager = virtualNetworkManager;
@@ -82,15 +85,18 @@
.stream()
.collect(Collectors.toSet());
- DefaultGraphDescription graph = new DefaultGraphDescription(System.nanoTime(), System.currentTimeMillis(),
- devices, links);
+ DefaultGraphDescription graph =
+ new DefaultGraphDescription(System.nanoTime(),
+ System.currentTimeMillis(),
+ devices, links);
return new DefaultTopology(PID, graph);
}
@Override
public boolean isLatest(Topology topology) {
Topology currentTopology = currentTopology();
- return defaultTopology(topology).getGraph().equals(defaultTopology(currentTopology).getGraph());
+ return defaultTopology(topology).getGraph()
+ .equals(defaultTopology(currentTopology).getGraph());
}
@Override
@@ -152,7 +158,8 @@
}
@Override
- public Set<DisjointPath> getDisjointPaths(Topology topology, DeviceId src, DeviceId dst, LinkWeight weight) {
+ public Set<DisjointPath> getDisjointPaths(Topology topology, DeviceId src,
+ DeviceId dst, LinkWeight weight) {
checkNotNull(src, DEVICE_ID_NULL);
checkNotNull(dst, DEVICE_ID_NULL);
checkNotNull(weight, LINK_WEIGHT_NULL);
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyProvider.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualNetworkProvider.java
similarity index 90%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyProvider.java
rename to incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualNetworkProvider.java
index d2e0b26..3e42579 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyProvider.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualNetworkProvider.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.onosproject.incubator.net.virtual.impl;
+package org.onosproject.incubator.net.virtual.impl.provider;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -53,9 +53,10 @@
*/
@Component(immediate = true)
@Service
-public class VirtualNetworkTopologyProvider extends AbstractProvider implements VirtualNetworkProvider {
+public class DefaultVirtualNetworkProvider
+ extends AbstractProvider implements VirtualNetworkProvider {
- private final Logger log = getLogger(VirtualNetworkTopologyProvider.class);
+ private final Logger log = getLogger(DefaultVirtualNetworkProvider.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected VirtualNetworkProviderRegistry providerRegistry;
@@ -72,7 +73,7 @@
/**
* Default constructor.
*/
- public VirtualNetworkTopologyProvider() {
+ public DefaultVirtualNetworkProvider() {
super(DefaultVirtualLink.PID);
}
@@ -138,12 +139,13 @@
* @param topology the default topology
* @return set of set of interconnected connect points.
*/
- protected Set<Set<ConnectPoint>> getConnectPoints(Topology topology) {
+ public Set<Set<ConnectPoint>> getConnectPoints(Topology topology) {
Set<Set<ConnectPoint>> clusters = new HashSet<>();
Set<TopologyCluster> topologyClusters = topologyService.getClusters(topology);
topologyClusters.forEach(topologyCluster -> {
Set<ConnectPoint> connectPointSet = new HashSet<>();
- Set<Link> clusterLinks = topologyService.getClusterLinks(topology, topologyCluster);
+ Set<Link> clusterLinks =
+ topologyService.getClusterLinks(topology, topologyCluster);
clusterLinks.forEach(link -> {
connectPointSet.add(link.src());
connectPointSet.add(link.dst());
@@ -162,7 +164,8 @@
@Override
public void event(TopologyEvent event) {
// Perform processing off the listener thread.
- executor.submit(() -> providerService.topologyChanged(getConnectPoints(event.subject())));
+ executor.submit(() -> providerService
+ .topologyChanged(getConnectPoints(event.subject())));
}
@Override
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VnetService.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/provider/package-info.java
similarity index 74%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VnetService.java
rename to incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/provider/package-info.java
index 7c83f75..48c02d5 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VnetService.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/provider/package-info.java
@@ -14,14 +14,7 @@
* limitations under the License.
*/
-package org.onosproject.incubator.net.virtual.impl;
-
-import org.onosproject.incubator.net.virtual.VirtualNetwork;
-
/**
- * Virtual network service interface.
+ * Network virtualization provider implementations.
*/
-interface VnetService {
- VirtualNetwork network();
-
-}
+package org.onosproject.incubator.net.virtual.impl.provider;