ONOS-4713, ONOS-4715 issues merge to master
Change-Id: I3e52af949005529cec18a85e49601c47f7e386f8
diff --git a/apps/vtn/sfcweb/src/main/java/org/onosproject/sfcweb/SfcwebUiTopovMessageHandler.java b/apps/vtn/sfcweb/src/main/java/org/onosproject/sfcweb/SfcwebUiTopovMessageHandler.java
index df541b3..8319137 100644
--- a/apps/vtn/sfcweb/src/main/java/org/onosproject/sfcweb/SfcwebUiTopovMessageHandler.java
+++ b/apps/vtn/sfcweb/src/main/java/org/onosproject/sfcweb/SfcwebUiTopovMessageHandler.java
@@ -15,50 +15,53 @@
*/
package org.onosproject.sfcweb;
+import static org.onosproject.net.DefaultEdgeLink.createEdgeLink;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+import java.util.TimerTask;
+
+import jersey.repackaged.com.google.common.collect.Lists;
+
import org.onlab.osgi.DefaultServiceDirectory;
import org.onlab.osgi.ServiceDirectory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.google.common.collect.ImmutableSet;
-
import org.onlab.packet.MacAddress;
-import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
import org.onosproject.net.Element;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
import org.onosproject.net.Link;
-import org.onosproject.net.device.DeviceService;
import org.onosproject.net.host.HostService;
import org.onosproject.net.link.LinkService;
-import org.onosproject.ui.topo.HostHighlight;
import org.onosproject.ui.RequestHandler;
import org.onosproject.ui.UiConnection;
import org.onosproject.ui.UiMessageHandler;
+import org.onosproject.ui.topo.DeviceHighlight;
import org.onosproject.ui.topo.Highlights;
+import org.onosproject.ui.topo.HostHighlight;
import org.onosproject.ui.topo.NodeBadge;
import org.onosproject.ui.topo.TopoJson;
-import org.onosproject.ui.topo.DeviceHighlight;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.onosproject.vtnrsc.FiveTuple;
+import org.onosproject.vtnrsc.LoadBalanceId;
import org.onosproject.vtnrsc.PortChain;
-import org.onosproject.vtnrsc.portchain.PortChainService;
-import org.onosproject.vtnrsc.portpair.PortPairService;
import org.onosproject.vtnrsc.PortChainId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.Host;
-import org.onosproject.net.HostId;
import org.onosproject.vtnrsc.PortPair;
import org.onosproject.vtnrsc.PortPairId;
+import org.onosproject.vtnrsc.VirtualPort;
import org.onosproject.vtnrsc.VirtualPortId;
+import org.onosproject.vtnrsc.portchain.PortChainService;
+import org.onosproject.vtnrsc.portpair.PortPairService;
+import org.onosproject.vtnrsc.portpairgroup.PortPairGroupService;
import org.onosproject.vtnrsc.service.VtnRscService;
import org.onosproject.vtnrsc.virtualport.VirtualPortService;
-import org.onosproject.vtnrsc.portpairgroup.PortPairGroupService;
-import org.onosproject.vtnrsc.PortPairGroupId;
-import org.onosproject.vtnrsc.PortPairGroup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import java.util.Collection;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.List;
-import java.util.ListIterator;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.ImmutableSet;
/**
* SFC web gui topology-overlay message handler.
@@ -69,32 +72,27 @@
private static final String SAMPLE_TOPOV_DISPLAY_SFC = "showSfcInfo";
private static final String SAMPLE_TOPOV_DISPLAY_STOP = "sfcTopovClear";
private static final String CONFIG_SFP_MSG = "configSfpMessage";
-
+ private static final String SAMPLE_TOPOV_SHOW_SFC_PATH = "showSfcPath";
private static final String ID = "id";
private static final String MODE = "mode";
- private static final String SFC_ID = "SFC";
-
- private static final long UPDATE_PERIOD_MS = 1000;
+ private static final String CLASSIFIER = "CLS";
+ private static final String FORWARDER = "SFF";
private static final Link[] EMPTY_LINK_SET = new Link[0];
- private enum Mode { IDLE, MOUSE, LINK }
+ private enum Mode {
+ IDLE, MOUSE, LINK
+ }
private final Logger log = LoggerFactory.getLogger(getClass());
- private DeviceService deviceService;
private HostService hostService;
private LinkService linkService;
-
- private final Timer timer = new Timer("sfcweb-overlay");
private TimerTask demoTask = null;
private Mode currentMode = Mode.IDLE;
private Element elementOfNote;
private Link[] linkSet = EMPTY_LINK_SET;
- private int linkIndex;
- private long someNumber = 1;
- private long someIncrement = 1;
protected PortPairService portPairService;
protected VtnRscService vtnRscService;
protected VirtualPortService virtualPortService;
@@ -104,7 +102,6 @@
@Override
public void init(UiConnection connection, ServiceDirectory directory) {
super.init(connection, directory);
- deviceService = directory.get(DeviceService.class);
hostService = directory.get(HostService.class);
linkService = directory.get(LinkService.class);
portChainService = directory.get(PortChainService.class);
@@ -172,7 +169,10 @@
vtnRscService = serviceDirectory.get(VtnRscService.class);
virtualPortService = serviceDirectory.get(VirtualPortService.class);
+ List<String> sfcPathList = Lists.newArrayList();
+
Highlights highlights = new Highlights();
+ SfcLinkMap linkMap = new SfcLinkMap();
PortChainId portChainId = PortChainId.of(id);
boolean portChainIdExist = portChainService.exists(portChainId);
@@ -183,44 +183,111 @@
PortChain portChain = portChainService.getPortChain(portChainId);
- List<PortPairGroupId> llPortPairGroupIdList = portChain.portPairGroups();
- ListIterator<PortPairGroupId> portPairGroupIdListIterator = llPortPairGroupIdList.listIterator();
- while (portPairGroupIdListIterator.hasNext()) {
- PortPairGroupId portPairGroupId = portPairGroupIdListIterator.next();
- PortPairGroup portPairGroup = portPairGroupService.getPortPairGroup(portPairGroupId);
- List<PortPairId> llPortPairIdList = portPairGroup.portPairs();
- ListIterator<PortPairId> portPairListIterator = llPortPairIdList.listIterator();
+ Set<FiveTuple> fiveTupleSet = portChain.getLoadBalanceIdMapKeys();
+ for (FiveTuple fiveTuple : fiveTupleSet) {
+ List<PortPairId> path = portChain.getLoadBalancePath(fiveTuple);
+ LoadBalanceId lbId = portChain.getLoadBalanceId(fiveTuple);
+ ListIterator<PortPairId> pathIterator = path.listIterator();
- while (portPairListIterator.hasNext()) {
- PortPairId portPairId = portPairListIterator.next();
+ // Add source
+ Host srcHost = hostService.getHost(HostId.hostId(fiveTuple.macSrc()));
+
+ HostHighlight hSrc = new HostHighlight(srcHost.id().toString());
+ hSrc.setBadge(NodeBadge.text("SRC"));
+ String sfcPath = "SRC -> ";
+ highlights.add(hSrc);
+
+ DeviceId previousDeviceId = null;
+ while (pathIterator.hasNext()) {
+
+ PortPairId portPairId = pathIterator.next();
PortPair portPair = portPairService.getPortPair(portPairId);
DeviceId deviceId = vtnRscService.getSfToSffMaping(VirtualPortId.portId(portPair.egress()));
- Device device = deviceService.getDevice(deviceId);
- DeviceHighlight dh = new DeviceHighlight(device.id().toString());
- dh.setBadge(NodeBadge.text(SFC_ID));
-
- MacAddress dstMacAddress = virtualPortService.getPort(VirtualPortId
- .portId(portPair.egress())).macAddress();
+ VirtualPort vPort = virtualPortService.getPort(VirtualPortId.portId(portPair.egress()));
+ MacAddress dstMacAddress = vPort.macAddress();
Host host = hostService.getHost(HostId.hostId(dstMacAddress));
- HostHighlight hhDst = new HostHighlight(host.id().toString());
- hhDst.setBadge(NodeBadge.text(SFC_ID));
- MacAddress srcMacAddress = virtualPortService.getPort(VirtualPortId
- .portId(portPair.ingress())).macAddress();
- Host hostSrc = hostService.getHost(HostId.hostId(srcMacAddress));
- HostHighlight hhSrc = new HostHighlight(hostSrc.id().toString());
- hhSrc.setBadge(NodeBadge.text(SFC_ID));
+ addEdgeLinks(linkMap, host);
+ log.info("before check");
+ if (previousDeviceId != null) {
+ log.info("pdid not null");
+ if (!deviceId.equals(previousDeviceId)) {
+ // Highlight the link between devices.
+
+ Link link = getLinkBetweenDevices(deviceId, previousDeviceId);
+ if (link != null) {
+ linkMap.add(link);
+ }
+ }
+ }
+
+ DeviceHighlight dh = new DeviceHighlight(deviceId.toString());
+ if (portChain.getSfcClassifiers(lbId).contains(deviceId)) {
+ dh.setBadge(NodeBadge.text(CLASSIFIER));
+ } else {
+ dh.setBadge(NodeBadge.text(FORWARDER));
+ }
highlights.add(dh);
- highlights.add(hhSrc);
+
+ HostHighlight hhDst = new HostHighlight(host.id().toString());
+ hhDst.setBadge(NodeBadge.text(portPair.name()));
+ sfcPath = sfcPath + portPair.name() + "(" + vPort.fixedIps().iterator().next().ip() + ") -> ";
+
+ if (!portPair.ingress().equals(portPair.egress())) {
+ MacAddress srcMacAddress = virtualPortService.getPort(VirtualPortId
+ .portId(portPair.ingress()))
+ .macAddress();
+ Host hostSrc = hostService.getHost(HostId.hostId(srcMacAddress));
+ HostHighlight hhSrc = new HostHighlight(hostSrc.id().toString());
+ hhSrc.setBadge(NodeBadge.text(portPair.name()));
+ highlights.add(hhSrc);
+ }
highlights.add(hhDst);
+ previousDeviceId = deviceId;
}
+
+ // Add destination
+ Host dstHost = hostService.getHost(HostId.hostId(fiveTuple.macDst()));
+
+ HostHighlight hDst = new HostHighlight(dstHost.id().toString());
+ hDst.setBadge(NodeBadge.text("DST"));
+ sfcPath = sfcPath + "DST";
+ highlights.add(hDst);
+ sfcPathList.add(sfcPath);
}
+ for (SfcLink sfcLink : linkMap.biLinks()) {
+ highlights.add(sfcLink.highlight(null));
+ }
sendHighlights(highlights);
+
+ ObjectNode result = objectNode();
+ ArrayNode arrayNode = arrayNode();
+ for (String path : sfcPathList) {
+ arrayNode.add(path);
+ }
+ result.putArray("sfcPathList").addAll(arrayNode);
+
+ sendMessage(SAMPLE_TOPOV_SHOW_SFC_PATH, sid, result);
}
}
+ private Link getLinkBetweenDevices(DeviceId deviceId, DeviceId previousDeviceId) {
+ Set<Link> deviceLinks = linkService.getDeviceEgressLinks(deviceId);
+ Set<Link> previousDeviceLinks = linkService.getDeviceIngressLinks(previousDeviceId);
+ for (Link link : deviceLinks) {
+ previousDeviceLinks.contains(link);
+ return link;
+ }
+ return null;
+ }
+
+ private void addEdgeLinks(SfcLinkMap linkMap, Host host1) {
+ linkMap.add(createEdgeLink(host1, true));
+ linkMap.add(createEdgeLink(host1, false));
+ }
+
private synchronized void cancelTask() {
if (demoTask != null) {
demoTask.cancel();