Merge "Bug 5478 - northbound: improve 404 check on update/delete"

diff --cc integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
index 72d2b6fe95cdaad5f4c0e58d8955629728b019ca,f96e2de37fd1a62b9e092cd2e24d697c1b100bb3..51251c97d8744195a46b3a95ef5ee7542b9c655d
--- 1/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
--- 2/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
@@@ -208,16 -208,22 +208,16 @@@ public class ITNeutronE2E 
          }
      }
  
 +    static void test_fetch(String url_s, String context) {
 +        test_fetch(url_s, 200, context);
 +    }
 +
      static void test_fetch(String url_s, boolean positiveTest, String context) {
 -        try {
 -            URL url = new URL(url_s);
 -            HttpURLConnection httpConn = HttpURLConnectionFactoryGet(url);
 -            if (positiveTest) {
 -                Assert.assertEquals(context, 200, httpConn.getResponseCode());
 -            } else {
 -                Assert.assertEquals(context, 404, httpConn.getResponseCode());
 -            }
 -        } catch (Exception e) {
 -            e.printStackTrace(); // temporary, remove me
 -            Assert.assertFalse("E2E Tests Failed", true);
 -        }
 +        int responseCode = positiveTest ? 200 : 404;
 +        test_fetch(url_s, responseCode, context);
      }
  
-     static void test_delete(String url_s, String context) {
+     static void test_delete(String url_s, int responseCode, String context) {
          try {
              URL url = new URL(url_s);
              HttpURLConnection httpConn = HttpURLConnectionFactoryDelete(url);