홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Shashikanth VH
Committed by Gerrit Code Review
e30cfc49 1 parent f2565a9c

BGP encode multiple flow spec action issue fix. 

Change-Id: Ieb173be9edb86bc717bfe1e55271873645e4a5b1
Inline Side-by-side
Showing 4 changed files with 55 additions and 20 deletions
......@@ -27,7 +27,7 @@ import com.google.common.base.MoreObjects;
*/
public class BgpFlowSpecDetails {
private List<BgpValueType> flowSpecComponents;
private BgpValueType fsActionTlv;
private List<BgpValueType> fsActionTlv;
private RouteDistinguisher routeDistinguisher;
/**
......@@ -44,7 +44,7 @@ public class BgpFlowSpecDetails {
*
* @return flow specification action tlv
*/
public BgpValueType fsActionTlv() {
public List<BgpValueType> fsActionTlv() {
return this.fsActionTlv;
}
......@@ -53,7 +53,7 @@ public class BgpFlowSpecDetails {
*
* @param fsActionTlv flow specification action tlv
*/
public void setFsActionTlv(BgpValueType fsActionTlv) {
public void setFsActionTlv(List<BgpValueType> fsActionTlv) {
this.fsActionTlv = fsActionTlv;
}
......
......@@ -23,6 +23,10 @@ import org.onosproject.bgpio.util.Constants;
import org.onosproject.bgpio.util.Validation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Objects;
/**
......@@ -33,14 +37,14 @@ public class BgpExtendedCommunity implements BgpValueType {
private static final Logger log = LoggerFactory.getLogger(BgpExtendedCommunity.class);
public static final short TYPE = Constants.BGP_EXTENDED_COMMUNITY;
public static final byte FLAGS = (byte) 0xC0;
private BgpValueType fsActionTlv;
private List<BgpValueType> fsActionTlv;
/**
* Constructor to initialize the value.
*
* @param fsActionTlv flow specification action type
*/
public BgpExtendedCommunity(BgpValueType fsActionTlv) {
public BgpExtendedCommunity(List<BgpValueType> fsActionTlv) {
this.fsActionTlv = fsActionTlv;
}
......@@ -49,7 +53,7 @@ public class BgpExtendedCommunity implements BgpValueType {
*
* @return extended community
*/
public BgpValueType fsActionTlv() {
public List<BgpValueType> fsActionTlv() {
return this.fsActionTlv;
}
......@@ -64,7 +68,7 @@ public class BgpExtendedCommunity implements BgpValueType {
ChannelBuffer tempCb = cb.copy();
Validation validation = Validation.parseAttributeHeader(cb);
BgpValueType fsActionTlv = null;
List<BgpValueType> fsActionTlvs = new LinkedList<>();
if (cb.readableBytes() < validation.getLength()) {
Validation.validateLen(BgpErrorType.UPDATE_MESSAGE_ERROR, BgpErrorType.ATTRIBUTE_LENGTH_ERROR,
......@@ -80,9 +84,11 @@ public class BgpExtendedCommunity implements BgpValueType {
ChannelBuffer tempBuf = cb.readBytes(validation.getLength());
if (tempBuf.readableBytes() > 0) {
BgpValueType fsActionTlv = null;
ChannelBuffer actionBuf = tempBuf.readBytes(validation.getLength());
while (actionBuf.readableBytes() > 0) {
short actionType = actionBuf.readShort();
short length = (short) validation.getLength();
switch (actionType) {
case Constants.BGP_FLOWSPEC_ACTION_TRAFFIC_ACTION:
fsActionTlv = BgpFsActionTrafficAction.read(actionBuf);
......@@ -100,7 +106,11 @@ public class BgpExtendedCommunity implements BgpValueType {
break;
}
}
return new BgpExtendedCommunity(fsActionTlv);
if (fsActionTlv != null) {
fsActionTlvs.add(fsActionTlv);
}
}
return new BgpExtendedCommunity(fsActionTlvs);
}
@Override
......@@ -136,25 +146,30 @@ public class BgpExtendedCommunity implements BgpValueType {
@Override
public int write(ChannelBuffer cb) {
int iLenStartIndex = cb.writerIndex();
ListIterator<BgpValueType> listIterator = fsActionTlv().listIterator();
cb.writeByte(FLAGS);
cb.writeByte(getType());
int iActionLenIndex = cb.writerIndex();
cb.writeByte(0);
if (fsActionTlv.getType() == Constants.BGP_FLOWSPEC_ACTION_TRAFFIC_ACTION) {
BgpFsActionTrafficAction trafficAction = (BgpFsActionTrafficAction) fsActionTlv;
while (listIterator.hasNext()) {
BgpValueType fsTlv = listIterator.next();
if (fsTlv.getType() == Constants.BGP_FLOWSPEC_ACTION_TRAFFIC_ACTION) {
BgpFsActionTrafficAction trafficAction = (BgpFsActionTrafficAction) fsTlv;
trafficAction.write(cb);
} else if (fsActionTlv.getType() == Constants.BGP_FLOWSPEC_ACTION_TRAFFIC_MARKING) {
BgpFsActionTrafficMarking trafficMarking = (BgpFsActionTrafficMarking) fsActionTlv;
} else if (fsTlv.getType() == Constants.BGP_FLOWSPEC_ACTION_TRAFFIC_MARKING) {
BgpFsActionTrafficMarking trafficMarking = (BgpFsActionTrafficMarking) fsTlv;
trafficMarking.write(cb);
} else if (fsActionTlv.getType() == Constants.BGP_FLOWSPEC_ACTION_TRAFFIC_RATE) {
BgpFsActionTrafficRate trafficRate = (BgpFsActionTrafficRate) fsActionTlv;
} else if (fsTlv.getType() == Constants.BGP_FLOWSPEC_ACTION_TRAFFIC_RATE) {
BgpFsActionTrafficRate trafficRate = (BgpFsActionTrafficRate) fsTlv;
trafficRate.write(cb);
} else if (fsActionTlv.getType() == Constants.BGP_FLOWSPEC_ACTION_TRAFFIC_REDIRECT) {
BgpFsActionReDirect trafficRedirect = (BgpFsActionReDirect) fsActionTlv;
} else if (fsTlv.getType() == Constants.BGP_FLOWSPEC_ACTION_TRAFFIC_REDIRECT) {
BgpFsActionReDirect trafficRedirect = (BgpFsActionReDirect) fsTlv;
trafficRedirect.write(cb);
}
}
int fsActionLen = cb.writerIndex() - iActionLenIndex;
cb.setByte(iActionLenIndex, (byte) (fsActionLen - 1));
......
......@@ -54,21 +54,29 @@ public class BgpFlowSpecDetailsTest {
operatorValue1.add(new BgpFsOperatorValue((byte) 0x81, port1));
byte[] port11 = new byte[] {(byte) 0x1 };
operatorValue1.add(new BgpFsOperatorValue((byte) 0x82, port11));
flowSpecDetails1.setFsActionTlv(new BgpFsActionTrafficRate((short) 1, 1));
List<BgpValueType> fsTlvs1 = new LinkedList<>();
fsTlvs1.add(new BgpFsActionTrafficRate((short) 1, 1));
flowSpecDetails1.setFsActionTlv(fsTlvs1);
flowSpecComponents.add(portNum);
byte[] port = new byte[] {(byte) 0x1 };
operatorValue.add(new BgpFsOperatorValue((byte) 0x81, port));
byte[] port4 = new byte[] {(byte) 0x1 };
operatorValue.add(new BgpFsOperatorValue((byte) 0x82, port4));
flowSpecDetails.setFsActionTlv(new BgpFsActionTrafficRate((short) 1, 1));
List<BgpValueType> fsTlvs = new LinkedList<>();
fsTlvs.add(new BgpFsActionTrafficRate((short) 1, 1));
flowSpecComponents2.add(portNum2);
byte[] port2 = new byte[] {(byte) 0x1 };
operatorValue2.add(new BgpFsOperatorValue((byte) 0x82, port2));
byte[] port22 = new byte[] {(byte) 0x1 };
operatorValue2.add(new BgpFsOperatorValue((byte) 0x82, port22));
flowSpecDetails2.setFsActionTlv(new BgpFsActionTrafficRate((short) 1, 1));
List<BgpValueType> fsTlvs2 = new LinkedList<>();
fsTlvs2.add(new BgpFsActionTrafficRate((short) 1, 1));
flowSpecDetails2.setFsActionTlv(fsTlvs2);
new EqualsTester()
.addEqualityGroup(flowSpecDetails1, flowSpecDetails)
......
......@@ -252,8 +252,20 @@ public class BgpPeerImpl implements BgpPeer {
if (operType == FlowSpecOperation.ADD) {
if (flowSpec.routeDistinguisher() == null) {
if (flowSpecRibOut.flowSpecTree().containsKey(prefix)) {
sendFlowSpecUpdateMessageToPeer(FlowSpecOperation.DELETE,
flowSpecRibOut.flowSpecTree().get(prefix));
}
flowSpecRibOut.add(prefix, flowSpec);
} else {
if (vpnFlowSpecRibOut.vpnFlowSpecTree().containsKey(flowSpec.routeDistinguisher())) {
Map<BgpFlowSpecPrefix, BgpFlowSpecDetails> fsTree;
fsTree = vpnFlowSpecRibOut.vpnFlowSpecTree().get(flowSpec.routeDistinguisher());
if (fsTree.containsKey(prefix)) {
sendFlowSpecUpdateMessageToPeer(FlowSpecOperation.DELETE,
fsTree.get(prefix));
}
}
vpnFlowSpecRibOut.add(flowSpec.routeDistinguisher(), prefix, flowSpec);
}
} else if (operType == FlowSpecOperation.DELETE) {
......