Update whtielist

[integration/test.git] / csit / libraries / netvirt / excepts.py

diff --git a/csit/libraries/netvirt/excepts.py b/csit/libraries/netvirt/excepts.py
index 98859bf94090e4d905ced3c6663fdfac2d007649..3cc6660522cdb494a794a15517888bb460131550 100644 (file)
--- a/csit/libraries/netvirt/excepts.py
+++ b/csit/libraries/netvirt/excepts.py
@@ -14,11 +14,7 @@ _whitelist = [
          "Optimistic lock failed for path /(urn:opendaylight:inventory?revision=2013-08-19)nodes/node/node" +
          "[{(urn:opendaylight:inventory?revision=2013-08-19)id=openflow",
          "table/table[{(urn:opendaylight:flow:inventory?revision=2013-08-19)id=21}]/flow/flow" +
-         "[{(urn:opendaylight:flow:inventory?revision=2013-08-19)id=L3.",
-         "Conflicting modification for path /(urn:opendaylight:inventory?revision=2013-08-19)nodes/node/node" +
-         "[{(urn:opendaylight:inventory?revision=2013-08-19)id=",
-         "table/table[{(urn:opendaylight:flow:inventory?revision=2013-08-19)id=21}]/flow/flow" +
-         "[{(urn:opendaylight:flow:inventory?revision=2013-08-19)id=L3.", ".21.", ".42."
+         "[{(urn:opendaylight:flow:inventory?revision=2013-08-19)id=L3."
      ]},
     # oxygen
     {"issue": "https://jira.opendaylight.org/browse/NETVIRT-972",
@@ -37,10 +33,6 @@ _whitelist = [
          "Node was created by other transaction",
          "Optimistic lock failed for path /(urn:opendaylight:inventory?revision=2013-08-19)nodes/node/node" +
          "[{(urn:opendaylight:inventory?revision=2013-08-19)id=openflow:",
-         "Conflicting modification for path /(urn:opendaylight:inventory?revision=2013-08-19)nodes/node/node" +
-         "[{(urn:opendaylight:inventory?revision=2013-08-19)id=openflow:",
-         "table/table[{(urn:opendaylight:flow:inventory?revision=2013-08-19)id=47}]/flow/flow" +
-         "[{(urn:opendaylight:flow:inventory?revision=2013-08-19)id=SNAT.", ".47."
      ]},
     # oxygen
     {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1135",
@@ -59,9 +51,6 @@ _whitelist = [
          "Optimistic lock failed 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=",
-         "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="
      ]},
     # oxygen version of NETVIRT-1136
     {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1136",
@@ -76,28 +65,34 @@ _whitelist = [
     {"issue": "https://jira.opendaylight.org/browse/NETVIRT-1260",
      "id": "ConflictingModificationAppliedException",
      "context": [
-         "Node was deleted by other transaction",
          "Optimistic lock failed for path /(urn:ietf:params:xml:ns:yang:ietf-interfaces?revision=2014-05-08)" +
          "interfaces/interface/interface[{(urn:ietf:params:xml:ns:yang:ietf-interfaces?revision=2014-05-08)name=",
-         "Conflicting modification for path /(urn:ietf:params:xml:ns:yang:ietf-interfaces?revision=2014-05-08)" +
-         "interfaces/interface/interface[{(urn:ietf:params:xml:ns:yang:ietf-interfaces?revision=2014-05-08)name="
      ]},
     {"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",
+     "id": "OptimisticLockFailedException",
+     "context": [
+         "OptimisticLockFailedException",
+         "VpnInterfaceOpListener",
+         "Direct Exception (not failed Future) when executing job, won't even retry: JobEntry{key='VPNINTERFACE-",
+         "vpn-instance-op-data/vpn-instance-op-data-entry/vpn-instance-op-data-entry" +
+         "[{(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",
      "context": [
@@ -105,6 +100,33 @@ _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",
+         "/(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",
+         "/(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": [
@@ -267,10 +289,16 @@ def write_exceptions_map_to_file(testname, filename, mode="a+"):
             raise
 
     with open(filename, mode) as fp:
+        fp.write("{}\n".format("=" * 60))
         fp.write("Starting test: {}\n".format(testname))
-        fp.write("{}\n".format("-" * 40))
         for ex_idx, ex in _ex_map.items():
-            for exwe_index in ex.get("warnerr_list"):
+            fp.write("{}\n".format("-" * 40))
+            if "issue" in ex:
+                fp.write("Exception was matched to: {}\n".format(ex.get("issue")))
+            else:
+                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")