X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2Fnetvirt%2Fexcepts.py;h=3cc6660522cdb494a794a15517888bb460131550;hb=144533dc0d0725f878413831aa7f3f3bbe3fa939;hp=b226ba28f6c353c7fc082d2c562d1f8ebceef0ad;hpb=ea0d5dd7995d40cb1cb3efc5daf0348145eac110;p=integration%2Ftest.git

diff --git a/csit/libraries/netvirt/excepts.py b/csit/libraries/netvirt/excepts.py
index b226ba28f6..3cc6660522 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",
@@ -115,6 +114,19 @@ _whitelist = [
          "/(urn:opendaylight:netvirt:fibmanager?revision=2015-03-30)fibEntries/" +
          "vrfTables/vrfTables[{(urn:opendaylight:netvirt:fibmanager?revision=2015-03-30)routeDistinguisher="
      ]},
+    {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1427",
+     "id": "ModifiedNodeDoesNotExistException",
+     "context": [
+         "/(urn:huawei:params:xml:ns:yang:l3vpn?revision=2014-08-15)vpn-interfaces/vpn-interface/vpn-interface" +
+         "[{(urn:huawei:params:xml:ns:yang:l3vpn?revision=2014-08-15)name=",
+         "AugmentationIdentifier{childNames=[(urn:opendaylight:netvirt:l3vpn?revision=2013-09-11)adjacency]}"
+     ]},
+    {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1428",
+     "id": "ModifiedNodeDoesNotExistException",
+     "context": [
+         "/(urn:huawei:params:xml:ns:yang:l3vpn?revision=2014-08-15)vpn-interfaces/vpn-interface/vpn-interface" +
+         "[{(urn:huawei:params:xml:ns:yang:l3vpn?revision=2014-08-15)name=",
+     ]},
     {"issue": "https://jira.opendaylight.org/browse/NEUTRON-157",
      "id": "ConflictingModificationAppliedException",
      "context": [