X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=openstack%2Fnet-virt-providers%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Fopenstack%2Fnetvirt%2Fproviders%2Fopenflow13%2Fservices%2FEgressAclService.java;h=32435ae336e17cbd8e06816ec28745eeefb72407;hb=fa2a2215478e20e31842338cb8a8bf919b220a33;hp=db03e23035de9a25dfaebe50b31fdb0db806d95d;hpb=92d8401231b863f1ff534c087bf6ff4844f20917;p=ovsdb.git diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java index db03e2303..32435ae33 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java @@ -315,7 +315,8 @@ public class EgressAclService extends AbstractServiceInstance implements EgressA NodeBuilder nodeBuilder = createNodeBuilder(nodeName); String flowName = "Egress_Fixed_Conntrk_Untrk_" + segmentationId + "_" + localPort + "_"; matchBuilder = MatchUtils.createV4EtherMatchWithType(matchBuilder, attachMac, null); - matchBuilder = MatchUtils.addCtState(matchBuilder,0x00,0X80); + matchBuilder = MatchUtils.addCtState(matchBuilder,MatchUtils.UNTRACKED_CT_STATE, + MatchUtils.UNTRACKED_CT_STATE_MASK); FlowBuilder flowBuilder = new FlowBuilder(); flowBuilder.setMatch(matchBuilder.build()); FlowUtils.initFlowBuilder(flowBuilder, flowName, getTable()).setPriority(priority); @@ -351,7 +352,8 @@ public class EgressAclService extends AbstractServiceInstance implements EgressA NodeBuilder nodeBuilder = createNodeBuilder(nodeName); String flowName = "Egress_Fixed_Conntrk_TrkEst_" + segmentationId + "_" + localPort + "_"; matchBuilder = MatchUtils.createInPortMatch(matchBuilder, dpid, localPort); - matchBuilder = MatchUtils.addCtState(matchBuilder,0x82, 0x82); + matchBuilder = MatchUtils.addCtState(matchBuilder,MatchUtils.TRACKED_EST_CT_STATE, + MatchUtils.TRACKED_EST_CT_STATE_MASK); FlowBuilder flowBuilder = new FlowBuilder(); flowBuilder.setMatch(matchBuilder.build()); FlowUtils.initFlowBuilder(flowBuilder, flowName, getTable()).setPriority(priority); @@ -379,7 +381,7 @@ public class EgressAclService extends AbstractServiceInstance implements EgressA NodeBuilder nodeBuilder = createNodeBuilder(nodeName); String flowName = "Egress_Fixed_Conntrk_NewDrop_" + segmentationId + "_" + localPort + "_"; matchBuilder = MatchUtils.createInPortMatch(matchBuilder, dpid, localPort); - matchBuilder = MatchUtils.addCtState(matchBuilder,0x01, 0x01); + matchBuilder = MatchUtils.addCtState(matchBuilder,MatchUtils.NEW_CT_STATE, MatchUtils.NEW_CT_STATE_MASK); FlowBuilder flowBuilder = new FlowBuilder(); flowBuilder.setMatch(matchBuilder.build()); FlowUtils.initFlowBuilder(flowBuilder, flowName, getTable()).setPriority(priority); @@ -817,7 +819,8 @@ public class EgressAclService extends AbstractServiceInstance implements EgressA boolean write, boolean drop, boolean isCtCommit) { MatchBuilder matchBuilder1 = matchBuilder; if (isCtCommit) { - matchBuilder1 = MatchUtils.addCtState(matchBuilder1,0x81, 0x81); + matchBuilder1 = MatchUtils.addCtState(matchBuilder1, MatchUtils.TRACKED_NEW_CT_STATE, + MatchUtils.TRACKED_NEW_CT_STATE_MASK); } FlowBuilder flowBuilder = new FlowBuilder(); flowBuilder.setMatch(matchBuilder1.build());