From cc90a0c8ecb14bd69f6186c6e4fc9f6a82a2cbaf Mon Sep 17 00:00:00 2001
From: Roopa Prabhu <roopa@cumulusnetworks.com>
Date: Wed, 11 Jan 2017 19:58:02 -0800
Subject: [PATCH] Revert "addons: bridge: warn/err if bridge-access is missing
 under vxlan bridge VA port" This reverts commit
 4e2db079564a5055a03d2e7e97807b7956c6e110.

reverting because of some reported false errors.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
---
 addons/bridge.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/bridge.py b/addons/bridge.py
index 8908661..97ceb4b 100644
--- a/addons/bridge.py
+++ b/addons/bridge.py
@@ -962,7 +962,8 @@ class bridge(moduleBase):
 
         """
         if not isbridge and bportifaceobj.link_kind & ifaceLinkKind.VXLAN:
-            if (not vids or not pvid) or vids != pvid:
+            if ((not vids or not pvid)
+                    and not bportifaceobj.get_attr_value('bridge-access')):
                 self._error_vxlan_in_vlan_aware_br(bportifaceobj,
                                                    bportifaceobj.upperifaces[0])
                 return