From: Sam Hague <shague@redhat.com>
Date: Tue, 24 Jul 2018 14:54:57 +0000 (-0400)
Subject: Add NETVIRT-1270 to whitelist
X-Git-Tag: pre-potassium~668
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=2c1373d52302aff339c86c70460944308af612e3

Add NETVIRT-1270 to whitelist

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

diff --git a/csit/libraries/netvirt/excepts.py b/csit/libraries/netvirt/excepts.py
index b226ba28f6..718ff6173b 100644
--- a/csit/libraries/netvirt/excepts.py
+++ b/csit/libraries/netvirt/excepts.py
@@ -71,17 +71,16 @@ _whitelist = [
     {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1270",
      "id": "ConflictingModificationAppliedException",
      "context": [
-         "ConflictingModificationAppliedException: Node children was modified by other transaction",
          "OptimisticLockFailedException",
-         "Conflicting modification for path /(urn:opendaylight:netvirt:l3vpn?revision=2013-09-11)" +
+         "/(urn:opendaylight:netvirt:l3vpn?revision=2013-09-11)" +
          "vpn-instance-op-data/vpn-instance-op-data-entry/vpn-instance-op-data-entry" +
-         "[{(urn:opendaylight:netvirt:l3vpn?revision=2013-09-11)vrf-id="
+         "[{(urn:opendaylight:netvirt:l3vpn?revision=2013-09-11)vrf-id=",
+         "vrf-id=", "/vpn-to-dpn-list/vpn-to-dpn-list", "dpnId="
      ]},
     {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1270",
      "id": "ExecutionException",
      "context": [
          "OptimisticLockFailedException: Optimistic lock failed",
-         "ConflictingModificationAppliedException: Node children was modified by other transaction",
          "removeOrUpdateVpnToDpnList: Error removing from dpnToVpnList for vpn "
      ]},
     {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1270",
@@ -90,9 +89,9 @@ _whitelist = [
          "OptimisticLockFailedException",
          "VpnInterfaceOpListener",
          "Direct Exception (not failed Future) when executing job, won't even retry: JobEntry{key='VPNINTERFACE-",
-         "Optimistic lock failed for path /(urn:opendaylight:netvirt:l3vpn?revision=2013-09-11)" +
          "vpn-instance-op-data/vpn-instance-op-data-entry/vpn-instance-op-data-entry" +
-         "[{(urn:opendaylight:netvirt:l3vpn?revision=2013-09-11)vrf-id="
+         "[{(urn:opendaylight:netvirt:l3vpn?revision=2013-09-11)vrf-id=",
+         "vrf-id=", "/vpn-to-dpn-list/vpn-to-dpn-list", "dpnId="
      ]},
     {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1281",
      "id": "OptimisticLockFailedException",