import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatisticsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.config.stats.reply.MeterConfigStats;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.EthernetMatch;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.VlanMatch;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4Match;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.TcpMatch;
import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.GenericQueueStatistics;
import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.GenericStatistics;
import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData;
sucLogger.debug("Associated original flow is not found in data store. Augmenting flow in operational data store");
//TODO: Temporary fix: format [ 1+tableid+1+unaccounted flow counter]
long flowKey = Long.parseLong(new String("1"+Short.toString(tableId)+"1"+Integer.toString(this.unaccountedFlowsCounter)));
- FlowKey newFlowKey = new FlowKey(new FlowId(flowKey));
+ FlowKey newFlowKey = new FlowKey(new FlowId(Long.toString(flowKey)));
InstanceIdentifier<Flow> flowRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key)
.augmentation(FlowCapableNode.class)
.child(Table.class, new TableKey(tableId))
* _ethernetSource=EthernetSource [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]],
* _ethernetType=EthernetType [_type=EtherType [_value=2048], _mask=null, augmentation=[]]
*
- * So this custom equals method add additional check, in case any match element is null in data-store-flow, but not
+ * Similarly for inPort, if user/application don't set any value for it, FRM will store null value for it in data store.
+ * When we fetch the same flow (with its statistics) from switch, plugin converts its value to openflow:X:0.
+ * e.g _inPort=Uri [_value=openflow:1:0]
+ *
+ * So this custom equals method add additional check to take care of these scenario, in case any match element is null in data-store-flow, but not
* in the flow fetched from switch.
*
* @param statsFlow
* @param storedFlow
* @return
*/
+
public boolean matchEquals(Match statsFlow, Match storedFlow) {
if (statsFlow == storedFlow) {
return true;
}
if (storedFlow.getEthernetMatch() == null) {
if (statsFlow.getEthernetMatch() != null) {
- if(!statsFlow.getEthernetMatch().getEthernetDestination().getAddress().getValue().equals("00:00:00:00:00:00") ||
- !statsFlow.getEthernetMatch().getEthernetSource().getAddress().getValue().equals("00:00:00:00:00:00")){
- return false;
- }
+ return false;
}
- } //else if(!storedFlow.getEthernetMatch().equals(statsFlow.getEthernetMatch())) {
- else if(!EthernetMatchEquals(statsFlow.getEthernetMatch(),storedFlow.getEthernetMatch())) {
+ } else if(!storedFlow.getEthernetMatch().equals(statsFlow.getEthernetMatch())) {
return false;
}
if (storedFlow.getIcmpv4Match()== null) {
}
if (storedFlow.getLayer3Match()== null) {
if (statsFlow.getLayer3Match() != null) {
- Ipv4Match ipv4Match = (Ipv4Match)statsFlow.getLayer3Match();
- if(!ipv4Match.getIpv4Source().getValue().equals("0.0.0.0/0") ||
- !ipv4Match.getIpv4Destination().getValue().equals("0.0.0.0/0")){
return false;
- }
}
} else if(!storedFlow.getLayer3Match().equals(statsFlow.getLayer3Match())) {
return false;
}
if (storedFlow.getLayer4Match()== null) {
if (statsFlow.getLayer4Match() != null) {
- TcpMatch tcpMatch = (TcpMatch)statsFlow.getLayer4Match();
- if(!tcpMatch.getTcpDestinationPort().getValue().equals(0) ||
- !tcpMatch.getTcpSourcePort().getValue().equals(0)){
- return false;
- }
+ return false;
}
} else if(!storedFlow.getLayer4Match().equals(statsFlow.getLayer4Match())) {
return false;
}
if (storedFlow.getVlanMatch()== null) {
if (statsFlow.getVlanMatch() != null) {
- VlanMatch vlanMatch = statsFlow.getVlanMatch();
- if(!vlanMatch.getVlanId().getVlanId().getValue().equals(0) ||
- !vlanMatch.getVlanPcp().getValue().equals((short)0)){
- return false;
- }
+ return false;
}
} else if(!storedFlow.getVlanMatch().equals(statsFlow.getVlanMatch())) {
return false;
}
return true;
}
-
- public boolean EthernetMatchEquals(EthernetMatch statsEtherMatch, EthernetMatch storedEtherMatch) {
- if (statsEtherMatch == storedEtherMatch) {
- return true;
- }
- if (storedEtherMatch.getEthernetDestination()== null) {
- if (statsEtherMatch.getEthernetDestination() != null) {
- if(!statsEtherMatch.getEthernetDestination().getAddress().getValue().equals("00:00:00:00:00:00")){
- return false;
- }
- }
- } else if(!storedEtherMatch.getEthernetDestination().equals(statsEtherMatch.getEthernetDestination())) {
- return false;
- }
- if (storedEtherMatch.getEthernetSource() == null) {
- if (statsEtherMatch.getEthernetSource() != null) {
- if(!statsEtherMatch.getEthernetSource().getAddress().getValue().equals("00:00:00:00:00:00")){
- return false;
- }
- }
- } else if(!storedEtherMatch.getEthernetSource().equals(statsEtherMatch.getEthernetSource())) {
- return false;
- }
- if (storedEtherMatch.getEthernetType() == null) {
- if (statsEtherMatch.getEthernetType() != null) {
- if(!statsEtherMatch.getEthernetType().getType().getValue().equals(0)){
- return false;
- }
- }
- } else if(!storedEtherMatch.getEthernetType().equals(statsEtherMatch.getEthernetType())) {
- return false;
- }
- return true;
- }
}