X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2Fnetvirt%2Fexcepts.py;h=c6e2dc51562339c052061e08a2d5703729006c79;hb=d3cf164abad2a4468d5fb907035c936754cd4016;hp=1f61a940e1c38f1e387b4e0064b0debf473ef202;hpb=9fd9a4e44c0bffe67832bb61a406813041f19bb8;p=integration%2Ftest.git

diff --git a/csit/libraries/netvirt/excepts.py b/csit/libraries/netvirt/excepts.py
index 1f61a940e1..c6e2dc5156 100644
--- a/csit/libraries/netvirt/excepts.py
+++ b/csit/libraries/netvirt/excepts.py
@@ -84,6 +84,16 @@ _whitelist = [
          "ConflictingModificationAppliedException: Node children was modified by other transaction",
          "removeOrUpdateVpnToDpnList: Error removing from dpnToVpnList for vpn "
      ]},
+    {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1270",
+     "id": "OptimisticLockFailedException",
+     "context": [
+         "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="
+     ]},
     {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1281",
      "id": "OptimisticLockFailedException",
      "context": [
@@ -91,6 +101,20 @@ _whitelist = [
          "ConflictingModificationAppliedException: Node children was modified by other transaction",
          "Direct Exception (not failed Future) when executing job, won't even retry: JobEntry{key='VPNINTERFACE-"
      ]},
+    {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1304",
+     "id": "ModifiedNodeDoesNotExistException",
+     "context": [
+         "ModifiedNodeDoesNotExistException",
+         "Data validation failed for path /(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-1304",
+     "id": "TransactionCommitFailedException",
+     "context": [
+         "TransactionCommitFailedException",
+         "Data validation failed for path /(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/NEUTRON-157",
      "id": "ConflictingModificationAppliedException",
      "context": [
@@ -263,6 +287,6 @@ def write_exceptions_map_to_file(testname, filename, mode="a+"):
                 fp.write("Exception is new\n")
             for exwe_index in ex.get("warnerr_list")[:-1]:
                 for line in _ts_list[exwe_index]:
-                    fp.write(line)
+                    fp.write("{}\n".format(line))
             fp.writelines(ex.get("lines"))
             fp.write("\n")