From: Sam Hague <shague@redhat.com>
Date: Sat, 26 May 2018 14:54:40 +0000 (-0400)
Subject: Update exception whitelist
X-Git-Tag: pre-potassium~783
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=8bed159f800d37bf959ba295a58f62803df76d40

Update exception whitelist

Change-Id: I58ee044c853cc36307993a5b27af47b101b803d4
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/csit/libraries/netvirt/excepts.py b/csit/libraries/netvirt/excepts.py
index 7c21fbed0c..f7897003c2 100644
--- a/csit/libraries/netvirt/excepts.py
+++ b/csit/libraries/netvirt/excepts.py
@@ -92,7 +92,7 @@ _whitelist = [
     {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1270",
      "id": "ExecutionException",
      "context": [
-         "OptimisticLockFailedException: Optimistic lock failed.",
+         "OptimisticLockFailedException: Optimistic lock failed",
          "ConflictingModificationAppliedException: Node children was modified by other transaction",
          "removeOrUpdateVpnToDpnList: Error removing from dpnToVpnList for vpn "
      ]},
@@ -118,6 +118,18 @@ _whitelist = [
          "Got OptimisticLockFailedException", "NeutronNetwork [networkUUID=",
          "AbstractTranscriberInterface"
      ]},
+    {"issue": "https://jira.opendaylight.org/browse/NEUTRON-157",
+     "id": "ConflictingModificationAppliedException",
+     "context": [
+         "Got OptimisticLockFailedException",
+         "AbstractTranscriberInterface"
+     ]},
+    {"issue": "https://jira.opendaylight.org/browse/NEUTRON-157",
+     "id": "ConflictingModificationAppliedException",
+     "context": [
+         "Node was created by other transaction",
+         "Optimistic lock failed for path /(urn:opendaylight:neutron?revision=2015-07-12)neutron"
+     ]},
     # oxygen
     {"issue": "https://jira.opendaylight.org/browse/NEUTRON-157",
      "id": "ConflictingModificationAppliedException",