package org.opendaylight.ovsdb.openstack.netvirt.sfc.workaround.services;
import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.CheckedFuture;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
import org.opendaylight.ovsdb.openstack.netvirt.providers.ConfigInterface;
import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.AbstractServiceInstance;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowCookie;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.OutputPortValues;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.InstructionsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.EtherType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxRegCaseBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
public class SfcClassifierService extends AbstractServiceInstance implements ConfigInterface, ISfcClassifierService {
private static final Logger LOG = LoggerFactory.getLogger(SfcClassifierService.class);
- private static final short TABLE_0 = 0;
private static final short UDP_SHORT = 17;
- private static int cookieCounter = 0;
- private static final int FLOW_INGRESSCLASS = 1;
- private static final int FLOW_SFINGRESS = 2;
- private static final int FLOW_SFEGRESS = 3;
- private static final int FLOW_SFARP = 4;
- private static final int FLOW_EGRESSCLASS1 = 5;
- private static final int FLOW_EGRESSCLASS2 = 6;
- private static final int FLOW_SFCTABLE = 7;
+ static int cookieIndex = 0;
+ private FlowCache flowCache = new FlowCache();
+
+ private enum FlowID {
+ FLOW_INGRESSCLASS(1), FLOW_SFINGRESS(2), FLOW_SFEGRESS(3), FLOW_SFARP(4),
+ FLOW_EGRESSCLASSUNUSED(5), FLOW_EGRESSCLASS(6), FLOW_EGRESSCLASSBYPASS(7), FLOW_SFCTABLE(8);
+
+ private int value;
+ FlowID(int value) {
+ this.value = value;
+ }
+ }
+
+ private BigInteger getCookie(FlowID flowID) {
+ String cookieString = String.format("1110%02d%010d", flowID.value, cookieIndex++);
+ return new BigInteger(cookieString, 16);
+ }
+
+ private BigInteger getCookie(FlowID flowID, short nsp, short nsi) {
+ String cookieString = String.format("1110%02d%03d%03d0%03d", flowID.value, 0, nsp, nsi);
+ return new BigInteger(cookieString, 16);
+ }
public SfcClassifierService(Service service) {
super(service);
@Override
public void setDependencies(Object impl) {}
- private BigInteger getCookie(int index) {
- String indexString = new String().format("%02d0000000000%04d", index, cookieCounter++);
- return new BigInteger(indexString, 16);
+ private FlowBuilder initFlowBuilder(FlowBuilder flowBuilder, String flowName, short table, FlowID flowID) {
+ FlowUtils.initFlowBuilder(flowBuilder, flowName, table)
+ .setCookie(new FlowCookie(getCookie(flowID)))
+ .setCookieMask(new FlowCookie(getCookie(flowID)));
+ return flowBuilder;
+ }
+
+ private FlowBuilder initFlowBuilder(FlowBuilder flowBuilder, String flowName, short table, FlowID flowID,
+ short nsp, short nsi) {
+ FlowUtils.initFlowBuilder(flowBuilder, flowName, table)
+ .setCookie(new FlowCookie(getCookie(flowID, nsp, nsi)))
+ .setCookieMask(new FlowCookie(getCookie(flowID, nsp, nsi)));
+ return flowBuilder;
+ }
+
+ private void writeFlow(FlowBuilder flowBuilder, NodeBuilder nodeBuilder, String rspName, FlowID flowID) {
+ flowCache.addFlow(flowBuilder, nodeBuilder, rspName, flowID.value);
+ writeFlow(flowBuilder, nodeBuilder);
+ }
+
+ private void removeFlow(FlowBuilder flowBuilder, NodeBuilder nodeBuilder, String rspName, FlowID flowID) {
+ flowCache.removeFlow(rspName, flowID.value);
+ removeFlow(flowBuilder, nodeBuilder);
}
@Override
- public void programIngressClassifier(long dataPathId, String ruleName, Matches matches,
- NshUtils nshHeader, long vxGpeOfPort, boolean write) {
+ public void programIngressClassifier(long dataPathId, String ruleName, Matches matches, long nsp, short nsi,
+ NshUtils nshHeader, long vxGpeOfPort, String rspName, boolean write) {
NodeBuilder nodeBuilder = FlowUtils.createNodeBuilder(dataPathId);
FlowBuilder flowBuilder = new FlowBuilder();
+ String flowName = FlowNames.getSfcIngressClass(ruleName, nsp, nsi);
+ initFlowBuilder(flowBuilder, flowName, getTable(), FlowID.FLOW_INGRESSCLASS,
+ (short)nshHeader.getNshNsp(), nshHeader.getNshNsi());
- MatchBuilder matchBuilder = buildMatch(matches);
- flowBuilder.setMatch(MatchUtils.addNxRegMatch(
- matchBuilder,
- new MatchUtils.RegMatch(FlowUtils.REG_FIELD, FlowUtils.REG_VALUE_FROM_LOCAL)).build());
-
- String flowId = "sfcIngressClass_" + ruleName;// + "_" + nshHeader.getNshNsp();
- flowBuilder.setId(new FlowId(flowId));
- FlowKey key = new FlowKey(new FlowId(flowId));
- flowBuilder.setBarrier(true);
- flowBuilder.setTableId(getTable());
- flowBuilder.setKey(key);
- flowBuilder.setFlowName(flowId);
- flowBuilder.setHardTimeout(0);
- flowBuilder.setIdleTimeout(0);
- flowBuilder.setCookie(new FlowCookie(getCookie(FLOW_INGRESSCLASS)));
- flowBuilder.setCookieMask(new FlowCookie(getCookie(FLOW_INGRESSCLASS)));
+ MatchBuilder matchBuilder = new AclMatches(matches).buildMatch();
+ MatchUtils.addNxRegMatch(matchBuilder,
+ MatchUtils.RegMatch.of(FlowUtils.REG_FIELD, FlowUtils.REG_VALUE_FROM_LOCAL));
+ flowBuilder.setMatch(matchBuilder.build());
if (write) {
ActionBuilder ab = new ActionBuilder();
InstructionsBuilder isb = new InstructionsBuilder();
isb.setInstruction(instructions);
flowBuilder.setInstructions(isb.build());
- writeFlow(flowBuilder, nodeBuilder);
+ writeFlow(flowBuilder, nodeBuilder, rspName, FlowID.FLOW_INGRESSCLASS);
} else {
- removeFlow(flowBuilder, nodeBuilder);
+ removeFlow(flowBuilder, nodeBuilder, rspName, FlowID.FLOW_INGRESSCLASS);
}
}
public void programSfcTable(long dataPathId, long vxGpeOfPort, short goToTableId, boolean write) {
NodeBuilder nodeBuilder = FlowUtils.createNodeBuilder(dataPathId);
FlowBuilder flowBuilder = new FlowBuilder();
+ String flowName = FlowNames.getSfcTable(vxGpeOfPort);
+ initFlowBuilder(flowBuilder, flowName, getTable(Service.CLASSIFIER), FlowID.FLOW_SFCTABLE)
+ .setPriority(1000);
MatchBuilder matchBuilder = new MatchBuilder();
- flowBuilder.setMatch(MatchUtils.createInPortMatch(matchBuilder, dataPathId, vxGpeOfPort).build());
-
- String flowId = "sfcTable_" + vxGpeOfPort;
- flowBuilder.setId(new FlowId(flowId));
- FlowKey key = new FlowKey(new FlowId(flowId));
- flowBuilder.setBarrier(true);
- flowBuilder.setTableId(TABLE_0);
- flowBuilder.setKey(key);
- flowBuilder.setFlowName(flowId);
- flowBuilder.setHardTimeout(0);
- flowBuilder.setIdleTimeout(0);
- flowBuilder.setPriority(1000);
- flowBuilder.setCookie(new FlowCookie(getCookie(FLOW_SFCTABLE)));
- flowBuilder.setCookieMask(new FlowCookie(getCookie(FLOW_SFCTABLE)));
+ MatchUtils.createInPortMatch(matchBuilder, dataPathId, vxGpeOfPort);
+ flowBuilder.setMatch(matchBuilder.build());
if (write) {
InstructionsBuilder isb = new InstructionsBuilder();
int tunnelOfPort, int tunnelId, short gotoTableId, boolean write) {
NodeBuilder nodeBuilder = FlowUtils.createNodeBuilder(dataPathId);
FlowBuilder flowBuilder = new FlowBuilder();
+ String flowName = FlowNames.getSfcEgressClass1(vxGpeOfPort);
+ initFlowBuilder(flowBuilder, flowName, getTable(Service.CLASSIFIER), FlowID.FLOW_EGRESSCLASSUNUSED,
+ (short)nsp, nsi);
MatchBuilder matchBuilder = new MatchBuilder();
MatchUtils.createInPortMatch(matchBuilder, dataPathId, vxGpeOfPort);
MatchUtils.addNxNspMatch(matchBuilder, nsp);
- flowBuilder.setMatch(MatchUtils.addNxNsiMatch(matchBuilder, nsi).build());
-
- String flowId = "sfcEgressClass1_" + vxGpeOfPort;
- flowBuilder.setId(new FlowId(flowId));
- FlowKey key = new FlowKey(new FlowId(flowId));
- flowBuilder.setBarrier(true);
- flowBuilder.setTableId(TABLE_0);
- flowBuilder.setKey(key);
- flowBuilder.setFlowName(flowId);
- flowBuilder.setHardTimeout(0);
- flowBuilder.setIdleTimeout(0);
- flowBuilder.setCookie(new FlowCookie(getCookie(FLOW_EGRESSCLASS1)));
- flowBuilder.setCookieMask(new FlowCookie(getCookie(FLOW_EGRESSCLASS1)));
+ MatchUtils.addNxNsiMatch(matchBuilder, nsi);
+ flowBuilder.setMatch(matchBuilder.build());
if (write) {
InstructionsBuilder isb = new InstructionsBuilder();
List<Instruction> instructions = Lists.newArrayList();
- InstructionBuilder ib = new InstructionBuilder();
-
- /*List<Action> actionList = Lists.newArrayList();
-
- ActionBuilder ab = new ActionBuilder();
- ab.setAction(ActionUtils.nxMoveNshc2ToTunId());
- ab.setOrder(0);
- ab.setKey(new ActionKey(0));
- actionList.add(ab.build());
-
- ApplyActionsBuilder aab = new ApplyActionsBuilder();
- aab.setAction(actionList);
- ib.setInstruction(new ApplyActionsCaseBuilder().setApplyActions(aab.build()).build());
-
- ib.setOrder(instructions.size());
- ib.setKey(new InstructionKey(instructions.size()));
- instructions.add(ib.build());*/
- ib = InstructionUtils.createGotoTableInstructions(new InstructionBuilder(), getTable());
+ InstructionBuilder ib = InstructionUtils.createGotoTableInstructions(new InstructionBuilder(), getTable());
ib.setOrder(instructions.size());
ib.setKey(new InstructionKey(instructions.size()));
instructions.add(ib.build());
}
}
- // add 3: same match, add in_port sf, priority=40k, move c2 to tun_id, reg0-1, nsp=0,nsi=0
@Override
- public void programEgressClassifier2(long dataPathId, long vxGpeOfPort, long nsp, short nsi,
- int tunnelOfPort, int tunnelId, boolean write) {
+ public void programEgressClassifier(long dataPathId, long vxGpeOfPort, long nsp, short nsi,
+ long sfOfPort, int tunnelId, String rspName, boolean write) {
NodeBuilder nodeBuilder = FlowUtils.createNodeBuilder(dataPathId);
FlowBuilder flowBuilder = new FlowBuilder();
+ String flowName = FlowNames.getSfcEgressClass(vxGpeOfPort, nsp, nsi);
+ initFlowBuilder(flowBuilder, flowName, getTable(Service.SFC_CLASSIFIER), FlowID.FLOW_EGRESSCLASS,
+ (short)nsp, nsi);
MatchBuilder matchBuilder = new MatchBuilder();
MatchUtils.createInPortMatch(matchBuilder, dataPathId, vxGpeOfPort);
- MatchUtils.addNxRegMatch(matchBuilder,
- new MatchUtils.RegMatch(FlowUtils.REG_FIELD, FlowUtils.REG_VALUE_FROM_LOCAL)).build();
MatchUtils.addNxNspMatch(matchBuilder, nsp);
- flowBuilder.setMatch(MatchUtils.addNxNsiMatch(matchBuilder, nsi).build());
-
- String flowId = "sfcEgressClass2_" + vxGpeOfPort;
- flowBuilder.setId(new FlowId(flowId));
- FlowKey key = new FlowKey(new FlowId(flowId));
- flowBuilder.setBarrier(true);
- flowBuilder.setTableId(getTable());
- flowBuilder.setKey(key);
- flowBuilder.setFlowName(flowId);
- flowBuilder.setHardTimeout(0);
- flowBuilder.setIdleTimeout(0);
- flowBuilder.setCookie(new FlowCookie(getCookie(FLOW_EGRESSCLASS2)));
- flowBuilder.setCookieMask(new FlowCookie(getCookie(FLOW_EGRESSCLASS2)));
+ MatchUtils.addNxNsiMatch(matchBuilder, nsi);
+ flowBuilder.setMatch(matchBuilder.build());
if (write) {
InstructionsBuilder isb = new InstructionsBuilder();
ActionBuilder ab = new ActionBuilder();
- // don't do this, need it to match on the resubmit side and get past table 10 so it isn't reclassified
- //ab.setAction(ActionUtils.nxSetNspAction((long)(0)));
- //ab.setOrder(0);
- //ab.setKey(new ActionKey(0));
- //actionList.add(ab.build());
+ ab.setAction(
+ ActionUtils.nxLoadRegAction(new DstNxRegCaseBuilder().setNxReg(FlowUtils.REG_FIELD).build(),
+ BigInteger.valueOf(FlowUtils.REG_VALUE_FROM_LOCAL)));
+ ab.setOrder(actionList.size());
+ ab.setKey(new ActionKey(actionList.size()));
+ actionList.add(ab.build());
- ab.setAction(ActionUtils.nxResubmitAction(tunnelOfPort, TABLE_0));
+ ab.setAction(ActionUtils.nxMoveNshc2ToTunId());
+ ab.setOrder(actionList.size());
+ ab.setKey(new ActionKey(actionList.size()));
+ actionList.add(ab.build());
+
+ ab.setAction(ActionUtils.nxResubmitAction((int)sfOfPort, getTable(Service.CLASSIFIER)));
ab.setOrder(actionList.size());
ab.setKey(new ActionKey(actionList.size()));
actionList.add(ab.build());
isb.setInstruction(instructions);
flowBuilder.setInstructions(isb.build());
- writeFlow(flowBuilder, nodeBuilder);
+ writeFlow(flowBuilder, nodeBuilder, rspName, FlowID.FLOW_EGRESSCLASS);
+ } else {
+ removeFlow(flowBuilder, nodeBuilder, rspName, FlowID.FLOW_EGRESSCLASS);
+ }
+ }
+
+ @Override
+ public void programEgressClassifierBypass(long dataPathId, long vxGpeOfPort, long nsp, short nsi,
+ long sfOfPort, int tunnelId, String rspName, boolean write) {
+ NodeBuilder nodeBuilder = FlowUtils.createNodeBuilder(dataPathId);
+ FlowBuilder flowBuilder = new FlowBuilder();
+ String flowName = FlowNames.getSfcEgressClassBypass(nsp, nsi, sfOfPort);
+ initFlowBuilder(flowBuilder, flowName, getTable(Service.CLASSIFIER),
+ FlowID.FLOW_EGRESSCLASSBYPASS, (short)nsp, nsi)
+ .setPriority(40000);
+
+ MatchBuilder matchBuilder = new MatchBuilder();
+ MatchUtils.createInPortMatch(matchBuilder, dataPathId, sfOfPort);
+ MatchUtils.addNxRegMatch(matchBuilder,
+ MatchUtils.RegMatch.of(FlowUtils.REG_FIELD, FlowUtils.REG_VALUE_FROM_LOCAL));
+ MatchUtils.addNxNspMatch(matchBuilder, nsp);
+ MatchUtils.addNxNsiMatch(matchBuilder, nsi);
+ flowBuilder.setMatch(matchBuilder.build());
+
+ if (write) {
+ InstructionsBuilder isb = new InstructionsBuilder();
+ List<Instruction> instructions = Lists.newArrayList();
+
+ InstructionBuilder ib;
+ ib = this.getMutablePipelineInstructionBuilder();
+ ib.setOrder(0);
+ ib.setKey(new InstructionKey(0));
+ instructions.add(ib.build());
+ isb.setInstruction(instructions);
+ flowBuilder.setInstructions(isb.build());
+ writeFlow(flowBuilder, nodeBuilder, rspName, FlowID.FLOW_EGRESSCLASSBYPASS);
} else {
- removeFlow(flowBuilder, nodeBuilder);
+ removeFlow(flowBuilder, nodeBuilder, rspName, FlowID.FLOW_EGRESSCLASSBYPASS);
}
}
public void program_sfEgress(long dataPathId, int dstPort, boolean write) {
NodeBuilder nodeBuilder = FlowUtils.createNodeBuilder(dataPathId);
FlowBuilder flowBuilder = new FlowBuilder();
+ String flowName = FlowNames.getSfEgress(dstPort);
+ initFlowBuilder(flowBuilder, flowName, getTable(), FlowID.FLOW_SFEGRESS);
MatchBuilder matchBuilder = new MatchBuilder();
MatchUtils.createIpProtocolMatch(matchBuilder, UDP_SHORT);
MatchUtils.addLayer4Match(matchBuilder, UDP_SHORT, 0, dstPort);
- flowBuilder.setMatch(MatchUtils.addNxRegMatch(
- matchBuilder, new MatchUtils.RegMatch(FlowUtils.REG_FIELD, FlowUtils.REG_VALUE_FROM_LOCAL)).build());
-
- String flowId = "sfEgress_" + dstPort;
- flowBuilder.setId(new FlowId(flowId));
- FlowKey key = new FlowKey(new FlowId(flowId));
- flowBuilder.setBarrier(true);
- flowBuilder.setTableId(getTable());
- flowBuilder.setKey(key);
- flowBuilder.setFlowName(flowId);
- flowBuilder.setHardTimeout(0);
- flowBuilder.setIdleTimeout(0);
- flowBuilder.setCookie(new FlowCookie(getCookie(FLOW_SFEGRESS)));
- flowBuilder.setCookieMask(new FlowCookie(getCookie(FLOW_SFEGRESS)));
+ MatchUtils.addNxRegMatch(matchBuilder,
+ MatchUtils.RegMatch.of(FlowUtils.REG_FIELD, FlowUtils.REG_VALUE_FROM_LOCAL));
+ flowBuilder.setMatch(matchBuilder.build());
if (write) {
InstructionBuilder ib = new InstructionBuilder();
String ipAddress, String sfDplName, boolean write) {
NodeBuilder nodeBuilder = FlowUtils.createNodeBuilder(dataPathId);
FlowBuilder flowBuilder = new FlowBuilder();
+ String flowName = FlowNames.getSfIngress(dstPort, ipAddress);
+ initFlowBuilder(flowBuilder, flowName, Service.CLASSIFIER.getTable(), FlowID.FLOW_SFINGRESS);
MatchBuilder matchBuilder = new MatchBuilder();
MatchUtils.createIpProtocolMatch(matchBuilder, UDP_SHORT);
Ipv4Prefix ipCidr = MatchUtils.iPv4PrefixFromIPv4Address(ipAddress);
MatchUtils.createDstL3IPv4Match(matchBuilder, new Ipv4Prefix(ipCidr));
- flowBuilder.setMatch(MatchUtils.addLayer4Match(matchBuilder, UDP_SHORT, 0, dstPort).build());
-
- String flowId = "sfIngress_" + dstPort + "_" + ipAddress;
- flowBuilder.setId(new FlowId(flowId));
- FlowKey key = new FlowKey(new FlowId(flowId));
- flowBuilder.setBarrier(true);
- flowBuilder.setTableId(TABLE_0);
- flowBuilder.setKey(key);
- flowBuilder.setFlowName(flowId);
- flowBuilder.setHardTimeout(0);
- flowBuilder.setIdleTimeout(0);
- flowBuilder.setCookie(new FlowCookie(getCookie(FLOW_SFINGRESS)));
- flowBuilder.setCookieMask(new FlowCookie(getCookie(FLOW_SFINGRESS)));
+ MatchUtils.addLayer4Match(matchBuilder, UDP_SHORT, 0, dstPort);
+ flowBuilder.setMatch(matchBuilder.build());
if (write) {
InstructionBuilder ib = new InstructionBuilder();
@Override
public void programStaticArpEntry(long dataPathId, long ofPort, String macAddressStr,
- String ipAddress, boolean write) {
+ String ipAddress, String rspName, boolean write) {
NodeBuilder nodeBuilder = FlowUtils.createNodeBuilder(dataPathId);
FlowBuilder flowBuilder = new FlowBuilder();
+ String flowName = FlowNames.getArpResponder(ipAddress);
+ initFlowBuilder(flowBuilder, flowName, getTable(Service.ARP_RESPONDER), FlowID.FLOW_SFARP)
+ .setPriority(1024);
MacAddress macAddress = new MacAddress(macAddressStr);
MatchBuilder matchBuilder = new MatchBuilder();
+ MatchUtils.createInPortReservedMatch(matchBuilder, dataPathId, OutputPortValues.LOCAL.toString());
MatchUtils.createEtherTypeMatch(matchBuilder, new EtherType(Constants.ARP_ETHERTYPE));
MatchUtils.createArpDstIpv4Match(matchBuilder, MatchUtils.iPv4PrefixFromIPv4Address(ipAddress));
flowBuilder.setMatch(matchBuilder.build());
- String flowId = "ArpResponder_" + ipAddress;
- flowBuilder.setId(new FlowId(flowId));
- FlowKey key = new FlowKey(new FlowId(flowId));
- flowBuilder.setBarrier(true);
- flowBuilder.setTableId(TABLE_0);
- flowBuilder.setKey(key);
- flowBuilder.setPriority(1024);
- flowBuilder.setFlowName(flowId);
- flowBuilder.setHardTimeout(0);
- flowBuilder.setIdleTimeout(0);
- flowBuilder.setCookie(new FlowCookie(getCookie(FLOW_SFARP)));
- flowBuilder.setCookieMask(new FlowCookie(getCookie(FLOW_SFARP)));
-
- if (write == true) {
+ if (write) {
InstructionBuilder ib = new InstructionBuilder();
InstructionsBuilder isb = new InstructionsBuilder();
List<Instruction> instructions = Lists.newArrayList();
actionList.add(ab.build());
// Set ARP OP
- ab.setAction(ActionUtils.nxLoadArpOpAction(BigInteger.valueOf(0x02L)));
+ ab.setAction(ActionUtils.nxLoadArpOpAction(BigInteger.valueOf(FlowUtils.ARP_OP_REPLY)));
ab.setOrder(2);
ab.setKey(new ActionKey(2));
actionList.add(ab.build());
isb.setInstruction(instructions);
flowBuilder.setInstructions(isb.build());
- writeFlow(flowBuilder, nodeBuilder);
+ writeFlow(flowBuilder, nodeBuilder, rspName, FlowID.FLOW_SFARP);
} else {
- removeFlow(flowBuilder, nodeBuilder);
+ removeFlow(flowBuilder, nodeBuilder, rspName, FlowID.FLOW_SFARP);
}
}
// Build the Actions to Add the NSH Header
org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nshC1Load =
ActionUtils.nxLoadNshc1RegAction(header.getNshMetaC1());
- org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nshC2Load =
- ActionUtils.nxLoadNshc2RegAction(header.getNshMetaC2());
org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nspLoad =
ActionUtils.nxSetNspAction(header.getNshNsp());
org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nsiLoad =
int count = actionList.size();
actionList.add(new ActionBuilder()
.setKey(new ActionKey(count)).setOrder(count++).setAction(nshC1Load).build());
- //actionList.add(new ActionBuilder()
- // .setKey(new ActionKey(count)).setOrder(count++).setAction(nshC2Load).build());
actionList.add(new ActionBuilder()
.setKey(new ActionKey(count)).setOrder(count++).setAction(nspLoad).build());
actionList.add(new ActionBuilder()
return actionList;
}
- public MatchBuilder buildMatch(Matches matches) {
- MatchBuilder matchBuilder = new MatchBuilder();
+ private static FlowID flowSet[] = {FlowID.FLOW_INGRESSCLASS, FlowID.FLOW_EGRESSCLASS,
+ FlowID.FLOW_EGRESSCLASSBYPASS, FlowID.FLOW_SFARP};
- if (matches.getAceType() instanceof AceIp) {
- AceIp aceIp = (AceIp)matches.getAceType();
- if (aceIp.getAceIpVersion() instanceof AceIpv4) {
- //AceIpv4 aceIpv4 = (AceIpv4) aceIp.getAceIpVersion();
- //MatchUtils.createSrcL3IPv4Match(matchBuilder, aceIpv4.getSourceIpv4Network());
- //MatchUtils.createDstL3IPv4Match(matchBuilder, aceIpv4.getDestinationIpv4Network());
- MatchUtils.createIpProtocolMatch(matchBuilder, aceIp.getProtocol());
- MatchUtils.addLayer4Match(matchBuilder, aceIp.getProtocol().intValue(), 0,
- aceIp.getDestinationPortRange().getLowerPort().getValue().intValue());
- } else {
- MatchUtils.createIpProtocolMatch(matchBuilder, aceIp.getProtocol());
- MatchUtils.addLayer4Match(matchBuilder, aceIp.getProtocol().intValue(), 0,
- aceIp.getDestinationPortRange().getLowerPort().getValue().intValue());
+ @Override
+ public void clearFlows(DataBroker dataBroker, String rspName) {
+ Map<Integer, InstanceIdentifier<Flow>> flowMap = flowCache.getFlows(rspName);
+ if (flowMap != null) {
+ for (FlowID flowID : flowSet) {
+ InstanceIdentifier<Flow> path = flowMap.get(flowID.value);
+ if (path != null) {
+ flowCache.removeFlow(rspName, flowID.value);
+ removeFlow(dataBroker, path);
+ }
}
- } else if (matches.getAceType() instanceof AceEth) {
- AceEth aceEth = (AceEth) matches.getAceType();
- MatchUtils.createEthSrcMatch(matchBuilder, new MacAddress(aceEth.getSourceMacAddress().getValue()));
- MatchUtils.createDestEthMatch(matchBuilder, new MacAddress(aceEth.getDestinationMacAddress().getValue()),
- new MacAddress(aceEth.getDestinationMacAddressMask().getValue()));
}
+ }
- LOG.info("buildMatch: {}", matchBuilder.build());
- return matchBuilder;
+ private void removeFlow(DataBroker dataBroker, InstanceIdentifier<Flow> path) {
+ WriteTransaction modification = dataBroker.newWriteOnlyTransaction();
+ modification.delete(LogicalDatastoreType.CONFIGURATION, path);
+
+ CheckedFuture<Void, TransactionCommitFailedException> commitFuture = modification.submit();
+ try {
+ commitFuture.get(); // TODO: Make it async (See bug 1362)
+ LOG.debug("Transaction success for deletion of Flow {}", path);
+ } catch (Exception e) {
+ LOG.error(e.getMessage(), e);
+ modification.cancel();
+ }
}
}
Code Review / netvirt.git / blobdiff