Merge pull request #6 from noironetworks/mchalla-ganga

Rule priority incorrect for opflex trunk ports.
noironetworks · Oct 25, 2018 · d7800a5 · d7800a5
2 parents bcd1910 + 8a57a47
commit d7800a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/agent-ovs/ovs/AccessFlowManager.cpp b/agent-ovs/ovs/AccessFlowManager.cpp
@@ -136,7 +136,12 @@ static void flowBypassDhcpRequest(FlowEntryList& el, bool v4, uint32_t inport,
                                   uint32_t outport,
                                   std::shared_ptr<const Endpoint>& ep ) {
     FlowBuilder fb;
-    fb.priority(200).inPort(inport);
+    if (ep->getAccessIfaceVlan()) {
+        fb.priority(201).inPort(inport);
+    } else {
+        fb.priority(200).inPort(inport);
+    }
+
     flowutils::match_dhcp_req(fb, v4);
     fb.action().reg(MFF_REG7, outport);
 

diff --git a/agent-ovs/ovs/test/AccessFlowManager_test.cpp b/agent-ovs/ovs/test/AccessFlowManager_test.cpp
@@ -338,7 +338,7 @@ void AccessFlowManagerFixture::initExpDhcpEp(shared_ptr<Endpoint>& ep) {
     initExpEp(ep);
     if (ep->getDHCPv4Config()) {
         ADDF(Bldr()
-             .table(GRP).priority(200).udp().in(access)
+             .table(GRP).priority(ep->getAccessIfaceVlan() ? 201 : 200).udp().in(access)
              .isVlan(ep->getAccessIfaceVlan().get())
              .isTpSrc(68).isTpDst(67)
              .actions()
@@ -348,7 +348,7 @@ void AccessFlowManagerFixture::initExpDhcpEp(shared_ptr<Endpoint>& ep) {
     }
     if (ep->getDHCPv6Config()) {
         ADDF(Bldr()
-             .table(GRP).priority(200).udp6().in(access)
+             .table(GRP).priority(ep->getAccessIfaceVlan() ? 201 : 200).udp6().in(access)
              .isVlan(ep->getAccessIfaceVlan().get())
              .isTpSrc(546).isTpDst(547)
              .actions()