From: Sam Hague <shague@redhat.com>
Date: Fri, 25 May 2018 16:50:43 +0000 (-0400)
Subject: Update exceptions whitelist
X-Git-Tag: pre-potassium~784
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=952c1e824c2c29d589f5adb780a81005404cf3b7

Update exceptions whitelist

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

diff --git a/csit/libraries/netvirt/excepts.py b/csit/libraries/netvirt/excepts.py
index da5ee2a3d8..7c21fbed0c 100644
--- a/csit/libraries/netvirt/excepts.py
+++ b/csit/libraries/netvirt/excepts.py
@@ -66,7 +66,7 @@ _whitelist = [
      "id": "ConflictingModificationAppliedException",
      "context": [
          "Node was deleted by other transaction",
-         "OptimisticLockFailedException: Optimistic lock failed."
+         "OptimisticLockFailedException: Optimistic lock failed.",
          "Conflicting modification for path /(urn:opendaylight:netvirt:elan?revision=2015-06-02)elan-" +
          "forwarding-tables/mac-table/mac-table[{(urn:opendaylight:netvirt:elan?revision=2015-06-02)" +
          "elan-instance-name="
@@ -109,7 +109,14 @@ _whitelist = [
          "Node was deleted by other transaction",
          "Optimistic lock failed for path /(urn:opendaylight:neutron?revision=2015-07-12)" +
          "neutron/networks/network/network[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=",
-         "Got OptimisticLockFailedException"
+         "Conflicting modification for path /(urn:opendaylight:neutron?revision=2015-07-12)" +
+         "neutron/networks/network/network[{(urn:opendaylight:neutron?revision=2015-07-12)uuid="
+     ]},
+    {"issue": "https://jira.opendaylight.org/browse/NEUTRON-157",
+     "id": "ConflictingModificationAppliedException",
+     "context": [
+         "Got OptimisticLockFailedException", "NeutronNetwork [networkUUID=",
+         "AbstractTranscriberInterface"
      ]},
     # oxygen
     {"issue": "https://jira.opendaylight.org/browse/NEUTRON-157",
@@ -117,7 +124,6 @@ _whitelist = [
      "context": [
          "Node was deleted by other transaction",
          "OptimisticLockFailedException: Optimistic lock failed.",
-         "Got OptimisticLockFailedException",
          "Conflicting modification for path /(urn:opendaylight:neutron?revision=2015-07-12)" +
          "neutron/networks/network/network[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=",
      ]},