홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Phaneendra Manda
Committed by Gerrit Code Review
2360d25c 1 parent b9f0eb59

[ONOS-4713]GUI improvement and issue fix 

Change-Id: I9cec96584549e841dddf7759873fd7059b5ce2ba
Expand all
Inline Side-by-side
Showing 25 changed files with 507 additions and 163 deletions
......@@ -635,7 +635,10 @@ public class SfcFlowRuleInstallerImpl implements SfcFlowRuleInstallerService {
treatment.extension(tunnelDsttreatment, deviceId);
treatment.transition(TUNNEL_SEND_TABLE);
sendSfcRule(selector, treatment, deviceId, type, flowClassifier.priority());
classifierList.add(deviceIdfromPortPair);
selector.matchInPort(PortNumber.CONTROLLER);
sendSfcRule(selector, treatment, deviceId, type, flowClassifier.priority());
classifierList.add(deviceId);
installSfcTunnelSendRule(deviceId, nshSpiId, type);
installSfcTunnelReceiveRule(deviceIdfromPortPair, nshSpiId, type);
......@@ -647,6 +650,9 @@ public class SfcFlowRuleInstallerImpl implements SfcFlowRuleInstallerService {
nshSpiId, flowClassifier);
treatment.transition(ENCAP_OUTPUT_TABLE);
sendSfcRule(selector, treatment, deviceIdfromPortPair, type, flowClassifier.priority());
selector.matchInPort(PortNumber.CONTROLLER);
sendSfcRule(selector, treatment, deviceId, type, flowClassifier.priority());
classifierList.add(deviceIdfromPortPair);
}
}
......
......@@ -507,6 +507,7 @@ public class SfcManager implements SfcService {
int portDst = 0;
byte protocol = 0;
MacAddress macSrc = packet.getSourceMAC();
MacAddress macDst = packet.getDestinationMAC();
TenantId tenantId = getTenantId(macSrc);
if (ethType == Ethernet.TYPE_IPV4) {
......@@ -539,6 +540,8 @@ public class SfcManager implements SfcService {
.setPortDst(PortNumber.portNumber(portDst))
.setProtocol(protocol)
.setTenantId(tenantId)
.setMacSrc(macSrc)
.setMacDst(macDst)
.build();
PortChainId portChainId = findPortChainFromFiveTuple(fiveTuple);
......@@ -577,13 +580,12 @@ public class SfcManager implements SfcService {
* Send packet back to classifier.
*
* @param context packet context
* @param connectPoint connect point of first service function
*/
private void sendPacket(PacketContext context) {
ConnectPoint sourcePoint = context.inPacket().receivedFrom();
TrafficTreatment treatment = DefaultTrafficTreatment.builder().setOutput(sourcePoint.port()).build();
TrafficTreatment treatment = DefaultTrafficTreatment.builder().setOutput(PortNumber.TABLE).build();
OutboundPacket packet = new DefaultOutboundPacket(sourcePoint.deviceId(), treatment, context.inPacket()
.unparsed());
packetService.emit(packet);
......
......@@ -16,16 +16,17 @@
package org.onosproject.sfc.util;
import java.util.Collection;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.onlab.packet.IpAddress;
import org.onosproject.net.DeviceId;
import org.onosproject.vtnrsc.FixedIp;
import org.onosproject.vtnrsc.TenantId;
import org.onosproject.vtnrsc.TenantNetworkId;
import org.onosproject.vtnrsc.VirtualPort;
import org.onosproject.vtnrsc.VirtualPortId;
import org.onosproject.vtnrsc.TenantNetworkId;
import org.onosproject.vtnrsc.virtualport.VirtualPortListener;
import org.onosproject.vtnrsc.virtualport.VirtualPortService;
/**
......@@ -95,4 +96,12 @@ public class VirtualPortAdapter implements VirtualPortService {
public boolean removePorts(Iterable<VirtualPortId> vPortIds) {
return true;
}
@Override
public void addListener(VirtualPortListener listener) {
}
@Override
public void removeListener(VirtualPortListener listener) {
}
}
......
......@@ -53,6 +53,11 @@
<artifactId>onos-app-vtn-rsc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
......
/*
* Copyright 2016-present Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.sfcweb;
import org.onosproject.net.Link;
import org.onosproject.net.LinkKey;
import org.onosproject.ui.topo.BiLink;
import org.onosproject.ui.topo.LinkHighlight;
import org.onosproject.ui.topo.LinkHighlight.Flavor;
/**
* Bi-directional link capable of different highlights.
*/
public class SfcLink extends BiLink {
private boolean primary = false;
private boolean secondary = false;
public SfcLink(LinkKey key, Link link) {
super(key, link);
}
@Override
public LinkHighlight highlight(Enum<?> anEnum) {
Flavor flavor = primary ? Flavor.PRIMARY_HIGHLIGHT :
(secondary ? Flavor.SECONDARY_HIGHLIGHT : Flavor.NO_HIGHLIGHT);
return new LinkHighlight(this.linkId(), Flavor.PRIMARY_HIGHLIGHT);
}
}
/*
* Copyright 2016-present Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.sfcweb;
import org.onosproject.net.Link;
import org.onosproject.net.LinkKey;
import org.onosproject.ui.topo.BiLinkMap;
/**
* Sfc concrete link map.
*/
public class SfcLinkMap extends BiLinkMap<SfcLink> {
@Override
protected SfcLink create(LinkKey linkKey, Link link) {
return new SfcLink(linkKey, link);
}
}
......@@ -15,11 +15,19 @@
*/
package org.onosproject.sfcweb;
import org.onlab.packet.MacAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Host;
import org.onosproject.net.HostId;
import org.onosproject.net.host.HostService;
import org.onosproject.ui.UiTopoOverlay;
import org.onosproject.ui.topo.PropertyPanel;
import org.onosproject.vtnrsc.PortPair;
import org.onosproject.vtnrsc.VirtualPort;
import org.onosproject.vtnrsc.VirtualPortId;
import org.onosproject.vtnrsc.portpair.PortPairService;
import org.onosproject.vtnrsc.virtualport.VirtualPortService;
/**
* Our sfcweb topology overlay.
......@@ -46,6 +54,19 @@ public class SfcwebUiTopovOverlay extends UiTopoOverlay {
public void modifyHostDetails(PropertyPanel pp, HostId hostId) {
pp.title(MY_HOST_TITLE);
pp.removeAllProps();
PortPairService portPairService = AbstractShellCommand.get(PortPairService.class);
VirtualPortService virtualPortService = AbstractShellCommand.get(VirtualPortService.class);
HostService hostService = AbstractShellCommand.get(HostService.class);
Iterable<PortPair> portPairs = portPairService.getPortPairs();
for (PortPair portPair : portPairs) {
VirtualPort vPort = virtualPortService.getPort(VirtualPortId.portId(portPair.ingress()));
MacAddress dstMacAddress = vPort.macAddress();
Host host = hostService.getHost(HostId.hostId(dstMacAddress));
if (hostId.toString().equals(host.id().toString())) {
pp.addProp("SF Name", portPair.name());
pp.addProp("SF Ip", vPort.fixedIps().iterator().next().ip());
}
}
pp.addProp("SF host Address", hostId.toString());
}
......
......@@ -28,31 +28,41 @@
var displayStart = 'sfcwebTopovDisplayStart',
showSfcInf = 'showSfcInfo',
clearMessage = 'sfcTopovClear',
configSfpMessage = 'configSfpMessage' ;
configSfpMessage = 'configSfpMessage',
sfcPath = 'showSfcPath' ;
// internal state
var currentMode = null;
var sfpInfo;
// === Main API functions
function start() {
handlerMap[showSfcInf] = showSfcInformation;
handlerMap[sfcPath] = showSfcPath;
wss.bindHandlers(handlerMap);
wss.sendEvent(displayStart);
}
function dOk() {
var sfcId = null;
sfcId = d3.select('#sfp-value').property("value");
function dOkSfp() {
var tdString;
var i = 0;
if (sfcId) {
console.log(sfcId);
sfpInfo.a.forEach( function () {
var sfpId = d3.select("#sfp-value-id-"+i).property("checked");
if (sfpId)
{
tdString = sfpInfo.a[i];
}
i++;
} );
$log.debug('Dialog OK button clicked');
if (!tdString) {
$log.debug("No SFP ID is selected.");
}
wss.sendEvent(configSfpMessage, {
id: sfcId
id: tdString
});
flash.flash('SFP ID query:');
......@@ -62,68 +72,67 @@
$log.debug('Dialog Close button clicked (or Esc pressed)');
}
function createUserText() {
function createUserTextSfp(data) {
console.log(data);
var content = ds.createDiv();
var form = content.append('form');
var p = form.append('p');
var i = 0;
p.append('span').text('SFP IDs');
p.append('br');
sfpInfo = data;
data.a.forEach( function () {
p.append('input').attr({
id: 'sfp-value',
type: 'string',
name: 'sfp-value-name'
id: 'sfp-value-id-'+i,
type: 'radio',
name: 'sfp-id-name',
value: data.a[i]
});
p.append('span').text('ID');
p.append('span').text(data.a[i]);
p.append('br');
i++;
} );
return content;
}
function configSfp() {
function showSfcInformation(data) {
tds.openDialog()
.setTitle('SFP ID User Input')
.addContent(createUserText())
.addOk(dOk, 'OK')
.setTitle('List of active service functions')
.addContent(createUserTextSfp(data))
.addOk(dOkSfp, 'Select SFP ID')
.addCancel(dClose, 'Close')
.bindKeys();
}
function showSfcInformation(data) {
console.log(data);
wss.unbindHandlers(handlerMap);
// Get the modal
var modal = document.getElementById('myModal');
// Get the button that opens the modal
var btn = document.getElementById("myBtn");
// Get the <span> element that closes the modal
var span = document.getElementsByClassName("close")[0];
modal.style.display = "block";
var tBody = document.getElementById('sfc-info-body');
var tdString = '' ;
for (var i = 0; i < data.a.length; i++) {
tdString += '<tr> <td>'+ data.a[i] +'</td></tr>';
}
tBody.innerHTML = tdString;
function createSfcPathText(data) {
// When the user clicks on <span> (x), close the modal
span.onclick = function() {
modal.style.display = "none";
}
var content = ds.createDiv();
var form = content.append('form');
var p = form.append('p');
var i = 0;
// When the user clicks anywhere outside of the modal, close it
window.onclick = function(event) {
if (event.target == modal) {
modal.style.display = "none";
}
p.append('span').text('SFC Path');
p.append('br');
data.sfcPathList.forEach( function (val, idx) {
p.append('span').text(val);
p.append('br')
} );
return content;
}
function showSfcPath(data) {
tds.openDialog()
.setTitle('Service function path')
.addContent(createSfcPathText(data))
.addCancel(dClose, 'Close')
.bindKeys();
}
function clear() {
......@@ -146,8 +155,8 @@
return {
start: start,
showSfcInformation: showSfcInformation,
clear: clear,
configSfp: configSfp
showSfcPath : showSfcPath,
clear: clear
};
}]);
......
......@@ -27,11 +27,6 @@
star4: {
vb: '0 0 8 8',
d: 'M1,4l2,-1l1,-2l1,2l2,1l-2,1l-1,2l-1,-2z'
},
jp: {
vb: '0 0 110 110',
d: 'M84.3,89.3L58.9,64.2l-1.4,1.4L83,90.7L84.3,89.3z M27,7.6H7.4v19.2H27V7.6z' +
'M59.3,47.1H39.8v19.2h19.5V47.1z M102.1,79.5H82.6v19.2h19.5V79.5z M41.7,47.6L19,25.1l-1.2,1.2l22.7,22.5L41.7,47.6z'
}
},
activate: function () {
......@@ -53,16 +48,9 @@
tt: 'Query SFP active list information',
gid: 'summary'
},
5: {
cb: function () {
pps.configSfp();
},
tt: 'Highlight SFP active list information',
gid: '*jp'
},
_keyOrder: [
'4' , '5'
'4'
]
}
......
<script src="app/view/sfcwebTopov/sfcwebTopovDemo.js"></script>
<script src="app/view/sfcwebTopov/sfcwebTopovOverlay.js"></script>
<style>
/* The Modal (background) */
.modal {
display: none;
position: fixed;
z-index: 1;
padding-top: 0px;
left: 0px;
top: 0;
width: 37%;
height: 25%;
overflow: auto;
background-color: none;
margin: 178px 0px 0px -8px;
}
/* Modal Content */
.modal-content {
background-color: #fefefe;
margin: auto;
padding: 20px;
border: 1px solid #888;
width: 80%;
}
/* The Close Button */
.close {
color: #aaaaaa;
float: right;
font-size: 28px;
font-weight: bold;
}
.close:hover,
.close:focus {
color: #000;
text-decoration: none;
cursor: pointer;
}
</style>
<!-- The Modal -->
<div id="myModal" class="modal">
<!-- Modal content -->
<div class="modal-content">
<span class="close">×</span>
<table id='sfc-info'>
<thead>
<td>SFP ID information</td>
</thead>
<tbody id='sfc-info-body'>
</tbody>
</table>
</div>
</div>
......
......@@ -62,6 +62,7 @@ import org.onosproject.net.behaviour.BridgeDescription;
import org.onosproject.net.behaviour.ExtensionTreatmentResolver;
import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.config.basics.BasicDeviceConfig;
import org.onosproject.net.config.basics.BasicHostConfig;
import org.onosproject.net.device.DeviceEvent;
import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService;
......@@ -207,6 +208,9 @@ public class VtnManager implements VtnService {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected FlowRuleService flowRuleService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected NetworkConfigService networkConfigService;
private ApplicationId appId;
private ClassifierService classifierService;
private L2ForwardService l2ForwardService;
......@@ -847,13 +851,16 @@ public class VtnManager implements VtnService {
VtnRscEventFeedback l3Feedback = event.subject();
if (VtnRscEvent.Type.ROUTER_INTERFACE_PUT == event.type()) {
onRouterInterfaceDetected(l3Feedback);
} else
if (VtnRscEvent.Type.ROUTER_INTERFACE_DELETE == event.type()) {
} else if (VtnRscEvent.Type.ROUTER_INTERFACE_DELETE == event.type()) {
onRouterInterfaceVanished(l3Feedback);
} else if (VtnRscEvent.Type.FLOATINGIP_BIND == event.type()) {
onFloatingIpDetected(l3Feedback);
} else if (VtnRscEvent.Type.FLOATINGIP_UNBIND == event.type()) {
onFloatingIpVanished(l3Feedback);
} else if (VtnRscEvent.Type.VIRTUAL_PORT_PUT == event.type()) {
onVirtualPortCreated(l3Feedback);
} else if (VtnRscEvent.Type.VIRTUAL_PORT_DELETE == event.type()) {
onVirtualPortDeleted(l3Feedback);
}
}
......@@ -926,6 +933,29 @@ public class VtnManager implements VtnService {
programFloatingIpEvent(l3Feedback, VtnRscEvent.Type.FLOATINGIP_UNBIND);
}
public void onVirtualPortCreated(VtnRscEventFeedback l3Feedback) {
VirtualPort vPort = l3Feedback.virtualPort();
BasicHostConfig basicHostConfig = networkConfigService.addConfig(HostId.hostId(vPort.macAddress()),
BasicHostConfig.class);
Set<IpAddress> ips = new HashSet<>();
for (FixedIp fixedIp : vPort.fixedIps()) {
ips.add(fixedIp.ip());
}
basicHostConfig.setIps(ips).apply();
}
public void onVirtualPortDeleted(VtnRscEventFeedback l3Feedback) {
VirtualPort vPort = l3Feedback.virtualPort();
HostId hostId = HostId.hostId(vPort.macAddress());
BasicHostConfig basicHostConfig = networkConfigService.addConfig(hostId,
BasicHostConfig.class);
Set<IpAddress> ips = hostService.getHost(hostId).ipAddresses();
for (FixedIp fixedIp : vPort.fixedIps()) {
ips.remove(fixedIp.ip());
}
basicHostConfig.setIps(ips).apply();
}
private void programInterfacesSet(Set<RouterInterface> interfacesSet,
Objective.Operation operation) {
int subnetVmNum = 0;
......
......@@ -22,6 +22,7 @@ import java.util.Objects;
import org.onlab.packet.IPv4;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onosproject.net.PortNumber;
/**
......@@ -29,6 +30,8 @@ import org.onosproject.net.PortNumber;
*/
public final class DefaultFiveTuple implements FiveTuple {
private final MacAddress macSrc;
private final MacAddress macDst;
private final IpAddress ipSrc;
private final IpAddress ipDst;
private final PortNumber portSrc;
......@@ -46,7 +49,7 @@ public final class DefaultFiveTuple implements FiveTuple {
* @param portDst destination port of the packet
*/
private DefaultFiveTuple(byte protocol, IpAddress ipSrc, IpAddress ipDst, PortNumber portSrc, PortNumber portDst,
TenantId tenantId) {
TenantId tenantId, MacAddress macSrc, MacAddress macDst) {
this.protocol = protocol;
this.ipSrc = ipSrc;
......@@ -54,6 +57,8 @@ public final class DefaultFiveTuple implements FiveTuple {
this.portSrc = portSrc;
this.portDst = portDst;
this.tenantId = tenantId;
this.macSrc = macSrc;
this.macDst = macDst;
}
@Override
......@@ -82,6 +87,16 @@ public final class DefaultFiveTuple implements FiveTuple {
}
@Override
public MacAddress macSrc() {
return macSrc;
}
@Override
public MacAddress macDst() {
return macDst;
}
@Override
public TenantId tenantId() {
return tenantId;
}
......@@ -139,6 +154,8 @@ public final class DefaultFiveTuple implements FiveTuple {
private PortNumber portDst;
private byte protocol;
private TenantId tenantId;
private MacAddress macSrc;
private MacAddress macDst;
@Override
public Builder setIpSrc(IpAddress ipSrc) {
......@@ -171,17 +188,29 @@ public final class DefaultFiveTuple implements FiveTuple {
}
@Override
public org.onosproject.vtnrsc.FiveTuple.Builder setTenantId(TenantId tenantId) {
public Builder setTenantId(TenantId tenantId) {
this.tenantId = tenantId;
return this;
}
@Override
public Builder setMacSrc(MacAddress macSrc) {
this.macSrc = macSrc;
return this;
}
@Override
public Builder setMacDst(MacAddress macDst) {
this.macDst = macDst;
return this;
}
@Override
public FiveTuple build() {
checkArgument(protocol == IPv4.PROTOCOL_TCP || protocol == IPv4.PROTOCOL_UDP ||
protocol == IPv4.PROTOCOL_ICMP, "Unsupported value for protocol while creating five tuple");
return new DefaultFiveTuple(protocol, ipSrc, ipDst, portSrc, portDst, tenantId);
return new DefaultFiveTuple(protocol, ipSrc, ipDst, portSrc, portDst, tenantId, macSrc, macDst);
}
}
}
......
......@@ -16,6 +16,7 @@
package org.onosproject.vtnrsc;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onosproject.net.PortNumber;
/**
......@@ -61,6 +62,20 @@ public interface FiveTuple {
PortNumber portDst();
/**
* Returns source mac.
*
* @return srcMac
*/
MacAddress macSrc();
/**
* Returns destination mac.
*
* @return dstMac
*/
MacAddress macDst();
/**
* Returns the tenant id.
*
* @return tenantId
......@@ -105,6 +120,22 @@ public interface FiveTuple {
Builder setPortDst(PortNumber portDst);
/**
* Assign the source mac address to this object.
*
* @param macSrc source mac address
* @return this the builder object
*/
Builder setMacSrc(MacAddress macSrc);
/**
* Assign the destination mac address to this object.
*
* @param macDst destination mac address
* @return this the builder object
*/
Builder setMacDst(MacAddress macDst);
/**
* Assign the protocol to this object.
*
* @param protocol packet protocol
......
......@@ -107,7 +107,15 @@ public class VtnRscEvent
/**
* Signifies that port-chain has update.
*/
PORT_CHAIN_UPDATE
PORT_CHAIN_UPDATE,
/**
* Signifies that virtual-port has created.
*/
VIRTUAL_PORT_PUT,
/**
* Signifies that virtual-port has removed.
*/
VIRTUAL_PORT_DELETE
}
/**
......
......@@ -15,18 +15,19 @@
*/
package org.onosproject.vtnrsc.event;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Objects;
import org.onosproject.vtnrsc.FloatingIp;
import org.onosproject.vtnrsc.Router;
import org.onosproject.vtnrsc.RouterInterface;
import org.onosproject.vtnrsc.PortPair;
import org.onosproject.vtnrsc.PortPairGroup;
import org.onosproject.vtnrsc.FlowClassifier;
import org.onosproject.vtnrsc.PortChain;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import org.onosproject.vtnrsc.PortPair;
import org.onosproject.vtnrsc.PortPairGroup;
import org.onosproject.vtnrsc.Router;
import org.onosproject.vtnrsc.RouterInterface;
import org.onosproject.vtnrsc.VirtualPort;
/**
* Representation of a VtnRsc event feedback.
......@@ -39,6 +40,7 @@ public class VtnRscEventFeedback {
private final PortPairGroup portPairGroup;
private final FlowClassifier flowClassifier;
private final PortChain portChain;
private final VirtualPort virtualPort;
/**
* Creates VtnRscEventFeedback object.
......@@ -53,6 +55,7 @@ public class VtnRscEventFeedback {
this.portPairGroup = null;
this.flowClassifier = null;
this.portChain = null;
this.virtualPort = null;
}
/**
......@@ -68,6 +71,7 @@ public class VtnRscEventFeedback {
this.portPairGroup = null;
this.flowClassifier = null;
this.portChain = null;
this.virtualPort = null;
}
/**
......@@ -84,6 +88,7 @@ public class VtnRscEventFeedback {
this.portPairGroup = null;
this.flowClassifier = null;
this.portChain = null;
this.virtualPort = null;
}
/**
......@@ -100,6 +105,7 @@ public class VtnRscEventFeedback {
this.portPairGroup = null;
this.flowClassifier = null;
this.portChain = null;
this.virtualPort = null;
}
/**
......@@ -116,6 +122,7 @@ public class VtnRscEventFeedback {
"Port-Pair-Group cannot be null");
this.flowClassifier = null;
this.portChain = null;
this.virtualPort = null;
}
/**
......@@ -132,6 +139,7 @@ public class VtnRscEventFeedback {
this.flowClassifier = checkNotNull(flowClassifier,
"Flow-Classifier cannot be null");
this.portChain = null;
this.virtualPort = null;
}
/**
......@@ -148,6 +156,24 @@ public class VtnRscEventFeedback {
this.flowClassifier = null;
this.portChain = checkNotNull(portChain,
"Port-Chain cannot be null");
this.virtualPort = null;
}
/**
* Creates VtnRscEventFeedback object.
*
* @param virtualPort the Virtual-Port
*/
public VtnRscEventFeedback(VirtualPort virtualPort) {
this.floaingtIp = null;
this.router = null;
this.routerInterface = null;
this.portPair = null;
this.portPairGroup = null;
this.flowClassifier = null;
this.portChain = null;
this.virtualPort = checkNotNull(virtualPort,
"Virtual-port cannot be null");
}
/**
......@@ -213,10 +239,19 @@ public class VtnRscEventFeedback {
return portChain;
}
/**
* Returns Virtual-Port.
*
* @return virtualPort the Virtual-Port
*/
public VirtualPort virtualPort() {
return virtualPort;
}
@Override
public int hashCode() {
return Objects.hash(floaingtIp, router, routerInterface, portPair,
portPairGroup, flowClassifier, portChain);
portPairGroup, flowClassifier, portChain, virtualPort);
}
@Override
......@@ -232,7 +267,8 @@ public class VtnRscEventFeedback {
&& Objects.equals(this.portPair, that.portPair)
&& Objects.equals(this.portPairGroup, that.portPairGroup)
&& Objects.equals(this.flowClassifier, that.flowClassifier)
&& Objects.equals(this.portChain, that.portChain);
&& Objects.equals(this.portChain, that.portChain)
&& Objects.equals(this.virtualPort, that.virtualPort);
}
return false;
}
......@@ -247,6 +283,7 @@ public class VtnRscEventFeedback {
.add("portPairGroup", portPairGroup)
.add("flowClassifier", flowClassifier)
.add("portChain", portChain)
.add("virtualPort", virtualPort)
.toString();
}
}
......
......@@ -97,6 +97,7 @@ public class PortChainManager extends AbstractListenerManager<PortChainEvent, Po
@Deactivate
public void deactivate() {
eventDispatcher.removeSink(PortChainEvent.class);
portChainStore.removeListener(portChainListener);
portChainStore.destroy();
log.info("Stopped");
}
......
......@@ -87,6 +87,8 @@ import org.onosproject.vtnrsc.routerinterface.RouterInterfaceService;
import org.onosproject.vtnrsc.service.VtnRscService;
import org.onosproject.vtnrsc.subnet.SubnetService;
import org.onosproject.vtnrsc.tenantnetwork.TenantNetworkService;
import org.onosproject.vtnrsc.virtualport.VirtualPortEvent;
import org.onosproject.vtnrsc.virtualport.VirtualPortListener;
import org.onosproject.vtnrsc.virtualport.VirtualPortService;
import org.slf4j.Logger;
......@@ -112,6 +114,7 @@ public class VtnRscManager extends AbstractListenerManager<VtnRscEvent, VtnRscLi
private PortPairGroupListener portPairGroupListener = new InnerPortPairGroupListener();
private FlowClassifierListener flowClassifierListener = new InnerFlowClassifierListener();
private PortChainListener portChainListener = new InnerPortChainListener();
private VirtualPortListener virtualPortListener = new InnerVirtualPortListener();
private EventuallyConsistentMap<TenantId, SegmentationId> l3vniTenantMap;
private EventuallyConsistentMap<TenantRouter, SegmentationId> l3vniTenantRouterMap;
......@@ -165,6 +168,7 @@ public class VtnRscManager extends AbstractListenerManager<VtnRscEvent, VtnRscLi
portPairGroupService.addListener(portPairGroupListener);
flowClassifierService.addListener(flowClassifierListener);
portChainService.addListener(portChainListener);
virtualPortService.addListener(virtualPortListener);
KryoNamespace.Builder serializer = KryoNamespace.newBuilder()
.register(KryoNamespaces.API)
......@@ -205,6 +209,7 @@ public class VtnRscManager extends AbstractListenerManager<VtnRscEvent, VtnRscLi
portPairGroupService.removeListener(portPairGroupListener);
flowClassifierService.removeListener(flowClassifierListener);
portChainService.removeListener(portChainListener);
virtualPortService.removeListener(virtualPortListener);
l3vniTenantMap.destroy();
l3vniTenantRouterMap.destroy();
......@@ -401,6 +406,22 @@ public class VtnRscManager extends AbstractListenerManager<VtnRscEvent, VtnRscLi
}
}
private class InnerVirtualPortListener implements VirtualPortListener {
@Override
public void event(VirtualPortEvent event) {
checkNotNull(event, EVENT_NOT_NULL);
VirtualPort virtualPort = event.subject();
if (VirtualPortEvent.Type.VIRTUAL_PORT_PUT == event.type()) {
notifyListeners(new VtnRscEvent(VtnRscEvent.Type.VIRTUAL_PORT_PUT,
new VtnRscEventFeedback(virtualPort)));
} else if (VirtualPortEvent.Type.VIRTUAL_PORT_DELETE == event.type()) {
notifyListeners(new VtnRscEvent(VtnRscEvent.Type.VIRTUAL_PORT_DELETE,
new VtnRscEventFeedback(virtualPort)));
}
}
}
@Override
public Iterator<Device> getClassifierOfTenant(TenantId tenantId) {
checkNotNull(tenantId, TENANTID_NOT_NULL);
......
/*
* Copyright 2016-present Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.vtnrsc.virtualport;
import org.onosproject.event.AbstractEvent;
import org.onosproject.vtnrsc.VirtualPort;
/**
* Describes virtual port event.
*/
public class VirtualPortEvent extends AbstractEvent<VirtualPortEvent.Type, VirtualPort> {
/**
* Type of virtual port events.
*/
public enum Type {
/**
* Signifies that virtual port has been created.
*/
VIRTUAL_PORT_PUT,
/**
* Signifies that virtual port has been deleted.
*/
VIRTUAL_PORT_DELETE,
/**
* Signifies that virtual port has been updated.
*/
VIRTUAL_PORT_UPDATE
}
/**
* Creates an event of a given type and for the specified virtual port.
*
* @param type virtual port event type
* @param virtualPort virtual port subject
*/
public VirtualPortEvent(Type type, VirtualPort virtualPort) {
super(type, virtualPort);
}
/**
* Creates an event of a given type and for the specified virtual port.
*
* @param type virtual port event type
* @param virtualPort virtual port subject
* @param time occurrence time
*/
public VirtualPortEvent(Type type, VirtualPort virtualPort, long time) {
super(type, virtualPort, time);
}
}
/*
* Copyright 2016-present Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.vtnrsc.virtualport;
import org.onosproject.event.EventListener;
/**
* Entity capable of virtual port related events.
*/
public interface VirtualPortListener extends EventListener<VirtualPortEvent> {
}
......@@ -18,6 +18,7 @@ package org.onosproject.vtnrsc.virtualport;
import java.util.Collection;
import org.onlab.packet.IpAddress;
import org.onosproject.event.ListenerService;
import org.onosproject.net.DeviceId;
import org.onosproject.vtnrsc.FixedIp;
import org.onosproject.vtnrsc.TenantId;
......@@ -28,7 +29,7 @@ import org.onosproject.vtnrsc.VirtualPortId;
/**
* Service for interacting with the inventory of virtualPort.
*/
public interface VirtualPortService {
public interface VirtualPortService extends ListenerService<VirtualPortEvent, VirtualPortListener> {
/**
* Returns if the virtualPort is existed.
*
......
......@@ -18,12 +18,10 @@ package org.onosproject.vtnrsc.virtualport.impl;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.felix.scr.annotations.Activate;
......@@ -33,12 +31,18 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.IpAddress;
import org.onlab.util.KryoNamespace;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.event.AbstractListenerManager;
import org.onosproject.net.DeviceId;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.EventuallyConsistentMap;
import org.onosproject.store.service.EventuallyConsistentMapEvent;
import org.onosproject.store.service.EventuallyConsistentMapListener;
import org.onosproject.store.service.MultiValuedTimestamp;
import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.WallClockTimestamp;
import org.onosproject.vtnrsc.AllowedAddressPair;
import org.onosproject.vtnrsc.BindingHostId;
import org.onosproject.vtnrsc.DefaultVirtualPort;
......@@ -50,6 +54,8 @@ import org.onosproject.vtnrsc.TenantNetworkId;
import org.onosproject.vtnrsc.VirtualPort;
import org.onosproject.vtnrsc.VirtualPortId;
import org.onosproject.vtnrsc.tenantnetwork.TenantNetworkService;
import org.onosproject.vtnrsc.virtualport.VirtualPortEvent;
import org.onosproject.vtnrsc.virtualport.VirtualPortListener;
import org.onosproject.vtnrsc.virtualport.VirtualPortService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -59,7 +65,8 @@ import org.slf4j.LoggerFactory;
*/
@Component(immediate = true)
@Service
public class VirtualPortManager implements VirtualPortService {
public class VirtualPortManager extends AbstractListenerManager<VirtualPortEvent, VirtualPortListener>
implements VirtualPortService {
private final Logger log = LoggerFactory.getLogger(getClass());
......@@ -73,8 +80,9 @@ public class VirtualPortManager implements VirtualPortService {
private static final String DEVICEID_NOT_NULL = "DeviceId cannot be null";
private static final String FIXEDIP_NOT_NULL = "FixedIp cannot be null";
private static final String IP_NOT_NULL = "Ip cannot be null";
private static final String EVENT_NOT_NULL = "event cannot be null";
protected Map<VirtualPortId, VirtualPort> vPortStore;
protected EventuallyConsistentMap<VirtualPortId, VirtualPort> vPortStore;
protected ApplicationId appId;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
......@@ -86,17 +94,21 @@ public class VirtualPortManager implements VirtualPortService {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected CoreService coreService;
private EventuallyConsistentMapListener<VirtualPortId, VirtualPort> virtualPortListener =
new InnerVirtualPortStoreListener();
@Activate
public void activate() {
appId = coreService.registerApplication(VTNRSC_APP);
vPortStore = storageService.<VirtualPortId, VirtualPort>consistentMapBuilder()
eventDispatcher.addSink(VirtualPortEvent.class, listenerRegistry);
vPortStore = storageService.<VirtualPortId, VirtualPort>eventuallyConsistentMapBuilder()
.withName(VIRTUALPORT)
.withApplicationId(appId)
.withPurgeOnUninstall()
.withSerializer(Serializer.using(Arrays.asList(KryoNamespaces.API),
VirtualPortId.class,
.withSerializer(KryoNamespace.newBuilder().register(KryoNamespaces.API)
.register(MultiValuedTimestamp.class)
.register(VirtualPortId.class,
TenantNetworkId.class,
VirtualPort.State.class,
TenantId.class,
......@@ -107,7 +119,10 @@ public class VirtualPortManager implements VirtualPortService {
SubnetId.class,
IpAddress.class,
DefaultVirtualPort.class))
.build().asJavaMap();
.withTimestampProvider((k, v) ->new WallClockTimestamp())
.build();
vPortStore.addListener(virtualPortListener);
log.info("Started");
}
......@@ -246,4 +261,35 @@ public class VirtualPortManager implements VirtualPortService {
return true;
}
private class InnerVirtualPortStoreListener
implements
EventuallyConsistentMapListener<VirtualPortId, VirtualPort> {
@Override
public void event(EventuallyConsistentMapEvent<VirtualPortId, VirtualPort> event) {
checkNotNull(event, EVENT_NOT_NULL);
log.info("virtual port event raised");
VirtualPort virtualPort = event.value();
if (EventuallyConsistentMapEvent.Type.PUT == event.type()) {
notifyListeners(new VirtualPortEvent(
VirtualPortEvent.Type.VIRTUAL_PORT_PUT,
virtualPort));
}
if (EventuallyConsistentMapEvent.Type.REMOVE == event.type()) {
notifyListeners(new VirtualPortEvent(
VirtualPortEvent.Type.VIRTUAL_PORT_DELETE,
virtualPort));
}
}
}
/**
* Notifies specify event to all listeners.
*
* @param event virtual port event
*/
private void notifyListeners(VirtualPortEvent event) {
checkNotNull(event, EVENT_NOT_NULL);
post(event);
}
}
......
......@@ -50,7 +50,7 @@ import com.google.common.collect.ImmutableSet;
*/
public class SfcViewMessageHandler extends UiMessageHandler {
private static final String SLASH = " ; ";
private static final String SLASH = " -> ";
private static final String NONE = "none";
private static final String SFCTYPE = "Service Function Chain";
......@@ -61,13 +61,13 @@ public class SfcViewMessageHandler extends UiMessageHandler {
private static final String ID = "id";
private static final String STATE = "_iconid_state";
private static final String PORTCHAINNAME = "portChainName";
private static final String HOSTS = "hosts";
private static final String SFS = "sfs";
private static final String TYPE = "type";
private static final String SRCIP = "srcIp";
private static final String DSTIP = "dstIp";
private static final String[] COL_IDS = {
ID, STATE, PORTCHAINNAME, HOSTS, TYPE, SRCIP, DSTIP
ID, STATE, PORTCHAINNAME, SFS, TYPE, SRCIP, DSTIP
};
private static final String ICON_ID_ONLINE = "active";
......@@ -116,7 +116,7 @@ public class SfcViewMessageHandler extends UiMessageHandler {
row.cell(ID, pchain.portChainId().value().toString())
.cell(STATE, sfcState(vpList))
.cell(PORTCHAINNAME, pchain.name())
.cell(HOSTS, sfcHosts(vpList))
.cell(SFS, sfcHosts(vpList))
.cell(TYPE, SFCTYPE)
.cell(SRCIP, portChainIpRange.srcip())
.cell(DSTIP, portChainIpRange.dstip());
......
......@@ -32,7 +32,7 @@
<tr>
<td colId="_iconid_state" class="table-icon" sortable></td>
<td colId="portChainName" sortable>PortChainName </td>
<td colId="hosts" sortable>Hosts </td>
<td colId="sfs" sortable>Sfs </td>
<td colId="type" sortable>Type </td>
<td colId="srcIp" sortable>Source IP Prefix </td>
<td colId="dstIp" sortable>Destination IP Prefix </td>
......@@ -54,7 +54,7 @@
<div icon icon-id="{{sfc._iconid_state}}"></div>
</td>
<td>{{sfc.portChainName}}</td>
<td>{{sfc.hosts}}</td>
<td>{{sfc.sfs}}</td>
<td>{{sfc.type}}</td>
<td>{{sfc.srcIp}}</td>
<td>{{sfc.dstIp}}</td>
......
......@@ -38,7 +38,6 @@ public class DefaultMoveExtensionTreatment extends AbstractExtension
private ExtensionTreatmentType type;
private final KryoNamespace appKryo = new KryoNamespace.Builder()
.register(byte[].class)
.register(Map.class)
.build("DefaultMoveExtensionTreatment");
......