move HTTP related test utils from ITNeutronE2E to (new) HttpUtils 17/68317/2
authorMichael Vorburger <vorburger@redhat.com>
Thu, 15 Feb 2018 19:14:43 +0000 (20:14 +0100)
committerMichael Vorburger <vorburger@redhat.com>
Tue, 27 Feb 2018 11:58:10 +0000 (11:58 +0000)
Change-Id: I329bf348c3d698b1f277aec7715326d75231e029
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
39 files changed:
integration/test/src/test/java/org/opendaylight/neutron/e2etest/HttpUtils.java [new file with mode: 0644]
integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBgpvpnTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug3812Tests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug4027Tests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFirewallPolicyTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFirewallRuleTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFirewallTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFloatingIpTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronIKEPoliciesTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronIpSecPoliciesTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronIpSecSiteConnectionTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronL2GatewayConnectionTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronL2GatewayTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBHealthMonitorTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolMembersTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLoadBalancerTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronMeteringLabelTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronMeteringRuleTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronProjectIdTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronQosPolicyTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronRevisionNumberTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronRouterTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCFlowClassifierTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCPortChainTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCPortPairGroupTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCPortPairTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSecurityGroupTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSecurityRuleTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSubnetTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronTapFlowTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronTapServiceTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronTrunkTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronVpnServicesTests.java
integration/test/src/test/java/org/opendaylight/neutron/e2etest/TempestPortsIpV6TestJSON.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/HttpUtils.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/HttpUtils.java
new file mode 100644 (file)
index 0000000..0472334
--- /dev/null
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2018 IBM, Inc.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.neutron.e2etest;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.UncheckedIOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Map;
+import java.util.Set;
+import org.junit.Assert;
+
+public final class HttpUtils {
+
+    private HttpUtils() { }
+
+    static HttpURLConnection httpURLConnectionFactoryGet(URL url) throws IOException {
+        HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
+        httpConn.setRequestMethod("GET");
+        httpConn.setRequestProperty("Content-Type", "application/json");
+        httpConn.setRequestProperty("Authorization", "Basic YWRtaW46YWRtaW4=");
+        return httpConn;
+    }
+
+    static HttpURLConnection httpURLConnectionFactoryDelete(URL url) throws IOException {
+        HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
+        httpConn.setRequestMethod("DELETE");
+        httpConn.setRequestProperty("Content-Type", "application/json");
+        httpConn.setRequestProperty("Authorization", "Basic YWRtaW46YWRtaW4=");
+        return httpConn;
+    }
+
+    static HttpURLConnection httpURLConnectionFactoryPost(URL url, String content) throws IOException {
+        HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
+        httpConn.setRequestMethod("POST");
+        httpConn.setRequestProperty("Content-Type", "application/json");
+        httpConn.setRequestProperty("Authorization", "Basic YWRtaW46YWRtaW4=");
+        httpConn.setDoOutput(true);
+        OutputStreamWriter out = new OutputStreamWriter(httpConn.getOutputStream());
+        out.write(content);
+        out.close();
+        return httpConn;
+    }
+
+    static HttpURLConnection httpURLConnectionFactoryPut(URL url, String content) throws IOException {
+        HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
+        httpConn.setRequestMethod("PUT");
+        httpConn.setRequestProperty("Content-Type", "application/json");
+        httpConn.setRequestProperty("Authorization", "Basic YWRtaW46YWRtaW4=");
+        httpConn.setDoOutput(true);
+        OutputStreamWriter out = new OutputStreamWriter(httpConn.getOutputStream());
+        out.write(content);
+        out.close();
+        return httpConn;
+    }
+
+    static void test_create(String urlStr, String content, String context) {
+        try {
+            URL url = new URL(urlStr);
+            HttpURLConnection httpConn = httpURLConnectionFactoryPost(url, content);
+            Assert.assertEquals(context, 201, httpConn.getResponseCode());
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    static void test_create(String urlStr, int responseCode, String content, String context) {
+        try {
+            URL url = new URL(urlStr);
+            HttpURLConnection httpConn = httpURLConnectionFactoryPost(url, content);
+            Assert.assertEquals(context, responseCode, httpConn.getResponseCode());
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    static void test_modify(String urlStr, String content, String context) {
+        try {
+            URL url = new URL(urlStr);
+            HttpURLConnection httpConn = httpURLConnectionFactoryPut(url, content);
+            Assert.assertEquals(context, 200, httpConn.getResponseCode());
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    static void test_fetch(String urlStr, int responseCode, String context) {
+        try {
+            URL url = new URL(urlStr);
+            HttpURLConnection httpConn = httpURLConnectionFactoryGet(url);
+            Assert.assertEquals(context, responseCode, httpConn.getResponseCode());
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    static void test_fetch(String urlStr, String context) {
+        test_fetch(urlStr, 200, context);
+    }
+
+    static void test_fetch(String urlStr, boolean positiveTest, String context) {
+        int responseCode = positiveTest ? 200 : 404;
+        test_fetch(urlStr, responseCode, context);
+    }
+
+    static void test_delete(String urlStr, int responseCode, String context) {
+        try {
+            URL url = new URL(urlStr);
+            HttpURLConnection httpConn = httpURLConnectionFactoryDelete(url);
+            Assert.assertEquals(context, responseCode, httpConn.getResponseCode());
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    static void test_delete(String urlStr, String context) {
+        test_delete(urlStr, 204, context);
+    }
+
+    static void test_delete_404(String urlStr, String context) {
+        test_delete(urlStr, 404, context);
+    }
+
+    static JsonObject test_fetch_gson(String urlStr, String context) {
+        String response = fetchResponse(urlStr, context);
+        Gson gson = new Gson();
+        return gson.fromJson(response, JsonObject.class);
+    }
+
+    static void test_fetch_collection_response(String urlStr, String collectionName, String context) {
+        String response = fetchResponse(urlStr, context);
+
+        //Collection is returned in an array. Format - {"collectionName": [{...}, {....}]}
+        Gson gson = new Gson();
+        JsonObject jsonObjectOutput = gson.fromJson(response, JsonObject.class);
+        Set<Map.Entry<String, JsonElement>> entrySet = jsonObjectOutput.entrySet();
+        Assert.assertTrue("E2E Tests Failed - Json Error", entrySet.size() > 0);
+        JsonElement jsonElementValue = entrySet.iterator().next().getValue();
+        String key = entrySet.iterator().next().getKey();
+        Assert.assertEquals(context, collectionName, key);
+        Assert.assertTrue("E2E Tests Failed - Collection not Array: " + jsonElementValue + "; URL: " + urlStr
+                + "; full response: " + response, jsonElementValue.isJsonArray());
+        JsonArray jsonArray = jsonElementValue.getAsJsonArray();
+        Assert.assertNotEquals(context, jsonArray.size(), 0);
+    }
+
+    // Helper function - content is json used during create. Format - {"Name": {...}}
+    static void test_fetch_with_one_query_item(String urlStr, String content, String collectionName) {
+        Gson gson = new Gson();
+        JsonObject jsonObjectInput = gson.fromJson(content, JsonObject.class);
+        Set<Map.Entry<String, JsonElement>> entrySet = jsonObjectInput.entrySet();
+        JsonObject jsonObjectOutput = entrySet.iterator().next().getValue().getAsJsonObject();
+        for (Map.Entry<String, JsonElement> element : jsonObjectOutput.entrySet()) {
+            String key = element.getKey();
+            JsonElement jsonElementValue = element.getValue();
+            // Query only values that are non null Primitives - Integer,Strings,character and boolean
+            if (jsonElementValue.isJsonPrimitive() && !jsonElementValue.isJsonNull()) {
+                String valueStr = jsonElementValue.getAsString();
+                valueStr = valueStr.replaceAll("\\s+", "+");
+                String queryUrl = urlStr + "?" + key + "=" + valueStr;
+                String context = collectionName + " " + key + "=" + jsonElementValue.toString() + " Get Failed";
+                test_fetch_collection_response(queryUrl, collectionName, context);
+            }
+        }
+    }
+
+    private static String fetchResponse(String urlStr, String context) {
+        StringBuffer response = new StringBuffer();
+
+        try {
+            URL url = new URL(urlStr);
+            HttpURLConnection httpConn = HttpUtils.httpURLConnectionFactoryGet(url);
+            Assert.assertEquals(context, 200, httpConn.getResponseCode());
+            BufferedReader in = new BufferedReader(new InputStreamReader(httpConn.getInputStream()));
+            String inputLine;
+            while ((inputLine = in.readLine()) != null) {
+                response.append(inputLine);
+            }
+            in.close();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        return response.toString();
+    }
+
+}
index 249034e3c993d9eb3a4a20bb31e9909bb522fd70..22d455451d5019404b15ba07d81051c962d37470 100644 (file)
@@ -14,20 +14,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configure
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.UncheckedIOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Map;
-import java.util.Set;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
@@ -91,172 +78,4 @@ public class ITNeutronE2E extends AbstractMdsalTestBase {
         NeutronAllTests.testNeutron("http://127.0.0.1:8181/controller/nb/v2/neutron");
     }
 
-    static HttpURLConnection httpURLConnectionFactoryGet(URL url) throws IOException {
-        HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
-        httpConn.setRequestMethod("GET");
-        httpConn.setRequestProperty("Content-Type", "application/json");
-        httpConn.setRequestProperty("Authorization", "Basic YWRtaW46YWRtaW4=");
-        return httpConn;
-    }
-
-    static HttpURLConnection httpURLConnectionFactoryDelete(URL url) throws IOException {
-        HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
-        httpConn.setRequestMethod("DELETE");
-        httpConn.setRequestProperty("Content-Type", "application/json");
-        httpConn.setRequestProperty("Authorization", "Basic YWRtaW46YWRtaW4=");
-        return httpConn;
-    }
-
-    static HttpURLConnection httpURLConnectionFactoryPost(URL url, String content) throws IOException {
-        HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
-        httpConn.setRequestMethod("POST");
-        httpConn.setRequestProperty("Content-Type", "application/json");
-        httpConn.setRequestProperty("Authorization", "Basic YWRtaW46YWRtaW4=");
-        httpConn.setDoOutput(true);
-        OutputStreamWriter out = new OutputStreamWriter(httpConn.getOutputStream());
-        out.write(content);
-        out.close();
-        return httpConn;
-    }
-
-    static HttpURLConnection httpURLConnectionFactoryPut(URL url, String content) throws IOException {
-        HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
-        httpConn.setRequestMethod("PUT");
-        httpConn.setRequestProperty("Content-Type", "application/json");
-        httpConn.setRequestProperty("Authorization", "Basic YWRtaW46YWRtaW4=");
-        httpConn.setDoOutput(true);
-        OutputStreamWriter out = new OutputStreamWriter(httpConn.getOutputStream());
-        out.write(content);
-        out.close();
-        return httpConn;
-    }
-
-    static void test_create(String urlStr, String content, String context) {
-        try {
-            URL url = new URL(urlStr);
-            HttpURLConnection httpConn = httpURLConnectionFactoryPost(url, content);
-            Assert.assertEquals(context, 201, httpConn.getResponseCode());
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    static void test_create(String urlStr, int responseCode, String content, String context) {
-        try {
-            URL url = new URL(urlStr);
-            HttpURLConnection httpConn = httpURLConnectionFactoryPost(url, content);
-            Assert.assertEquals(context, responseCode, httpConn.getResponseCode());
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    static void test_modify(String urlStr, String content, String context) {
-        try {
-            URL url = new URL(urlStr);
-            HttpURLConnection httpConn = httpURLConnectionFactoryPut(url, content);
-            Assert.assertEquals(context, 200, httpConn.getResponseCode());
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    static void test_fetch(String urlStr, int responseCode, String context) {
-        try {
-            URL url = new URL(urlStr);
-            HttpURLConnection httpConn = httpURLConnectionFactoryGet(url);
-            Assert.assertEquals(context, responseCode, httpConn.getResponseCode());
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    static void test_fetch(String urlStr, String context) {
-        test_fetch(urlStr, 200, context);
-    }
-
-    static void test_fetch(String urlStr, boolean positiveTest, String context) {
-        int responseCode = positiveTest ? 200 : 404;
-        test_fetch(urlStr, responseCode, context);
-    }
-
-    static void test_delete(String urlStr, int responseCode, String context) {
-        try {
-            URL url = new URL(urlStr);
-            HttpURLConnection httpConn = httpURLConnectionFactoryDelete(url);
-            Assert.assertEquals(context, responseCode, httpConn.getResponseCode());
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    static void test_delete(String urlStr, String context) {
-        test_delete(urlStr, 204, context);
-    }
-
-    static void test_delete_404(String urlStr, String context) {
-        test_delete(urlStr, 404, context);
-    }
-
-    private static String fetchResponse(String urlStr, String context) {
-        StringBuffer response = new StringBuffer();
-
-        try {
-            URL url = new URL(urlStr);
-            HttpURLConnection httpConn = httpURLConnectionFactoryGet(url);
-            Assert.assertEquals(context, 200, httpConn.getResponseCode());
-            BufferedReader in = new BufferedReader(new InputStreamReader(httpConn.getInputStream()));
-            String inputLine;
-            while ((inputLine = in.readLine()) != null) {
-                response.append(inputLine);
-            }
-            in.close();
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-        return response.toString();
-    }
-
-    static JsonObject test_fetch_gson(String urlStr, String context) {
-        String response = fetchResponse(urlStr, context);
-        Gson gson = new Gson();
-        return gson.fromJson(response, JsonObject.class);
-    }
-
-    static void test_fetch_collection_response(String urlStr, String collectionName, String context) {
-        String response = fetchResponse(urlStr, context);
-
-        //Collection is returned in an array. Format - {"collectionName": [{...}, {....}]}
-        Gson gson = new Gson();
-        JsonObject jsonObjectOutput = gson.fromJson(response, JsonObject.class);
-        Set<Map.Entry<String, JsonElement>> entrySet = jsonObjectOutput.entrySet();
-        Assert.assertTrue("E2E Tests Failed - Json Error", entrySet.size() > 0);
-        JsonElement jsonElementValue = entrySet.iterator().next().getValue();
-        String key = entrySet.iterator().next().getKey();
-        Assert.assertEquals(context, collectionName, key);
-        Assert.assertTrue("E2E Tests Failed - Collection not Array: " + jsonElementValue + "; URL: " + urlStr
-                + "; full response: " + response, jsonElementValue.isJsonArray());
-        JsonArray jsonArray = jsonElementValue.getAsJsonArray();
-        Assert.assertNotEquals(context, jsonArray.size(), 0);
-    }
-
-    // Helper function - content is json used during create. Format - {"Name": {...}}
-    static void test_fetch_with_one_query_item(String urlStr, String content, String collectionName) {
-        Gson gson = new Gson();
-        JsonObject jsonObjectInput = gson.fromJson(content, JsonObject.class);
-        Set<Map.Entry<String, JsonElement>> entrySet = jsonObjectInput.entrySet();
-        JsonObject jsonObjectOutput = entrySet.iterator().next().getValue().getAsJsonObject();
-        for (Map.Entry<String, JsonElement> element : jsonObjectOutput.entrySet()) {
-            String key = element.getKey();
-            JsonElement jsonElementValue = element.getValue();
-            // Query only values that are non null Primitives - Integer,Strings,character and boolean
-            if (jsonElementValue.isJsonPrimitive() && !jsonElementValue.isJsonNull()) {
-                String valueStr = jsonElementValue.getAsString();
-                valueStr = valueStr.replaceAll("\\s+", "+");
-                String queryUrl = urlStr + "?" + key + "=" + valueStr;
-                String context = collectionName + " " + key + "=" + jsonElementValue.toString() + " Get Failed";
-                test_fetch_collection_response(queryUrl, collectionName, context);
-            }
-        }
-    }
 }
index f9bfabb761093953458bca123221b4a258f89d4a..a4c8b7acc01bd25e565c43341c87bf42bb8051ee 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronBgpvpnTests {
 
     public void bgpvpn_collection_get_test() {
         String url = base + "/bgpvpns";
-        ITNeutronE2E.test_fetch(url, "BGPVPN collection GET failed");
+        HttpUtils.test_fetch(url, "BGPVPN collection GET failed");
     }
 
     //TODO handle SB check
@@ -28,13 +28,13 @@ public class NeutronBgpvpnTests {
                 + " \"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", " + " \"route_targets\": \"64512:1\", "
                 + " \"networks\": \"3b80198d-4f7b-4f77-9ef5-774d54e17126\", "
                 + " \"auto_aggregate\": true, \"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" " + " } }";
-        ITNeutronE2E.test_create(url, content, "Singleton Bgpvpn Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Bgpvpn Post Failed NB");
         return content;
     }
 
     public void singleton_bgpvpn_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/bgpvpns";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "bgpvpns");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "bgpvpns");
     }
 
     //TODO handle SB check
@@ -48,7 +48,7 @@ public class NeutronBgpvpnTests {
                 + "\"tenant_id\": \"4fd44f30292945e481c7b8a0c8908869\", "
                 + "\"id\": \"af374017-c9ae-4a1d-b799-ab73111476e2\", " + "\"route_targets\": \"64512:2\", "
                 + "\"auto_aggregate\": false, " + "\"type\": \"l3\" } ] } ";
-        ITNeutronE2E.test_create(url, content, "Bulk Bgpvpn Post Failed");
+        HttpUtils.test_create(url, content, "Bulk Bgpvpn Post Failed");
     }
 
     //TODO handle SB check
@@ -57,12 +57,12 @@ public class NeutronBgpvpnTests {
         String content = " { \"bgpvpn\": { " + "\"status\": \"ACTIVE\", " + "\"name\": \"sample_bgpvpn_updated\", "
                 + "\"admin_state_up\": true, " + "\"tenant_id\": \"4fd44f30292945e481c7b8a0c8908869\", "
                 + "\"auto_aggregate\": true, " + "\"type\": \"l3\" } } ";
-        ITNeutronE2E.test_modify(url, content, "Bgpvpn Put Failed");
+        HttpUtils.test_modify(url, content, "Bgpvpn Put Failed");
     }
 
     public void bgpvpn_element_get_test() {
         String url = base + "/bgpvpns/bc1a76cb-8767-4c3a-bb95-018b822f2130";
-        ITNeutronE2E.test_fetch(url, true, "Bgpvpn Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Bgpvpn Element Get Failed");
     }
 
     public void bgpvpn_element_get_test_with_added_query() {
@@ -70,17 +70,17 @@ public class NeutronBgpvpnTests {
                 + "?fields=id&fields=tenant_id&fields=name&fields=type"
                 + "fields=route_targets&fields=status&fields=admin_state_up"
                 + "&fields=tenant_id&fields=auto_aggregate";
-        ITNeutronE2E.test_fetch(url, true, "Bgpvpn Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Bgpvpn Element Get Failed");
     }
 
     public void bgpvpn_element_negative_get_test() {
         String url = base + "/bgpvpns/bc1a76cb-8767-4c3a-bb95-018b822f2130";
-        ITNeutronE2E.test_fetch(url, false, "Bgpvpn Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Bgpvpn Element Negative Get Failed");
     }
 
     public void bgpvpn_delete_test() {
         String url = base + "/bgpvpns/bc1a76cb-8767-4c3a-bb95-018b822f2130";
-        ITNeutronE2E.test_delete(url, "bgpvpnElement Delete Failed");
+        HttpUtils.test_delete(url, "bgpvpnElement Delete Failed");
     }
 
     public static void runTests(String base) {
index a24b8111185fba335572d8112ac6a57e42d0eb9a..9c56538962623ad2438c1812e978bb6a199ff59c 100644 (file)
@@ -22,7 +22,7 @@ public class NeutronBug3812Tests {
                 + "\"router:external\": false, \"tenant_id\": \"04684ce029a6415ca8a9293a24f884b9\", "
                 + "\"admin_state_up\": true, \"shared\": false, \"provider:network_type\": \"vxlan\", "
                 + "\"id\": \"ec36ae5a-ff7f-4441-8229-179e5d5207a7\", \"provider:segmentation_id\": 2550}}";
-        ITNeutronE2E.test_create(urlN, contentN, "Bug 3812 Network Post Failed");
+        HttpUtils.test_create(urlN, contentN, "Bug 3812 Network Post Failed");
 
         // create first subnet
         String urlS = base + "/subnets";
@@ -33,7 +33,7 @@ public class NeutronBug3812Tests {
                 + "[{\"start\": \"10.0.0.2\", \"end\": \"10.0.3.254\"}], \"host_routes\": [], \"shared\": false,"
                 + " \"ip_version\": 4, \"ipv6_address_mode\": \"\", \"cidr\": \"10.0.0.0/22\", "
                 + "\"id\": \"64605c41-688d-4548-97da-0f895943f840\", \"subnetpool_id\": \"\"}}";
-        ITNeutronE2E.test_create(urlS, contentS1, "Bug 3812 Subnet 1 Post Failed");
+        HttpUtils.test_create(urlS, contentS1, "Bug 3812 Subnet 1 Post Failed");
 
         String urlP = base + "/ports";
         String contentP1 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\", "
@@ -47,7 +47,7 @@ public class NeutronBug3812Tests {
                 + " \"tenant_id\": \"04684ce029a6415ca8a9293a24f884b9\", \"binding:vif_details\": {}, "
                 + "\"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"unbound\","
                 + " \"mac_address\": \"FA:16:3E:02:CB:DE\"}}";
-        ITNeutronE2E.test_create(urlP, contentP1, "Bug 3812 DHCP Port 1 Post Failed");
+        HttpUtils.test_create(urlP, contentP1, "Bug 3812 DHCP Port 1 Post Failed");
 
         String urlP1 = urlP + "/fcd1d7ab-8486-42a0-8f60-9d1a682aa00e";
         String contentP1M1 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\", "
@@ -57,7 +57,7 @@ public class NeutronBug3812Tests {
                 + "\"device_id\": \"dhcp1c8f692f-b8db-5449-80ea-c9243b652e59-ec36ae5a-ff7f-4441-8229-179e5d5207a7\","
                 + " \"name\": \"\", \"admin_state_up\": true, \"binding:vif_details\": "
                 + "{\"port_filter\": \"true\"}, \"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"ovs\"}}";
-        ITNeutronE2E.test_modify(urlP1, contentP1M1, "Bug 3812 DHCP Port 1 Put 1 Failed");
+        HttpUtils.test_modify(urlP1, contentP1M1, "Bug 3812 DHCP Port 1 Put 1 Failed");
 
         // subnet 2 create
         String contentS2 = "{\"subnet\": {\"name\": \"s2\", \"enable_dhcp\": true, "
@@ -69,7 +69,7 @@ public class NeutronBug3812Tests {
                 + "\"host_routes\": [], \"shared\": false, \"ip_version\": 4, "
                 + "\"ipv6_address_mode\": \"\", \"cidr\": \"20.0.0.0/22\", "
                 + "\"id\": \"dd9b62eb-d9a3-42b5-b2f1-bffa43475614\", \"subnetpool_id\": \"\"}}";
-        ITNeutronE2E.test_create(urlS, contentS2, "Bug 3812 Subnet 2 Post Failed");
+        HttpUtils.test_create(urlS, contentS2, "Bug 3812 Subnet 2 Post Failed");
 
         String contentP1M2 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\", "
                 + "\"allowed_address_pairs\": [], \"extra_dhcp_opts\": [], \"device_owner\": \"network:dhcp\", "
@@ -78,7 +78,7 @@ public class NeutronBug3812Tests {
                 + "\"device_id\": \"dhcp1c8f692f-b8db-5449-80ea-c9243b652e59-ec36ae5a-ff7f-4441-8229-179e5d5207a7\","
                 + " \"name\": \"\", \"admin_state_up\": true, \"binding:vif_details\": "
                 + "{\"port_filter\": \"true\"}, \"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"ovs\"}}";
-        ITNeutronE2E.test_modify(urlP1, contentP1M2, "Bug 3812 DHCP Port Put 2 Failed");
+        HttpUtils.test_modify(urlP1, contentP1M2, "Bug 3812 DHCP Port Put 2 Failed");
 
         // delete first subnet
         String contentP1M3 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\","
@@ -88,13 +88,13 @@ public class NeutronBug3812Tests {
                 + "\"device_id\": \"dhcp1c8f692f-b8db-5449-80ea-c9243b652e59-ec36ae5a-ff7f-4441-8229-179e5d5207a7\", "
                 + "\"name\": \"\", \"admin_state_up\": true, \"binding:vif_details\": "
                 + "{\"port_filter\": \"true\"}, \"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"ovs\"}}";
-        ITNeutronE2E.test_modify(urlP1, contentP1M3, "Bug 3812 DHCP Port Put 3 Failed");
+        HttpUtils.test_modify(urlP1, contentP1M3, "Bug 3812 DHCP Port Put 3 Failed");
 
         String urlS1 = urlS + "/64605c41-688d-4548-97da-0f895943f840";
-        ITNeutronE2E.test_delete(urlS1, "Bug 3812 Subnet 1 Delete Failed");
+        HttpUtils.test_delete(urlS1, "Bug 3812 Subnet 1 Delete Failed");
 
         String urlS2 = urlS + "/dd9b62eb-d9a3-42b5-b2f1-bffa43475614";
-        ITNeutronE2E.test_delete(urlS2, "Bug 3812 Subnet 2 Delete Failed");
+        HttpUtils.test_delete(urlS2, "Bug 3812 Subnet 2 Delete Failed");
     }
 
     public static void runTests(String base) {
index 7908c5caab3a11ed18faa107923bcef35c1cfaee..ec9f170c2dd47c7afd5deeae443947b0d60d57bc 100644 (file)
@@ -27,7 +27,7 @@ public class NeutronBug4027Tests {
                 + "\"security_groups\" : [ ]," + "\"allowed_address_pairs\" : [ ],"
                 + "\"binding:host_id\" : \"devstack-control\"," + "\"binding:vnic_type\" : \"normal\","
                 + "\"binding:vif_type\" : \"unbound\"," + "\"binding:vif_details\" : { } } }";
-        ITNeutronE2E.test_create(urlN, contentN, "Bug 4027 Port Post Failed");
+        HttpUtils.test_create(urlN, contentN, "Bug 4027 Port Post Failed");
         String url2 = base + "/ports/ea2ac142-8454-4990-8bfb-7a218479864b";
         String content2 = " { \"port\" : {" + "\"id\" : \"ea2ac142-8454-4990-8bfb-7a218479864b\"," + "\"name\" : \"\","
                 + "\"admin_state_up\" : true,"
@@ -36,7 +36,7 @@ public class NeutronBug4027Tests {
                 + "\"allowed_address_pairs\" : [ ]," + "\"binding:host_id\" : \"devstack-control\","
                 + "\"binding:vnic_type\" : \"normal\"," + "\"binding:vif_type\" : \"ovs\","
                 + "\"binding:vif_details\" : { \"port_filter\" : \"true\" }," + "\"extra_dhcp_opts\" : [ ] } } }";
-        ITNeutronE2E.test_modify(url2, content2, "Bug 4027 Port Modify Failed");
+        HttpUtils.test_modify(url2, content2, "Bug 4027 Port Modify Failed");
     }
 
     public static void runTests(String base) {
index f4caa4534c7e8fc0fe63200a934739ceb05f791d..0a70904aa4c79bb67429be0b22c999bc83a2f2d3 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronFirewallPolicyTests {
 
     public void fw_policy_collection_get_test() {
         String url = base + "/fw/firewall_policies";
-        ITNeutronE2E.test_fetch(url, "Firewall Policy Collection GET failed");
+        HttpUtils.test_fetch(url, "Firewall Policy Collection GET failed");
     }
 
     public String singleton_fw_policy_create_test() {
@@ -26,13 +26,13 @@ public class NeutronFirewallPolicyTests {
                 + "\"description\": \"\", \"firewall_rules\": [" + "\"8722e0e0-9cc9-4490-9660-8c9a5732fbb0\" ],"
                 + "\"id\": \"c69933c1-b472-44f9-8226-30dc4ffd454c\"," + "\"name\": \"test-policy\", \"shared\": false,"
                 + "\"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_create(url, content, "Firewall Policy Singleton Post Failed");
+        HttpUtils.test_create(url, content, "Firewall Policy Singleton Post Failed");
         return content;
     }
 
     public void singleton_fw_policy_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/fw/firewall_policies";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "firewall_policies");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "firewall_policies");
     }
 
     public void fw_policy_modify_test() {
@@ -42,12 +42,12 @@ public class NeutronFirewallPolicyTests {
                 + "\"8722e0e0-9cc9-4490-9660-8c9a5732fbb0\" ]," + "\"id\": \"c69933c1-b472-44f9-8226-30dc4ffd454c\","
                 + "\"name\": \"test-policy\", \"shared\": false,"
                 + "\"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_modify(url, content, "Firewall Policy Singleton Post Failed");
+        HttpUtils.test_modify(url, content, "Firewall Policy Singleton Post Failed");
     }
 
     public void fw_policy_element_get_test() {
         String url = base + "/fw/firewall_policies/c69933c1-b472-44f9-8226-30dc4ffd454c";
-        ITNeutronE2E.test_fetch(url, true, "Firewall Policy Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Firewall Policy Element Get Failed");
     }
 
     public void fw_policy_element_get_with_query_test() {
@@ -55,17 +55,17 @@ public class NeutronFirewallPolicyTests {
                 + "?fields=tenant_id&field=id&fields=name&fields=description"
                 + "&fields=shared&fields=firewall_rules&fields=audited"
                 + "&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Firewall Policy Element Get with Query Failed");
+        HttpUtils.test_fetch(url, true, "Firewall Policy Element Get with Query Failed");
     }
 
     public void fw_policy_delete_test() {
         String url = base + "/fw/firewall_policies/c69933c1-b472-44f9-8226-30dc4ffd454c";
-        ITNeutronE2E.test_delete(url, "Firewall Policy Delete Failed");
+        HttpUtils.test_delete(url, "Firewall Policy Delete Failed");
     }
 
     public void fw_policy_element_negative_get_test() {
         String url = base + "/fw/firewall_policies/c69933c1-b472-44f9-8226-30dc4ffd454c";
-        ITNeutronE2E.test_fetch(url, false, "Firewall Policy Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Firewall Policy Element Negative Get Failed");
     }
 
     public static void runTests(String base) {
index 1a22eaf10acce95343e02432effb67f8fb9fa03d..f76e5cae742c2330fc2bc18ffdf14ef87c54349b 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronFirewallRuleTests {
 
     public void fw_rule_collection_get_test() {
         String url = base + "/fw/firewall_rules";
-        ITNeutronE2E.test_fetch(url, "Firewall Rule Collection GET failed");
+        HttpUtils.test_fetch(url, "Firewall Rule Collection GET failed");
     }
 
     public String singleton_fw_rule_create_test() {
@@ -29,13 +29,13 @@ public class NeutronFirewallRuleTests {
                 + "\"shared\": false, \"source_ip_address\": null,"
                 + "\"source_port_min\": null, \"source_port_max\": null,"
                 + "\"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_create(url, content, "Firewall Rule Singleton Post Failed");
+        HttpUtils.test_create(url, content, "Firewall Rule Singleton Post Failed");
         return content;
     }
 
     public void singleton_fw_rule_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/fw/firewall_rules";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "firewall_rules");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "firewall_rules");
     }
 
     public void fw_rule_modify_test() {
@@ -47,12 +47,12 @@ public class NeutronFirewallRuleTests {
                 + "\"shared\": true, \"source_ip_address\": null,"
                 + "\"source_port_min\": null, \"source_port_max\": null,"
                 + "\"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_modify(url, content, "Firewall Rule Singleton Put Failed");
+        HttpUtils.test_modify(url, content, "Firewall Rule Singleton Put Failed");
     }
 
     public void fw_rule_element_get_test() {
         String url = base + "/fw/firewall_rules/8722e0e0-9cc9-4490-9660-8c9a5732fbb0";
-        ITNeutronE2E.test_fetch(url, true, "Firewall Rule Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Firewall Rule Element Get Failed");
     }
 
     public void fw_rule_element_get_with_query_test() {
@@ -63,17 +63,17 @@ public class NeutronFirewallRuleTests {
                 + "&fields=destination_port_min&fields=destination_port_max&fields=position"
                 + "&fields=action&fields=source_port_min&fields=source_port_max"
                 + "&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Firewall Rule Element Get With Query Failed");
+        HttpUtils.test_fetch(url, true, "Firewall Rule Element Get With Query Failed");
     }
 
     public void fw_rule_delete_test() {
         String url = base + "/fw/firewall_rules/8722e0e0-9cc9-4490-9660-8c9a5732fbb0";
-        ITNeutronE2E.test_delete(url, "Firewall Rule Delete Failed");
+        HttpUtils.test_delete(url, "Firewall Rule Delete Failed");
     }
 
     public void fw_rule_element_negative_get_test() {
         String url = base + "/fw/firewall_rules/8722e0e0-9cc9-4490-9660-8c9a5732fbb0";
-        ITNeutronE2E.test_fetch(url, false, "Firewall Rule Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Firewall Rule Element Negative Get Failed");
     }
 
     public String test_bug6398_fw_rule_create_test() {
@@ -85,7 +85,7 @@ public class NeutronFirewallRuleTests {
                 + "\"shared\": false, \"source_ip_address\": null,"
                 + "\"source_port_min\": null, \"source_port_max\": null,"
                 + "\"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_create(url, 400, content, "Firewall Rule Singleton Post Bug 6398 regressed");
+        HttpUtils.test_create(url, 400, content, "Firewall Rule Singleton Post Bug 6398 regressed");
         return content;
     }
 
index f775f7cd97a9588f3f7b2e55fe5ef57e76d07072..28483da235067a2409acab229f5c45be7e8692e6 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronFirewallTests {
 
     public void fw_collection_get_test() {
         String url = base + "/fw/firewalls";
-        ITNeutronE2E.test_fetch(url, "Firewall Collection GET failed");
+        HttpUtils.test_fetch(url, "Firewall Collection GET failed");
     }
 
     public String singleton_fw_create_test() {
@@ -27,13 +27,13 @@ public class NeutronFirewallTests {
                 + "\"id\": \"3b0ef8f4-82c7-44d4-a4fb-6177f9a21977\","
                 + "\"name\": \"\", \"status\": \"PENDING_CREATE\","
                 + "\"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_create(url, content, "Firewall Singleton Post Failed");
+        HttpUtils.test_create(url, content, "Firewall Singleton Post Failed");
         return content;
     }
 
     public void singleton_fw_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/fw/firewalls";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "firewalls");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "firewalls");
     }
 
     public void fw_modify_test() {
@@ -43,12 +43,12 @@ public class NeutronFirewallTests {
                 + "\"id\": \"3b0ef8f4-82c7-44d4-a4fb-6177f9a21977\","
                 + "\"name\": \"\", \"status\": \"PENDING_CREATE\","
                 + "\"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_modify(url, content, "Firewall Singleton Post Failed");
+        HttpUtils.test_modify(url, content, "Firewall Singleton Post Failed");
     }
 
     public void fw_element_get_test() {
         String url = base + "/fw/firewalls/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_fetch(url, true, "Firewall Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Firewall Element Get Failed");
     }
 
     public void fw_element_get_with_query_test() {
@@ -56,28 +56,28 @@ public class NeutronFirewallTests {
                 + "?fields=tenant_id&fields=id&fields=name&fields=description&fields=shared"
                 + "&fields=admin_state_up&fields=status&fields=firewall_policy_id"
                 + "&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Firewall Element Get With Query Failed");
+        HttpUtils.test_fetch(url, true, "Firewall Element Get With Query Failed");
     }
 
     public void fw_delete_test() {
         String url = base + "/fw/firewalls/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_delete(url, "Firewall Delete Failed");
+        HttpUtils.test_delete(url, "Firewall Delete Failed");
     }
 
     public void fw_element_negative_get_test() {
         String url = base + "/fw/firewalls/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_fetch(url, false, "Firewall Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Firewall Element Negative Get Failed");
     }
 
     public void fw_collection_bug4944_test() {
         String url = base + "/fw/firewalls";
         String content = " { \"firewall\": { \"admin_state_up\": true,\"shared\": false,"
                 + "\"id\": \"3b0ef8f4-82c7-44d4-a4fb-6177f9a21977\" } }";
-        ITNeutronE2E.test_create(url, content, "Firewall Singleton Post Failed");
+        HttpUtils.test_create(url, content, "Firewall Singleton Post Failed");
         url = base + "/fw/firewalls?shared=false";
-        ITNeutronE2E.test_fetch_collection_response(url, "firewalls", "Firewall Collection Get Response Failed");
+        HttpUtils.test_fetch_collection_response(url, "firewalls", "Firewall Collection Get Response Failed");
         url = base + "/fw/firewalls/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_delete(url, "Firewall Delete Failed");
+        HttpUtils.test_delete(url, "Firewall Delete Failed");
     }
 
     public static void runTests(String base) {
index 0280f247dc313d8918ca3068c03df44b0057c8ee..86dd7e548558ce541f942e18ba3c91a617e72df3 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronFloatingIpTests {
 
     public void floatingIp_collection_get_test() {
         String url = base + "/floatingips";
-        ITNeutronE2E.test_fetch(url, "FloatingIp Collection GET failed");
+        HttpUtils.test_fetch(url, "FloatingIp Collection GET failed");
     }
 
     public String singleton_floatingIp_create_test() {
@@ -29,13 +29,13 @@ public class NeutronFloatingIpTests {
                 + "\"port_id\": \"ce705c24-c1ef-408a-bda3-7bbd946164ab\","
                 + "\"router_id\": \"d23abc8d-2991-4a55-ba98-2aaea84cc72f\"," + "\"status\": \"ACTIVE\","
                 + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\" } }";
-        ITNeutronE2E.test_create(url, content, "Singleton Floating IP Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Floating IP Post Failed NB");
         return content;
     }
 
     public void singleton_floatingIp_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/floatingips";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "floatingips");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "floatingips");
     }
 
     public void update_floatingIp_test() {
@@ -45,19 +45,19 @@ public class NeutronFloatingIpTests {
                 + "\"floating_ip_address\": \"172.24.4.228\"," + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\","
                 + "\"status\": \"ACTIVE\"," + "\"port_id\": \"fc861431-0e6c-4842-a0ed-e2363f9bc3a8\","
                 + "\"id\": \"2f245a7b-796b-4f26-9cf9-9e82d248fda7\" } }";
-        ITNeutronE2E.test_modify(url, content1, "Singleton Floating IP Put 1 Failed NB");
+        HttpUtils.test_modify(url, content1, "Singleton Floating IP Put 1 Failed NB");
 
         String content2 = " { \"floatingip\": {" + "\"floating_network_id\": \"376da547-b977-4cfe-9cba-275c80debf57\","
                 + "\"router_id\": \"d23abc8d-2991-4a55-ba98-2aaea84cc72f\"," + "\"fixed_ip_address\": null,"
                 + "\"floating_ip_address\": \"172.24.4.228\"," + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\","
                 + "\"status\": \"ACTIVE\"," + "\"port_id\": null,"
                 + "\"id\": \"2f245a7b-796b-4f26-9cf9-9e82d248fda7\" } }";
-        ITNeutronE2E.test_modify(url, content2, "Singleton Floating IP Put 2 Failed NB");
+        HttpUtils.test_modify(url, content2, "Singleton Floating IP Put 2 Failed NB");
     }
 
     public void floatingIp_element_get_test() {
         String url = base + "/floatingips/2f245a7b-796b-4f26-9cf9-9e82d248fda7";
-        ITNeutronE2E.test_fetch(url, true, "Floating IP Element Get Test");
+        HttpUtils.test_fetch(url, true, "Floating IP Element Get Test");
     }
 
     public void floatingIp_element_get_with_query_test() {
@@ -65,17 +65,17 @@ public class NeutronFloatingIpTests {
                 + "?fields=id&fields=floating_network_id&fields=port_id&fields=status"
                 + "&fields=fixed_ip_address&fields=floating_ip_address&fields=tenant_id"
                 + "&fields=router_id&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Floating IP Element Get Query Test");
+        HttpUtils.test_fetch(url, true, "Floating IP Element Get Query Test");
     }
 
     public void floatingIp_delete_test() {
         String url = base + "/floatingips/2f245a7b-796b-4f26-9cf9-9e82d248fda7";
-        ITNeutronE2E.test_delete(url, "Floating IP Delete Test");
+        HttpUtils.test_delete(url, "Floating IP Delete Test");
     }
 
     public void floatingIp_element_negative_get_test() {
         String url = base + "/floatingips/2f245a7b-796b-4f26-9cf9-9e82d248fda7";
-        ITNeutronE2E.test_fetch(url, false, "Floating IP Element Negative Get Test");
+        HttpUtils.test_fetch(url, false, "Floating IP Element Negative Get Test");
     }
 
     public static void runTests(String base) {
index b6ef753958fc0538d06abd15a9746b148c2aeab6..318235a9a7cf4a6e3f7c109b4e23b6c7724b749a 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronIKEPoliciesTests {
 
     public void ikePolicy_collection_get_test() {
         String url = base + "/vpn/ikepolicies";
-        ITNeutronE2E.test_fetch(url, "IKE Policy GET failed");
+        HttpUtils.test_fetch(url, "IKE Policy GET failed");
     }
 
     public String singleton_ikePolicy_create_test() {
@@ -28,13 +28,13 @@ public class NeutronIKEPoliciesTests {
                 + "\"phase1_negotiation_mode\": \"main\"," + "\"lifetime\": { \"units\": \"seconds\","
                 + "\"value\": 7200}," + "\"ike_version\": \"v1\"," + "\"id\": \"5522aff7-1b3c-48dd-9c3c-b50f016b73db\","
                 + "\"description\": \"\" } }";
-        ITNeutronE2E.test_create(url, content, "IKE Policy POST failed");
+        HttpUtils.test_create(url, content, "IKE Policy POST failed");
         return content;
     }
 
     public void singleton_ikePolicy_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/vpn/ikepolicies";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "ikepolicies");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "ikepolicies");
     }
 
     public void ikePolicy_update_test() {
@@ -45,12 +45,12 @@ public class NeutronIKEPoliciesTests {
                 + "\"phase1_negotiation_mode\": \"main\","
                 + "\"lifetime\": { \"units\": \"seconds\", \"value\": 3600 }," + "\"ike_version\": \"v1\","
                 + "\"id\": \"5522aff7-1b3c-48dd-9c3c-b50f016b73db\"," + "\"description\": \"\" } }";
-        ITNeutronE2E.test_modify(url, content, "IKE Policy PUT failed");
+        HttpUtils.test_modify(url, content, "IKE Policy PUT failed");
     }
 
     public void ikePolicy_element_get_test() {
         String url = base + "/vpn/ikepolicies/5522aff7-1b3c-48dd-9c3c-b50f016b73db";
-        ITNeutronE2E.test_fetch(url, true, "IKE Policy Element GET failed");
+        HttpUtils.test_fetch(url, true, "IKE Policy Element GET failed");
     }
 
     public void ikePolicy_element_get_with_query_test() {
@@ -58,17 +58,17 @@ public class NeutronIKEPoliciesTests {
                 + "?fields=id&fields=tenant_id&fields=name&fields=description&fields=pfs"
                 + "&fields=auth_algorithm&fields=phase1_negotiation_mode"
                 + "&fields=ike_version&fields=encryption_algorithm";
-        ITNeutronE2E.test_fetch(url, true, "IKE Policy Element GET With Query failed");
+        HttpUtils.test_fetch(url, true, "IKE Policy Element GET With Query failed");
     }
 
     public void ikePolicy_delete_test() {
         String url = base + "/vpn/ikepolicies/5522aff7-1b3c-48dd-9c3c-b50f016b73db";
-        ITNeutronE2E.test_delete(url, "IKE Policy DELETE failed");
+        HttpUtils.test_delete(url, "IKE Policy DELETE failed");
     }
 
     public void ikePolicy_element_negative_get_test() {
         String url = base + "/vpn/ikepolicies/5522aff7-1b3c-48dd-9c3c-b50f016b73db";
-        ITNeutronE2E.test_fetch(url, false, "IKE Policy Element Negative GET failed");
+        HttpUtils.test_fetch(url, false, "IKE Policy Element Negative GET failed");
     }
 
     public static void runTests(String base) {
index b00bdec8b25e39d4ce8a1c2d1b3a01b0ac570998..06a4c71d0a9df1c5adf019639f2207af6c5d1afc 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronIpSecPoliciesTests {
 
     public void ipsecPolicy_collection_get_test() {
         String url = base + "/vpn/ipsecpolicies";
-        ITNeutronE2E.test_fetch(url, "IPSEC Policy Collection GET failed");
+        HttpUtils.test_fetch(url, "IPSEC Policy Collection GET failed");
     }
 
     public String singleton_ipsecPolicy_create_test() {
@@ -28,13 +28,13 @@ public class NeutronIpSecPoliciesTests {
                 + "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\","
                 + "\"lifetime\": { \"units\": \"seconds\", \"value\": 7200 },"
                 + "\"id\": \"5291b189-fd84-46e5-84bd-78f40c05d69c\"," + "\"description\": \"\" } }";
-        ITNeutronE2E.test_create(url, content, "IPSEC Policy POST failed");
+        HttpUtils.test_create(url, content, "IPSEC Policy POST failed");
         return content;
     }
 
     public void singleton_ipsecPolicy_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/vpn/ipsecpolicies";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "ipsecpolicies");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "ipsecpolicies");
     }
 
     public void ipsecPolicy_update_test() {
@@ -45,12 +45,12 @@ public class NeutronIpSecPoliciesTests {
                 + "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\","
                 + "\"lifetime\": { \"units\": \"seconds\", \"value\": 3600 },"
                 + "\"id\": \"5291b189-fd84-46e5-84bd-78f40c05d69c\"," + "\"description\": \"\" } }";
-        ITNeutronE2E.test_modify(url, content, "IPSEC Policy PUT failed");
+        HttpUtils.test_modify(url, content, "IPSEC Policy PUT failed");
     }
 
     public void ipsecPolicy_element_get_test() {
         String url = base + "/vpn/ipsecpolicies/5291b189-fd84-46e5-84bd-78f40c05d69c";
-        ITNeutronE2E.test_fetch(url, true, "IPSEC Policy Element GET failed");
+        HttpUtils.test_fetch(url, true, "IPSEC Policy Element GET failed");
     }
 
     public void ipsecPolicy_element_get_with_query_test() {
@@ -58,17 +58,17 @@ public class NeutronIpSecPoliciesTests {
                 + "?fields=id&fields=tenant_id&fields=name&fields=description&fields=pfs"
                 + "&fields=encapsulation_mode&fields=transform_protocol"
                 + "&fields=auth_algorithm&fields=encryption_algorithm";
-        ITNeutronE2E.test_fetch(url, true, "IPSEC Policy Element GET With Query failed");
+        HttpUtils.test_fetch(url, true, "IPSEC Policy Element GET With Query failed");
     }
 
     public void ipsecPolicy_delete_test() {
         String url = base + "/vpn/ipsecpolicies/5291b189-fd84-46e5-84bd-78f40c05d69c";
-        ITNeutronE2E.test_delete(url, "IPSEC Policy DELETE failed");
+        HttpUtils.test_delete(url, "IPSEC Policy DELETE failed");
     }
 
     public void ipsecPolicy_element_negative_get_test() {
         String url = base + "/vpn/ipsecpolicies/5291b189-fd84-46e5-84bd-78f40c05d69c";
-        ITNeutronE2E.test_fetch(url, false, "IPSEC Policy Element Negative GET failed");
+        HttpUtils.test_fetch(url, false, "IPSEC Policy Element Negative GET failed");
     }
 
     public static void runTests(String base) {
index 538e2185b60e6b35f78da8d7caebbd0700055ae9..15202c9a996918a3f1db16d994d85b7fbfb436e9 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronIpSecSiteConnectionTests {
 
     public void ipsecSiteConnection_collection_get_test() {
         String url = base + "/vpn/ipsecsiteconnections";
-        ITNeutronE2E.test_fetch(url, "IPSEC Site Connection Collection GET failed");
+        HttpUtils.test_fetch(url, "IPSEC Site Connection Collection GET failed");
     }
 
     public String singleton_ipsecSiteConnection_create_test() {
@@ -32,13 +32,13 @@ public class NeutronIpSecSiteConnectionTests {
                 + "\"peer_address\": \"172.24.4.233\"," + "\"peer_id\": \"172.24.4.233\","
                 + "\"id\": \"af44dfd7-cf91-4451-be57-cd4fdd96b5dc\","
                 + "\"ipsecpolicy_id\": \"22b8abdc-e822-45b3-90dd-f2c8512acfa5\" } }";
-        ITNeutronE2E.test_create(url, content, "IPSEC Site Connection POST failed");
+        HttpUtils.test_create(url, content, "IPSEC Site Connection POST failed");
         return content;
     }
 
     public void singleton_ipsecSiteConnection_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/vpn/ipsecsiteconnections";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "ipsec_site_connections");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "ipsec_site_connections");
     }
 
     public void ipsecSiteConnection_update_test() {
@@ -53,12 +53,12 @@ public class NeutronIpSecSiteConnectionTests {
                 + "\"peer_address\": \"172.24.4.233\"," + "\"peer_id\": \"172.24.4.233\","
                 + "\"id\": \"af44dfd7-cf91-4451-be57-cd4fdd96b5dc\","
                 + "\"ipsecpolicy_id\": \"9958d4fe-3719-4e8c-84e7-9893895b76b4\" } }";
-        ITNeutronE2E.test_modify(url, content, "IPSEC Site Connection PUT failed");
+        HttpUtils.test_modify(url, content, "IPSEC Site Connection PUT failed");
     }
 
     public void ipsecSiteConnection_element_get_test() {
         String url = base + "/vpn/ipsecsiteconnections/af44dfd7-cf91-4451-be57-cd4fdd96b5dc";
-        ITNeutronE2E.test_fetch(url, true, "IPSEC Site Connection Element GET failed");
+        HttpUtils.test_fetch(url, true, "IPSEC Site Connection Element GET failed");
     }
 
     public void ipsecSiteConnection_element_get_with_query_test() {
@@ -67,17 +67,17 @@ public class NeutronIpSecSiteConnectionTests {
                 + "&fields=peer_id&fields=route_mode&fields=auth_mode&fields=initiator"
                 + "&fields=mtu&fields=psk&fields=admin_state_up&fields=status&fields=ikepolicy_id"
                 + "&fields=ipsecpolicy_id&fields=vpnservice_id";
-        ITNeutronE2E.test_fetch(url, true, "IPSEC Site Connection Element GET With Query failed");
+        HttpUtils.test_fetch(url, true, "IPSEC Site Connection Element GET With Query failed");
     }
 
     public void ipsecSiteConnection_delete_test() {
         String url = base + "/vpn/ipsecsiteconnections/af44dfd7-cf91-4451-be57-cd4fdd96b5dc";
-        ITNeutronE2E.test_delete(url, "IPSEC Site Connection DELETE failed");
+        HttpUtils.test_delete(url, "IPSEC Site Connection DELETE failed");
     }
 
     public void ipsecSiteConnection_element_negative_get_test() {
         String url = base + "/vpn/ipsecsiteconnections/af44dfd7-cf91-4451-be57-cd4fdd96b5dc";
-        ITNeutronE2E.test_fetch(url, false, "IPSEC Site Connection Element Negative GET failed");
+        HttpUtils.test_fetch(url, false, "IPSEC Site Connection Element Negative GET failed");
     }
 
     public static void runTests(String base) {
index fb10e0869f33ec599f0ae80b9488ec6e73b1700d..a9298f2a0d0fa900a27d0ec6bbe903604d214aee 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronL2GatewayConnectionTests {
 
     public void l2gateway_connection_collection_get_test() {
         String url = base + "/l2gateway-connections";
-        ITNeutronE2E.test_fetch(url, "Firewall Collection GET failed");
+        HttpUtils.test_fetch(url, "Firewall Collection GET failed");
     }
 
     public String singleton_l2gateway_connection_create_test() {
@@ -27,35 +27,35 @@ public class NeutronL2GatewayConnectionTests {
                 + "\"network_id\": \"c69933c1-b472-44f9-8226-30dc4ffd454c\","
                 + "\"id\": \"3b0ef8f4-82c7-44d4-a4fb-6177f9a21977\","
                 + "\"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_create(url, content, "L2 Gateway Connection Singleton Post Failed");
+        HttpUtils.test_create(url, content, "L2 Gateway Connection Singleton Post Failed");
         return content;
     }
 
     public void singleton_l2gateway_connection_get_with_one_query_test(String createJsonString) {
         String url = base + "/l2gateway-connections";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "l2gateway_connections");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "l2gateway_connections");
     }
 
     public void l2gateway_connection_element_get_test() {
         String url = base + "/l2gateway-connections/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_fetch(url, true, "L2 Gateway Connection Element Get Failed");
+        HttpUtils.test_fetch(url, true, "L2 Gateway Connection Element Get Failed");
     }
 
     public void l2gateway_connection_element_get_with_query_test() {
         String url = base + "/l2gateway-connections/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977"
                 + "?fields=tenant_id&fields=connection_id&fields=gateway_id"
                 + "&fields=network_id&fields=port_id&fields=segmentation_id";
-        ITNeutronE2E.test_fetch(url, true, "L2 Gateway Connection Element Get With Query Failed");
+        HttpUtils.test_fetch(url, true, "L2 Gateway Connection Element Get With Query Failed");
     }
 
     public void l2gateway_connection_delete_test() {
         String url = base + "/l2gateway-connections/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_delete(url, "L2 Gateway Connection Delete Failed");
+        HttpUtils.test_delete(url, "L2 Gateway Connection Delete Failed");
     }
 
     public void l2gateway_connection_element_negative_get_test() {
         String url = base + "/l2gateway-connections/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_fetch(url, false, "L2 Gateway Connection Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "L2 Gateway Connection Element Negative Get Failed");
     }
 
     public void l2gateway_connection_create_without_port_test() {
@@ -65,17 +65,17 @@ public class NeutronL2GatewayConnectionTests {
                 + "\"network_id\": \"9227c228-6bba-4bbe-bdb8-6942768ff0f1\","
                 + "\"id\": \"5227c228-6bba-4bbe-bdb8-6942768ff0e1\","
                 + "\"tenant_id\": \"de0a7495-05c4-4be0-b796-1412835c6820\" } }";
-        ITNeutronE2E.test_create(url, content, "L2 Gateway Connection with No PortId - Singleton Post Failed");
+        HttpUtils.test_create(url, content, "L2 Gateway Connection with No PortId - Singleton Post Failed");
     }
 
     public void l2gateway_connection_element_get_without_port_test() {
         String url = base + "/l2gateway-connections/5227c228-6bba-4bbe-bdb8-6942768ff0e1";
-        ITNeutronE2E.test_fetch(url, true, "L2 Gateway Connection with No PortId - Element Get Failed");
+        HttpUtils.test_fetch(url, true, "L2 Gateway Connection with No PortId - Element Get Failed");
     }
 
     public void l2gateway_connection_delete_without_port_test() {
         String url = base + "/l2gateway-connections/5227c228-6bba-4bbe-bdb8-6942768ff0e1";
-        ITNeutronE2E.test_delete(url, "L2 Gateway Connection with No PortId - Delete Failed");
+        HttpUtils.test_delete(url, "L2 Gateway Connection with No PortId - Delete Failed");
     }
 
     public static void runTests(String base) {
index ca50c59e63a347e3323c9f3125ab2bb63e3b9c30..bf6d19600572007ccce545bde789a87a95e1cb3e 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronL2GatewayTests {
 
     public void l2gateway_collection_get_test() {
         String url = base + "/l2-gateways?limit=5&name=gateway1";
-        ITNeutronE2E.test_fetch(url, "Firewall Collection GET failed");
+        HttpUtils.test_fetch(url, "Firewall Collection GET failed");
     }
 
     public String singleton_l2gateway_create_test() {
@@ -27,13 +27,13 @@ public class NeutronL2GatewayTests {
                 + "\"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\","
                 + "\"devices\": [{ \"device_name\": \"device1\"," + "\"id\": \"0a24b09a-88a1-4f2c-94e9-92515972a704\","
                 + "\"interfaces\": [{\"name\": \"interface1\", \"segmentation_id\": [100] }] }]" + "} }";
-        ITNeutronE2E.test_create(url, content, "L2 Gateway Singleton Post Failed");
+        HttpUtils.test_create(url, content, "L2 Gateway Singleton Post Failed");
         return content;
     }
 
     public void singleton_l2gateway_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/l2-gateways";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "l2_gateways");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "l2_gateways");
     }
 
     public void l2gateway_modify_test() {
@@ -43,28 +43,28 @@ public class NeutronL2GatewayTests {
                 + "\"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\","
                 + "\"devices\": [{ \"device_name\": \"device1\"," + "\"id\": \"0a24b09a-88a1-4f2c-94e9-92515972a704\","
                 + "\"interfaces\": [{\"name\": \"interface1\", \"segmentation_id\": [100, 50] }] }]" + "} }";
-        ITNeutronE2E.test_modify(url, content, "L2 Gateway  Singleton Put Failed");
+        HttpUtils.test_modify(url, content, "L2 Gateway  Singleton Put Failed");
     }
 
     public void l2gateway_element_get_test() {
         String url = base + "/l2-gateways/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_fetch(url, true, "L2 Gateway  Element Get Failed");
+        HttpUtils.test_fetch(url, true, "L2 Gateway  Element Get Failed");
     }
 
     public void l2gateway_element_get_with_query_test() {
         String url = base + "/l2-gateways/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977"
                 + "?fields=tenant_id&fields=id&fields=name" + "&fields=devices";
-        ITNeutronE2E.test_fetch(url, true, "L2 Gateway Element Get With Query Failed");
+        HttpUtils.test_fetch(url, true, "L2 Gateway Element Get With Query Failed");
     }
 
     public void l2gateway_delete_test() {
         String url = base + "/l2-gateways/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_delete(url, "L2 Gateway Delete Failed");
+        HttpUtils.test_delete(url, "L2 Gateway Delete Failed");
     }
 
     public void l2gateway_element_negative_get_test() {
         String url = base + "/l2-gateways/3b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_fetch(url, false, "L2 Gateway Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "L2 Gateway Element Negative Get Failed");
     }
 
     public static void runTests(String base) {
index fdaef3081c1ac18acdec9214fbe5e5e9d8f46e86..b4601bc8ace511791898968a65e55af117474e81 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronLBHealthMonitorTests {
 
     public void healthMonitor_collection_get_test() {
         String url = base + "/lbaas/healthmonitors";
-        ITNeutronE2E.test_fetch(url, "LB Health Monitor Collection GET failed");
+        HttpUtils.test_fetch(url, "LB Health Monitor Collection GET failed");
     }
 
     public String singleton_lb_healthMonitor_create_test() {
@@ -28,13 +28,13 @@ public class NeutronLBHealthMonitorTests {
                 + "\"pools\": [ { \"id\": \"74aa2010-a59f-4d35-a436-60a6da882819\" } ],"
                 + "\"tenant_id\": \"6f3584d5754048a18e30685362b88411\"," + "\"timeout\": 1, \"type\": \"HTTP\","
                 + "\"url_path\": \"/index.html\" } }";
-        ITNeutronE2E.test_create(url, content, "Singleton LB Health Monitor Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton LB Health Monitor Post Failed NB");
         return content;
     }
 
     public void singleton_lb_healthMonitor_with_one_query_item_test(String createJsonString) {
         String url = base + "/lbaas/healthmonitors";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "healthmonitors");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "healthmonitors");
     }
 
     public void healthMonitor_update_test() {
@@ -45,12 +45,12 @@ public class NeutronLBHealthMonitorTests {
                 + "\"pools\": [ { \"id\": \"74aa2010-a59f-4d35-a436-60a6da882819\" } ],"
                 + "\"tenant_id\": \"6f3584d5754048a18e30685362b88411\"," + "\"timeout\": 2, \"type\": \"HTTP\","
                 + "\"url_path\": \"/page.html\" } }";
-        ITNeutronE2E.test_modify(url, content, "LB Health Monitor Put Failed");
+        HttpUtils.test_modify(url, content, "LB Health Monitor Put Failed");
     }
 
     public void healthMonitor_element_get_test() {
         String url = base + "/lbaas/healthmonitors/0a9ac99d-0a09-4b18-8499-a0796850279a";
-        ITNeutronE2E.test_fetch(url, true, "LB Health Monitor Element Get Failed");
+        HttpUtils.test_fetch(url, true, "LB Health Monitor Element Get Failed");
     }
 
     public void healthMonitor_element_get_with_query_test() {
@@ -58,17 +58,17 @@ public class NeutronLBHealthMonitorTests {
                 + "?fields=id&fields=tenant_id&fields=type&fields=delay&fields=timeout"
                 + "&fields=max_retries&fields=http_method&fields=url_path&fields=admin_state_up"
                 + "&fields=expected_codes&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "LB Health Monitor Element Get Failed");
+        HttpUtils.test_fetch(url, true, "LB Health Monitor Element Get Failed");
     }
 
     public void healthMonitor_element_negative_get_test() {
         String url = base + "/lbaas/healthmonitors/0a9ac99d-0a09-4b18-8499-a0796850279a";
-        ITNeutronE2E.test_fetch(url, false, "LB Health Monitor Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "LB Health Monitor Element Negative Get Failed");
     }
 
     public void healthMonitor_delete_test() {
         String url = base + "/lbaas/healthmonitors/0a9ac99d-0a09-4b18-8499-a0796850279a";
-        ITNeutronE2E.test_delete(url, "LB Health Monitor Element Delete Failed");
+        HttpUtils.test_delete(url, "LB Health Monitor Element Delete Failed");
     }
 
     public static void runTests(String base) {
index 6e5f5e87d44e9784ac93abe536330ea17a15e81a..42590203c260e20eaf37ca0a1fcf19d942a06692 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronLBListenerTests {
 
     public void listener_collection_get_test() {
         String url = base + "/lbaas/listeners";
-        ITNeutronE2E.test_fetch(url, "LB Listener Collection GET failed");
+        HttpUtils.test_fetch(url, "LB Listener Collection GET failed");
     }
 
     //TODO handle SB check
@@ -29,13 +29,13 @@ public class NeutronLBListenerTests {
                 + "\"id\": \"a36c20d0-18e9-42ce-88fd-82a35977ee8c\" } ], " + "\"name\": \"listener1\", "
                 + "\"protocol\": \"HTTP\", " + "\"protocol_port\": 80, "
                 + "\"tenant_id\": \"b7c1a69e88bf4b21a8148f787aef2081\" } }";
-        ITNeutronE2E.test_create(url, content, "Singleton LB Listener Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton LB Listener Post Failed NB");
         return content;
     }
 
     public void singleton_lb_listener_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/lbaas/listeners";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "listeners");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "listeners");
     }
 
     public void listener_update_test() {
@@ -46,12 +46,12 @@ public class NeutronLBListenerTests {
                 + "\"id\": \"a36c20d0-18e9-42ce-88fd-82a35977ee8c\" } ]," + "\"name\": \"listener2\","
                 + "\"protocol\": \"HTTP\"," + "\"protocol_port\": 80,"
                 + "\"tenant_id\": \"1a3e005cf9ce40308c900bcb08e5320c\" } }";
-        ITNeutronE2E.test_modify(url, content, "LB Listener Put Failed");
+        HttpUtils.test_modify(url, content, "LB Listener Put Failed");
     }
 
     public void listener_element_get_test() {
         String url = base + "/lbaas/listeners/39de4d56-d663-46e5-85a1-5b9d5fa17829";
-        ITNeutronE2E.test_fetch(url, true, "LB Listener Element Get Failed");
+        HttpUtils.test_fetch(url, true, "LB Listener Element Get Failed");
     }
 
     public void listener_element_get_with_query_test() {
@@ -59,17 +59,17 @@ public class NeutronLBListenerTests {
                 + "?fields=id&fields=tenant_id&fields=name&fields=description"
                 + "&fields=default_pool_id&fields=protocol&fields=protocol_port"
                 + "&fields=admin_state_up&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "LB Listener Element Get With Query Failed");
+        HttpUtils.test_fetch(url, true, "LB Listener Element Get With Query Failed");
     }
 
     public void listener_element_negative_get_test() {
         String url = base + "/lbaas/listeners/39de4d56-d663-46e5-85a1-5b9d5fa17829";
-        ITNeutronE2E.test_fetch(url, false, "LB Listener Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "LB Listener Element Negative Get Failed");
     }
 
     public void listener_delete_test() {
         String url = base + "/lbaas/listeners/39de4d56-d663-46e5-85a1-5b9d5fa17829";
-        ITNeutronE2E.test_delete(url, "LB Listener Element Delete Failed");
+        HttpUtils.test_delete(url, "LB Listener Element Delete Failed");
     }
 
     public String test_bug6398_lb_listener_create_test() {
@@ -80,7 +80,7 @@ public class NeutronLBListenerTests {
                 + "\"id\": \"a36c20d0-18e9-42ce-88fd-82a35977ee8c\" } ], " + "\"name\": \"listener1\", "
                 + "\"protocol\": \"http\", " + "\"protocol_port\": 80, "
                 + "\"tenant_id\": \"b7c1a69e88bf4b21a8148f787aef2081\" } }";
-        ITNeutronE2E.test_create(url, 400, content, "LB Listener Post Bug 6398 regressed");
+        HttpUtils.test_create(url, 400, content, "LB Listener Post Bug 6398 regressed");
         return content;
     }
 
index 8c45fa2ea68b9582414543d0d6849be0b60e4f4a..406934e4805ac1b0e0c3f52f6687b1d636a63dba 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronLBPoolMembersTests {
 
     public void pool_member_collection_get_test() {
         String url = base + "/lbaas/pools/12ff63af-4127-4074-a251-bcb2ecc53ebe/members";
-        ITNeutronE2E.test_fetch(url, "LB Pool Member Collection GET failed");
+        HttpUtils.test_fetch(url, "LB Pool Member Collection GET failed");
     }
 
     //TODO handle SB check
@@ -27,13 +27,13 @@ public class NeutronLBPoolMembersTests {
                 + "\"id\": \"9a7aff27-fd41-4ec1-ba4c-3eb92c629313\"," + "\"protocol_port\": 80,"
                 + "\"subnet_id\": \"013d3059-87a4-45a5-91e9-d721068ae0b2\","
                 + "\"tenant_id\": \"1a3e005cf9ce40308c900bcb08e5320c\"," + "\"weight\": 1 } }";
-        ITNeutronE2E.test_create(url, content, "Singleton LB Pool Member Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton LB Pool Member Post Failed NB");
         return content;
     }
 
     public void singleton_lb_pool_member_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/lbaas/pools/12ff63af-4127-4074-a251-bcb2ecc53ebe/members";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "members");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "members");
     }
 
     public void pool_member_update_test() {
@@ -43,13 +43,13 @@ public class NeutronLBPoolMembersTests {
                 + "\"id\": \"9a7aff27-fd41-4ec1-ba4c-3eb92c629313\"," + "\"protocol_port\": 80,"
                 + "\"subnet_id\": \"013d3059-87a4-45a5-91e9-d721068ae0b2\","
                 + "\"tenant_id\": \"1a3e005cf9ce40308c900bcb08e5320c\"," + "\"weight\": 5 } }";
-        ITNeutronE2E.test_modify(url, content, "LB Pool Member Put Failed");
+        HttpUtils.test_modify(url, content, "LB Pool Member Put Failed");
     }
 
     public void pool_member_element_get_test() {
         String url = base
                 + "/lbaas/pools/12ff63af-4127-4074-a251-bcb2ecc53ebe/members/9a7aff27-fd41-4ec1-ba4c-3eb92c629313";
-        ITNeutronE2E.test_fetch(url, true, "LB Pool Member Element Get Failed");
+        HttpUtils.test_fetch(url, true, "LB Pool Member Element Get Failed");
     }
 
     public void pool_member_element_get_with_query_test() {
@@ -58,19 +58,19 @@ public class NeutronLBPoolMembersTests {
                 + "?fields=id&fields=tenant_id&fields=address&fields=protocol_port"
                 + "&fields=weight&fields=subnet_id&fields=admin_state_up"
                 + "&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "LB Pool Member Element Get With Query Failed");
+        HttpUtils.test_fetch(url, true, "LB Pool Member Element Get With Query Failed");
     }
 
     public void pool_member_element_negative_get_test() {
         String url = base
                 + "/lbaas/pools/12ff63af-4127-4074-a251-bcb2ecc53ebe/members/9a7aff27-fd41-4ec1-ba4c-3eb92c629313";
-        ITNeutronE2E.test_fetch(url, false, "LB Pool Member Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "LB Pool Member Element Negative Get Failed");
     }
 
     public void pool_member_delete_test() {
         String url = base
                 + "/lbaas/pools/12ff63af-4127-4074-a251-bcb2ecc53ebe/members/9a7aff27-fd41-4ec1-ba4c-3eb92c629313";
-        ITNeutronE2E.test_delete(url, "LB Pool Member Element Delete Failed");
+        HttpUtils.test_delete(url, "LB Pool Member Element Delete Failed");
     }
 
     public static void runTests(String base) {
index 39f893199ebc59932250551841dd8247f5d47a5c..90142b4dca23f7eca8364701f769e0832e339be6 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronLBPoolTests {
 
     public void pool_collection_get_test() {
         String url = base + "/lbaas/pools";
-        ITNeutronE2E.test_fetch(url, "LB Pool Collection GET failed");
+        HttpUtils.test_fetch(url, "LB Pool Collection GET failed");
     }
 
     //TODO handle SB check
@@ -30,13 +30,13 @@ public class NeutronLBPoolTests {
                 + "\"name\": \"pool1\", " + "\"protocol\": \"HTTP\", " + "\"session_persistence\": { "
                 + "\"cookie_name\": \"my_cookie\", " + "\"type\": \"APP_COOKIE\" }, "
                 + "\"tenant_id\": \"b7c1a69e88bf4b21a8148f787aef2081\" } }";
-        ITNeutronE2E.test_create(url, content, "Singleton LB Pool Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton LB Pool Post Failed NB");
         return content;
     }
 
     public void singleton_lb_pool_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/lbaas/pools";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "pools");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "pools");
     }
 
     public void pool_update_test() {
@@ -47,12 +47,12 @@ public class NeutronLBPoolTests {
                 + "\"id\": \"39de4d56-d663-46e5-85a1-5b9d5fa17829\" } ]," + "\"members\": []," + "\"name\": \"pool2\","
                 + "\"protocol\": \"HTTP\"," + "\"session_persistence\": { \"cookie_name\": null,"
                 + "\"type\": \"HTTP_COOKIE\" }," + "\"tenant_id\": \"1a3e005cf9ce40308c900bcb08e5320c\" } }";
-        ITNeutronE2E.test_modify(url, content, "LB Pool Put Failed");
+        HttpUtils.test_modify(url, content, "LB Pool Put Failed");
     }
 
     public void pool_element_get_test() {
         String url = base + "/lbaas/pools/12ff63af-4127-4074-a251-bcb2ecc53ebe";
-        ITNeutronE2E.test_fetch(url, true, "LB Pool Element Get Failed");
+        HttpUtils.test_fetch(url, true, "LB Pool Element Get Failed");
     }
 
     public void pool_element_get_with_query_test() {
@@ -60,17 +60,17 @@ public class NeutronLBPoolTests {
                 + "?fields=id&fields=tenant_id&fields=name&fields=description"
                 + "&fields=lb_algorithm&fields=protocol&fields=healthmonitor_id"
                 + "&fields=members&fields=admin_state_up&fields=limit&fields=marker" + "&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "LB Pool Element Get With Query Failed");
+        HttpUtils.test_fetch(url, true, "LB Pool Element Get With Query Failed");
     }
 
     public void pool_element_negative_get_test() {
         String url = base + "/lbaas/pools/12ff63af-4127-4074-a251-bcb2ecc53ebe";
-        ITNeutronE2E.test_fetch(url, false, "LB Pool Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "LB Pool Element Negative Get Failed");
     }
 
     public void pool_delete_test() {
         String url = base + "/lbaas/pools/12ff63af-4127-4074-a251-bcb2ecc53ebe";
-        ITNeutronE2E.test_delete(url, "LB Pool Element Delete Failed");
+        HttpUtils.test_delete(url, "LB Pool Element Delete Failed");
     }
 
     public static void runTests(String base) {
index 1bc0fa9f2f86cb25ffc7729645308d0352a04eab..c788d1d93926c1f49f756f99d9d2e3b002154943 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronLoadBalancerTests {
 
     public void loadBalancer_collection_get_test() {
         String url = base + "/lbaas/loadbalancers";
-        ITNeutronE2E.test_fetch(url, "Load Balancer Collection GET failed");
+        HttpUtils.test_fetch(url, "Load Balancer Collection GET failed");
     }
 
     //TODO handle SB check
@@ -28,13 +28,13 @@ public class NeutronLoadBalancerTests {
                 + "\"name\": \"loadbalancer1\", " + "\"operating_status\": \"ONLINE\", "
                 + "\"provisioning_status\": \"ACTIVE\", " + "\"tenant_id\": \"b7c1a69e88bf4b21a8148f787aef2081\", "
                 + "\"vip_address\": \"10.0.0.4\", " + "\"vip_subnet_id\": \"013d3059-87a4-45a5-91e9-d721068ae0b2\" } }";
-        ITNeutronE2E.test_create(url, content, "Singleton Load Balancer Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Load Balancer Post Failed NB");
         return content;
     }
 
     public void singleton_loadbalancer_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/lbaas/loadbalancers";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "loadbalancers");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "loadbalancers");
     }
 
     public void loadBalancer_update_test() {
@@ -45,29 +45,29 @@ public class NeutronLoadBalancerTests {
                 + "\"provisioning_status\": \"PENDING_UPDATE\","
                 + "\"tenant_id\": \"b7c1a69e88bf4b21a8148f787aef2081\"," + "\"vip_address\": \"10.0.0.4\","
                 + "\"vip_subnet_id\": \"013d3059-87a4-45a5-91e9-d721068ae0b2\" } }";
-        ITNeutronE2E.test_modify(url, content, "Load Balancer Put Failed");
+        HttpUtils.test_modify(url, content, "Load Balancer Put Failed");
     }
 
     public void loadBalancer_element_get_test() {
         String url = base + "/lbaas/loadbalancers/a36c20d0-18e9-42ce-88fd-82a35977ee8c";
-        ITNeutronE2E.test_fetch(url, true, "Load Balancer Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Load Balancer Element Get Failed");
     }
 
     public void loadBalancer_element_get_with_query_test() {
         String url = base + "/lbaas/loadbalancers/a36c20d0-18e9-42ce-88fd-82a35977ee8c"
                 + "?fields=id&fields=listeners&fields=name&fields=operating_status&"
                 + "&fields=provisioning_status&fields=tenant_id&fields=vip_address" + "&fields=vip_subnet_id";
-        ITNeutronE2E.test_fetch(url, true, "Load Balancer Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Load Balancer Element Get Failed");
     }
 
     public void loadBalancer_element_negative_get_test() {
         String url = base + "/lbaas/loadbalancers/a36c20d0-18e9-42ce-88fd-82a35977ee8c";
-        ITNeutronE2E.test_fetch(url, false, "Load Balancer Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Load Balancer Element Negative Get Failed");
     }
 
     public void loadBalancer_delete_test() {
         String url = base + "/lbaas/loadbalancers/a36c20d0-18e9-42ce-88fd-82a35977ee8c";
-        ITNeutronE2E.test_delete(url, "Load Balancer Element Delete Failed");
+        HttpUtils.test_delete(url, "Load Balancer Element Delete Failed");
     }
 
     public static void runTests(String base) {
index 4d8fda2a1d1a96cad5c51037924b23b62fc8c5b9..7071de1637a8966d5cddf98cf2b0aae70d6e08a4 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronMeteringLabelTests {
 
     public void meteringLabel_collection_get_test() {
         String url = base + "/metering/metering-labels";
-        ITNeutronE2E.test_fetch(url, "Metering Label Collection GET failed");
+        HttpUtils.test_fetch(url, "Metering Label Collection GET failed");
     }
 
     //TODO handle SB check
@@ -26,28 +26,28 @@ public class NeutronMeteringLabelTests {
         String content = "{ \"metering_label\": { " + "\"tenant_id\": \"45345b0ee1ea477fac0f541b2cb79cd4\", "
                 + "\"description\": \"description of label1\", " + "\"name\": \"label1\", "
                 + "\"id\": \"bc91b832-8465-40a7-a5d8-ba87de442266\" } }";
-        ITNeutronE2E.test_create(url, content, "Singleton Metering Label Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Metering Label Post Failed NB");
     }
 
     public void meteringLabel_element_get_test() {
         String url = base + "/metering/metering-labels/bc91b832-8465-40a7-a5d8-ba87de442266";
-        ITNeutronE2E.test_fetch(url, true, "Metering Label Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Metering Label Element Get Failed");
     }
 
     public void meteringLabel_element_get_with_query_test() {
         String url = base + "/metering/metering-labels/bc91b832-8465-40a7-a5d8-ba87de442266"
                 + "?fields=id&fields=tenant_id&fields=name&fields=description";
-        ITNeutronE2E.test_fetch(url, true, "Metering Label Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Metering Label Element Get Failed");
     }
 
     public void meteringLabel_delete_test() {
         String url = base + "/metering/metering-labels/bc91b832-8465-40a7-a5d8-ba87de442266";
-        ITNeutronE2E.test_delete(url, "Metering Label Element Delete Failed");
+        HttpUtils.test_delete(url, "Metering Label Element Delete Failed");
     }
 
     public void meteringLabel_element_negative_get_test() {
         String url = base + "/metering/metering-labels/bc91b832-8465-40a7-a5d8-ba87de442266";
-        ITNeutronE2E.test_fetch(url, false, "Metering Label Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Metering Label Element Negative Get Failed");
     }
 
     public static void runTests(String base) {
index 0ea7ea767cdc1131901cf845ebdc4fc66f11cc78..d25b51a76fc95fae95043f38bf0b6ea62bd71a87 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronMeteringRuleTests {
 
     public void meteringRule_collection_get_test() {
         String url = base + "/metering/metering-label-rules";
-        ITNeutronE2E.test_fetch(url, "Metering Rule Collection GET failed");
+        HttpUtils.test_fetch(url, "Metering Rule Collection GET failed");
     }
 
     //TODO handle SB check
@@ -26,28 +26,28 @@ public class NeutronMeteringRuleTests {
         String content = "{ \"metering_label_rule\": { " + "\"remote_ip_prefix\": \"10.0.1.0/24\", "
                 + "\"direction\": \"ingress\", " + "\"metering_label_id\": \"bc91b832-8465-40a7-a5d8-ba87de442266\", "
                 + "\"id\": \"00e13b58-b4f2-4579-9c9c-7ac94615f9ae\", " + "\"excluded\": false } }";
-        ITNeutronE2E.test_create(url, content, "Singleton Metering Rule Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Metering Rule Post Failed NB");
     }
 
     public void meteringRule_element_get_test() {
         String url = base + "/metering/metering-label-rules/00e13b58-b4f2-4579-9c9c-7ac94615f9ae";
-        ITNeutronE2E.test_fetch(url, true, "Metering Rule Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Metering Rule Element Get Failed");
     }
 
     public void meteringRule_element_get_with_query_test() {
         String url = base + "/metering/metering-label-rules/00e13b58-b4f2-4579-9c9c-7ac94615f9ae"
                 + "?fields=id&fields=direction&fields=remote_ip_prefix&fields=metering_label_id";
-        ITNeutronE2E.test_fetch(url, true, "Metering Rule Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Metering Rule Element Get Failed");
     }
 
     public void meteringRule_delete_test() {
         String url = base + "/metering/metering-label-rules/00e13b58-b4f2-4579-9c9c-7ac94615f9ae";
-        ITNeutronE2E.test_delete(url, "Metering Rule Element Delete Failed");
+        HttpUtils.test_delete(url, "Metering Rule Element Delete Failed");
     }
 
     public void meteringRule_element_negative_get_test() {
         String url = base + "/metering/metering-label-rules/00e13b58-b4f2-4579-9c9c-7ac94615f9ae";
-        ITNeutronE2E.test_fetch(url, false, "Metering Rule Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Metering Rule Element Negative Get Failed");
     }
 
     public void bug4224_ipv6_test() {
@@ -55,9 +55,9 @@ public class NeutronMeteringRuleTests {
         String content = "{ \"metering_label_rule\": { " + "\"remote_ip_prefix\": \"fe80::1/10\", "
                 + "\"direction\": \"ingress\", " + "\"metering_label_id\": \"bc91b832-8465-40a7-a5d8-ba87de442266\", "
                 + "\"id\": \"00e13b58-b4f2-4579-9c9c-7ac94615f9ae\", " + "\"excluded\": false } }";
-        ITNeutronE2E.test_create(url, content, "Metering Rule Bug4224 IPv6 Failed NB");
+        HttpUtils.test_create(url, content, "Metering Rule Bug4224 IPv6 Failed NB");
         url = url + "/00e13b58-b4f2-4579-9c9c-7ac94615f9ae";
-        ITNeutronE2E.test_delete(url, "Metering Rule Element Delete Failed");
+        HttpUtils.test_delete(url, "Metering Rule Element Delete Failed");
     }
 
     public static void runTests(String base) {
index eee371a15bc7ca00f28749bf4cc8a0dcfbf515bb..9610b022a61f69b8876dcc7dc6d8cae049b52005 100644 (file)
@@ -33,7 +33,7 @@ public class NeutronNetworkTests {
     public void network_collection_get_test_with_wait() throws IOException, InterruptedException {
         URL url = new URL(base + "/networks");
         for (int retry = 0; retry < TIMEOUT; retry++) {
-            HttpURLConnection httpConn = ITNeutronE2E.httpURLConnectionFactoryGet(url);
+            HttpURLConnection httpConn = HttpUtils.httpURLConnectionFactoryGet(url);
             int responseCode;
             try {
                 responseCode = httpConn.getResponseCode();
@@ -66,13 +66,13 @@ public class NeutronNetworkTests {
                 + " \"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50453\", "
                 + " \"provider:network_type\": \"stt\" } ], "
                 + " \"shared\": false, \"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" " + " } } ";
-        ITNeutronE2E.test_create(url, content, "Singleton Network Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Network Post Failed NB");
         return content;
     }
 
     public void singleton_network_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/networks";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "networks");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "networks");
     }
 
     public String singleton_default_network_create_test() {
@@ -85,7 +85,7 @@ public class NeutronNetworkTests {
                 + " \"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50453\", "
                 + " \"provider:network_type\": \"stt\" } ], "
                 + " \"id\": \"de8e5957-d49f-d77b-de5b-d1f75b21c03c\" " + " } } ";
-        ITNeutronE2E.test_create(url, content, "Singleton Default Network Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Default Network Post Failed NB");
         return content;
     }
 
@@ -96,13 +96,13 @@ public class NeutronNetworkTests {
         String url = base + "/networks/de8e5957-d49f-d77b-de5b-d1f75b21c03c?fields=" + element;
         String expectedContent = "\"ACTIVE\"";
         String context = "Network details do not match.";
-        JsonObject jsonObjectOutput = ITNeutronE2E.test_fetch_gson(url, context);
+        JsonObject jsonObjectOutput = HttpUtils.test_fetch_gson(url, context);
         jsonObjectOutput = jsonObjectOutput.getAsJsonObject("network");
         JsonElement jsonElementValue = jsonObjectOutput.get(element);
         Assert.assertEquals(context, expectedContent, String.valueOf(jsonElementValue));
         element = "shared";
         url = base + "/networks/de8e5957-d49f-d77b-de5b-d1f75b21c03c?fields=" + element;
-        jsonObjectOutput = ITNeutronE2E.test_fetch_gson(url, context);
+        jsonObjectOutput = HttpUtils.test_fetch_gson(url, context);
         jsonObjectOutput = jsonObjectOutput.getAsJsonObject("network");
         jsonElementValue = jsonObjectOutput.get(element);
         Assert.assertEquals(context, false, jsonElementValue.getAsBoolean());
@@ -116,7 +116,7 @@ public class NeutronNetworkTests {
                 + " \"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
                 + " \"router:external\": true, \"shared\": false, "
                 + " \"id\": \"8ca37218-28ff-41cb-9b10-039601ea7e6b\" } } ";
-        ITNeutronE2E.test_create(url, content, "External Network Post Failed NB");
+        HttpUtils.test_create(url, content, "External Network Post Failed NB");
     }
 
     //TODO handle SB check
@@ -132,7 +132,7 @@ public class NeutronNetworkTests {
                 + "\"tenant_id\": \"4fd44f30292945e481c7b8a0c8908869\", " + "\"provider:network_type\": \"local\", "
                 + "\"shared\": false, " + "\"id\": \"af374017-c9ae-4a1d-b799-ab73111476e2\", "
                 + "\"provider:segmentation_id\": null } ] } ";
-        ITNeutronE2E.test_create(url, content, "Bulk Network Post Failed");
+        HttpUtils.test_create(url, content, "Bulk Network Post Failed");
     }
 
     //TODO handle SB check
@@ -143,17 +143,17 @@ public class NeutronNetworkTests {
                 + "\"admin_state_up\": true, " + "\"tenant_id\": \"4fd44f30292945e481c7b8a0c8908869\", "
                 + "\"provider:network_type\": \"local\", " + "\"router:external\": false, " + "\"shared\": false, "
                 + "\"provider:segmentation_id\": null } } ";
-        ITNeutronE2E.test_modify(url, content, "Network Put Failed");
+        HttpUtils.test_modify(url, content, "Network Put Failed");
     }
 
     public void network_collection_get_test() {
         String urlS = base + "/networks";
-        ITNeutronE2E.test_fetch(urlS, true, "Network collection Get Failed");
+        HttpUtils.test_fetch(urlS, true, "Network collection Get Failed");
     }
 
     public void network_element_get_test() {
         String url = base + "/networks/bc1a76cb-8767-4c3a-bb95-018b822f2130";
-        ITNeutronE2E.test_fetch(url, true, "Network Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Network Element Get Failed");
     }
 
     public void network_element_get_test_with_query() {
@@ -162,17 +162,17 @@ public class NeutronNetworkTests {
                 + "&fields=provider:physical_network&fields=admin_state_up"
                 + "&fields=tenant_id&fields=provides:network_type"
                 + "&fields=router:external&fields=shared&fields=provider:segmentation_id";
-        ITNeutronE2E.test_fetch(url, true, "Network Element with query Get Failed");
+        HttpUtils.test_fetch(url, true, "Network Element with query Get Failed");
     }
 
     public void network_element_negative_get_test() {
         String url = base + "/networks/bc1a76cb-8767-4c3a-bb95-018b822f2130";
-        ITNeutronE2E.test_fetch(url, false, "Network Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Network Element Negative Get Failed");
     }
 
     public void network_delete_test() {
         String url = base + "/networks/bc1a76cb-8767-4c3a-bb95-018b822f2130";
-        ITNeutronE2E.test_delete(url, "Network Element Delete Failed");
+        HttpUtils.test_delete(url, "Network Element Delete Failed");
     }
 
     public static void runTests(String base) throws IOException, InterruptedException {
index 52971948581358c05653af54a165ca081a4c1b9a..12df8857ca60d56873819b0ad4e94d5836dfac39 100644 (file)
@@ -21,7 +21,7 @@ public class NeutronPortTests {
 
     public void port_collection_get_test() {
         String url = base + "/ports";
-        ITNeutronE2E.test_fetch(url, "Ports Collection GET failed");
+        HttpUtils.test_fetch(url, "Ports Collection GET failed");
     }
 
     //TODO handle SB check
@@ -37,13 +37,13 @@ public class NeutronPortTests {
                 + "\"fixed_ips\": [ {" + "\"subnet_id\": \"3b80198d-4f7b-4f77-9ef5-774d54e17126\","
                 + "\"ip_address\": \"10.0.0.2\" } ]," + "\"id\": \"65c0ee9f-d634-4522-8954-51021b570b0d\","
                 + "\"security_groups\": [] ," + "\"device_id\": \"\" } }";
-        ITNeutronE2E.test_create(url, content, "Singleton Port Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Port Post Failed NB");
         return content;
     }
 
     public void singleton_port_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/ports";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "ports");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "ports");
     }
 
     public String singleton_default_port_create_test() {
@@ -57,7 +57,7 @@ public class NeutronPortTests {
                 + "\"fixed_ips\": [ {" + "\"subnet_id\": \"3b80198d-4f7b-4f77-9ef5-774d54e17126\","
                 + "\"ip_address\": \"10.0.0.2\" } ]," + "\"id\": \"d5c0ee9f-d634-d522-d954-d1021b570b0d\","
                 + "\"security_groups\": [] ," + "\"device_id\": \"\" } }";
-        ITNeutronE2E.test_create(url, content, "Singleton Default Port Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Default Port Post Failed NB");
         return content;
     }
 
@@ -69,19 +69,19 @@ public class NeutronPortTests {
                 + "?fields=" + element;
         String expectedContent = "\"ACTIVE\"";
         String context = "Port details do not match.";
-        JsonObject jsonObjectOutput = ITNeutronE2E.test_fetch_gson(url, context);
+        JsonObject jsonObjectOutput = HttpUtils.test_fetch_gson(url, context);
         jsonObjectOutput = jsonObjectOutput.getAsJsonObject("port");
         JsonElement jsonElementValue = jsonObjectOutput.get(element);
         Assert.assertEquals(context, expectedContent, String.valueOf(jsonElementValue));
         element = "port_security_enabled";
         url = base + "/ports/d5c0ee9f-d634-d522-d954-d1021b570b0d?fields=" + element;
-        jsonObjectOutput = ITNeutronE2E.test_fetch_gson(url, context);
+        jsonObjectOutput = HttpUtils.test_fetch_gson(url, context);
         jsonObjectOutput = jsonObjectOutput.getAsJsonObject("port");
         jsonElementValue = jsonObjectOutput.get(element);
         Assert.assertEquals(context, true, jsonElementValue.getAsBoolean());
         element = "admin_state_up";
         url = base + "/ports/d5c0ee9f-d634-d522-d954-d1021b570b0d?fields=" + element;
-        jsonObjectOutput = ITNeutronE2E.test_fetch_gson(url, context);
+        jsonObjectOutput = HttpUtils.test_fetch_gson(url, context);
         jsonObjectOutput = jsonObjectOutput.getAsJsonObject("port");
         jsonElementValue = jsonObjectOutput.get(element);
         Assert.assertEquals(context, true, jsonElementValue.getAsBoolean());
@@ -111,7 +111,7 @@ public class NeutronPortTests {
                 + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
                 + "\"binding:vif_details\": {}, \"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"unbound\","
                 + " \"mac_address\": \"fa:16:3e:dc:1d:8e\"} ] }";
-        ITNeutronE2E.test_create(url, content, "Router Interface Port Post Failed NB");
+        HttpUtils.test_create(url, content, "Router Interface Port Post Failed NB");
     }
 
     public void bulk_port_create_test() {
@@ -132,7 +132,7 @@ public class NeutronPortTests {
                 + "\"subnet_id\": \"3b80198d-4f7b-4f77-9ef5-774d54e17126\"," + " \"ip_address\": \"10.0.0.6\" } ], "
                 + " \"id\": \"43c831e0-19ce-4a76-9a49-57b57e69428b\", " + " \"security_groups\": [], "
                 + " \"device_id\": \"\" } ] } ";
-        ITNeutronE2E.test_create(url, content, "Bulk Port Post Failed");
+        HttpUtils.test_create(url, content, "Bulk Port Post Failed");
     }
 
     public void port_update_test() {
@@ -150,12 +150,12 @@ public class NeutronPortTests {
                 + " \"tenant_id\": \"522eda8d23124b25bf03fe44f1986b74\", " + " \"binding:vif_details\": {}, "
                 + " \"binding:vnic_type\": \"normal\", " + " \"binding:vif_type\": \"binding_failed\", "
                 + " \"mac_address\": \"fa:16:3e:11:11:5e\" } } ";
-        ITNeutronE2E.test_modify(url, content, "Port Put Failed");
+        HttpUtils.test_modify(url, content, "Port Put Failed");
     }
 
     public void port_element_get_test() {
         String url = base + "/ports/43c831e0-19ce-4a76-9a49-57b57e69428b";
-        ITNeutronE2E.test_fetch(url, true, "Port Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Port Element Get Failed");
     }
 
     public void port_element_get_with_query_test() {
@@ -163,7 +163,7 @@ public class NeutronPortTests {
                 + "?fields=id&fields=network_id&fields=name&fields=admin_state_up&fields=port_seurity_enabled"
                 + "&fields=status&fields=mac_address&fields=device_id&fields=tenant_id"
                 + "&fields=device_owner&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Port Element Get With Query Failed");
+        HttpUtils.test_fetch(url, true, "Port Element Get With Query Failed");
     }
 
     public void port_element_get_with_query_content_validation_test() {
@@ -172,13 +172,13 @@ public class NeutronPortTests {
                 + "?fields=" + element;
         String expectedContent = "[{\"mac_address\":\"fa:16:3e:11:11:5e\",\"ip_address\":\"192.168.1.200/32\"}]";
         String context = "Port details do not match.";
-        JsonObject jsonObjectOutput = ITNeutronE2E.test_fetch_gson(url, context);
+        JsonObject jsonObjectOutput = HttpUtils.test_fetch_gson(url, context);
         jsonObjectOutput = jsonObjectOutput.getAsJsonObject("port");
         JsonElement jsonElementValue = jsonObjectOutput.get(element);
         Assert.assertEquals(context, expectedContent, String.valueOf(jsonElementValue));
         element = "port_security_enabled";
         url = base + "/ports/43c831e0-19ce-4a76-9a49-57b57e69428b" + "?fields=" + element;
-        jsonObjectOutput = ITNeutronE2E.test_fetch_gson(url, context);
+        jsonObjectOutput = HttpUtils.test_fetch_gson(url, context);
         jsonObjectOutput = jsonObjectOutput.getAsJsonObject("port");
         jsonElementValue = jsonObjectOutput.get(element);
         Assert.assertEquals(context, true,  jsonElementValue.getAsBoolean());
@@ -186,12 +186,12 @@ public class NeutronPortTests {
 
     public void port_delete_test() {
         String url = base + "/ports/43c831e0-19ce-4a76-9a49-57b57e69428b";
-        ITNeutronE2E.test_delete(url, "Port Element Delete Failed");
+        HttpUtils.test_delete(url, "Port Element Delete Failed");
     }
 
     public void port_element_negative_get_test() {
         String url = base + "/ports/43c831e0-19ce-4a76-9a49-57b57e69428b";
-        ITNeutronE2E.test_fetch(url, false, "Port Element Get Failed");
+        HttpUtils.test_fetch(url, false, "Port Element Get Failed");
     }
 
     public static void runTests(String base) {
index 1aac64975151deaef7b247a7902e87ac76ceef5f..fd4b07d4456959e19ceafca577646c1eee821907 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronProjectIdTests {
 
     public void collection_get_test() {
         String url = base + "/fw/firewalls";
-        ITNeutronE2E.test_fetch(url, "RevisionID Collection GET failed");
+        HttpUtils.test_fetch(url, "RevisionID Collection GET failed");
     }
 
     public String singleton_create_test() {
@@ -27,13 +27,13 @@ public class NeutronProjectIdTests {
                 + "\"id\": \"4b0ef8f4-82c7-44d4-a4fb-6177f9a21977\","
                 + "\"name\": \"\","
                 + "\"project_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_create(url, content, "RevisionID Singleton Post Failed");
+        HttpUtils.test_create(url, content, "RevisionID Singleton Post Failed");
         return content;
     }
 
     public void singleton_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/fw/firewalls";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "firewalls");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "firewalls");
     }
 
     public void modify_test() {
@@ -43,17 +43,17 @@ public class NeutronProjectIdTests {
                 + "\"id\": \"4b0ef8f4-82c7-44d4-a4fb-6177f9a21977\","
                 + "\"name\": \"\","
                 + "\"project_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_modify(url, content, "RevisionID Singleton Post Failed");
+        HttpUtils.test_modify(url, content, "RevisionID Singleton Post Failed");
     }
 
     public void element_get_test() {
         String url = base + "/fw/firewalls/4b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_fetch(url, true, "RevisionID Element Get Failed");
+        HttpUtils.test_fetch(url, true, "RevisionID Element Get Failed");
     }
 
     public void delete_test() {
         String url = base + "/fw/firewalls/4b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_delete(url, "RevisionID Delete Failed");
+        HttpUtils.test_delete(url, "RevisionID Delete Failed");
     }
 
     public String singleton_create_test_with_tenant_id() {
@@ -64,13 +64,13 @@ public class NeutronProjectIdTests {
                 + "\"name\": \"\","
                 + "\"tenant_id\": \"55988fb3dbd7482098dd68d0d8970228\","
                 + "\"project_id\": \"45977fa2dbd7482098dd68d0d8970117\" } }";
-        ITNeutronE2E.test_create(url, content, "RevisionID Singleton Post Failed");
+        HttpUtils.test_create(url, content, "RevisionID Singleton Post Failed");
         return content;
     }
 
     public void delete_test_with_tenant_id() {
         String url = base + "/fw/firewalls/5b0ef8f4-82c7-44d4-a4fb-6177f9a21977";
-        ITNeutronE2E.test_delete(url, "RevisionID Delete Failed");
+        HttpUtils.test_delete(url, "RevisionID Delete Failed");
     }
 
     public static void runTests(String base) {
index 8684de11c492eec19434c1eeeb18c5c864db7eb5..a93ce09e9cdb5f3553c3e7f3c85a111c57f3dbca 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronQosPolicyTests {
 
     public void qos_policy_collection_get_test() {
         String url = base + "/qos/policies";
-        ITNeutronE2E.test_fetch(url, "Qos Policy collection GET failed");
+        HttpUtils.test_fetch(url, "Qos Policy collection GET failed");
     }
 
     public String singleton_qos_policy_create_test() {
@@ -25,13 +25,13 @@ public class NeutronQosPolicyTests {
         String content = "{\"policy\": {\"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3546\","
                 + "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\"," + "\"name\": \"jaxb-test\", "
                 + "\"shared\": false }}";
-        ITNeutronE2E.test_create(url, content, "Qos Policy Singleton POST Failed");
+        HttpUtils.test_create(url, content, "Qos Policy Singleton POST Failed");
         return content;
     }
 
     public void singleton_qos_policy_get_with_query_item_test(String createJsonString) {
         String url = base + "/qos/policies";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "policies");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "policies");
     }
 
     public void qos_policy_modify_test() {
@@ -47,29 +47,29 @@ public class NeutronQosPolicyTests {
             + "\"minimum_bandwidth_rules\": [ {\"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3546\","
             + "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\", " + "\"min_kbps\": 20,"
             + "\"direction\": \"egress\" } ] }}";
-        ITNeutronE2E.test_modify(url, content, "Qos Policy Singleton Put failed");
+        HttpUtils.test_modify(url, content, "Qos Policy Singleton Put failed");
     }
 
     public void qos_policy_element_get_test() {
         String url = base + "/qos/policies/d6220bbb-35f3-48ab-8eae-69c60aef3546";
-        ITNeutronE2E.test_fetch(url, true, "Qos Policy Element Get failed");
+        HttpUtils.test_fetch(url, true, "Qos Policy Element Get failed");
     }
 
     public void qos_policy_element_get_with_query_test() {
         String url = base + "/qos/policies/d6220bbb-35f3-48ab-8eae-69c60aef3546"
                 + "?fields=tenant_id&fields=id&fields=name&fields=description" + "&fields=shared&fields=limits"
                 + "&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Qos Firewall Element Get with Query Failed");
+        HttpUtils.test_fetch(url, true, "Qos Firewall Element Get with Query Failed");
     }
 
     public void qos_policy_delete_test() {
         String url = base + "/qos/policies/d6220bbb-35f3-48ab-8eae-69c60aef3546";
-        ITNeutronE2E.test_delete(url, "Qos Policy Delete Failed");
+        HttpUtils.test_delete(url, "Qos Policy Delete Failed");
     }
 
     public void qos_policy_element_negative_get_test() {
         String url = base + "/qos/policies/d6220bbb-35f3-48ab-8eae-69c60aef3546";
-        ITNeutronE2E.test_fetch(url, false, "Qos Policy Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Qos Policy Element Negative Get Failed");
     }
 
     public static void runTests(String base) {
index e4b40fc35bf5c4eb26c3a5020ad868a8faefb8a4..8e06982d48d2206e67b7a58a0ba9bddcf3cedc5a 100644 (file)
@@ -35,7 +35,7 @@ public class NeutronRevisionNumberTests {
                 + " \"id\": \"c0e7435c-1512-45fb-aa9e-9a7c5932fb30\", " + " \"ip_version\": 4, " + " \"name\": \"\", "
                 + " \"network_id\": \"af374017-c9ae-4a1d-b799-ab73111476e2\", "
                 + " \"tenant_id\": \"4fd44f30292945e481c7b8a0c8908869\" } ] }";
-        ITNeutronE2E.test_create(url, content, "Revision Number Post Failed");
+        HttpUtils.test_create(url, content, "Revision Number Post Failed");
     }
 
     public void subnet_update_test() {
@@ -49,7 +49,7 @@ public class NeutronRevisionNumberTests {
                 + " \"ip_version\": 4, " + " \"gateway_ip\": \"10.0.0.1\", " + " \"cidr\": \"10.0.0.0/24\", "
                 + "\"revision_number\": 3, "
                 + " \"id\": \"c0e7435c-1512-45fb-aa9e-9a7c5932fb30\" } }";
-        ITNeutronE2E.test_modify(url, content, "Revision Number Put Failed");
+        HttpUtils.test_modify(url, content, "Revision Number Put Failed");
     }
 
     public void subnet_update_test_with_old_value() {
@@ -63,7 +63,7 @@ public class NeutronRevisionNumberTests {
                 + " \"ip_version\": 4, " + " \"gateway_ip\": \"10.0.0.1\", " + " \"cidr\": \"10.0.0.0/24\", "
                 + "\"revision_number\": 2, "
                 + " \"id\": \"c0e7435c-1512-45fb-aa9e-9a7c5932fb30\" } }";
-        ITNeutronE2E.test_modify(url, content, "Revision Number Put Failed");
+        HttpUtils.test_modify(url, content, "Revision Number Put Failed");
     }
 
     public void subnet_update_test_with_no_value() {
@@ -76,17 +76,17 @@ public class NeutronRevisionNumberTests {
                 + " \"host_routes\": [{ \"destination\":\"192.168.0.0/24\", " + " \"nexthop\":\"10.0.0.11\" } ], "
                 + " \"ip_version\": 4, " + " \"gateway_ip\": \"10.0.0.1\", " + " \"cidr\": \"10.0.0.0/24\", "
                 + " \"id\": \"c0e7435c-1512-45fb-aa9e-9a7c5932fb30\" } }";
-        ITNeutronE2E.test_modify(url, content, "Revision Number Put Failed");
+        HttpUtils.test_modify(url, content, "Revision Number Put Failed");
     }
 
     public void subnet_element_get_test() {
         String url = base + "/subnets/c0e7435c-1512-45fb-aa9e-9a7c5932fb30";
-        ITNeutronE2E.test_fetch(url, true, "Revision Number Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Revision Number Element Get Failed");
     }
 
     public void subnet_delete_test() {
         String url = base + "/subnets/c0e7435c-1512-45fb-aa9e-9a7c5932fb30";
-        ITNeutronE2E.test_delete(url, "Revision Number Element Delete Failed");
+        HttpUtils.test_delete(url, "Revision Number Element Delete Failed");
     }
 
     public static void runTests(String base) {
index 32a6e675facc78d6bc2124f610925955c4f70a88..3e03fb145125b0ed8c822b6b04c9289641e32939 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronRouterTests {
 
     public void router_collection_get_test() {
         String url = base + "/routers";
-        ITNeutronE2E.test_fetch(url, "Router Collection GET failed");
+        HttpUtils.test_fetch(url, "Router Collection GET failed");
     }
 
     //TODO handle SB check
@@ -27,13 +27,13 @@ public class NeutronRouterTests {
                 + "\"network_id\": \"8ca37218-28ff-41cb-9b10-039601ea7e6b\" }, " + "\"name\": \"another_router\", "
                 + "\"admin_state_up\": true, " + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
                 + "\"id\": \"8604a0de-7f6b-409a-a47c-a1cc7bc77b2e\" } } ";
-        ITNeutronE2E.test_create(url, content, "Singleton Router Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Router Post Failed NB");
         return content;
     }
 
     public void singleton_router_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/routers";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "routers");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "routers");
     }
 
     //TODO handle SB check
@@ -43,7 +43,7 @@ public class NeutronRouterTests {
                 + "\"network_id\": \"8ca37218-28ff-41cb-9b10-039601ea7e6b\" }, " + "\"name\": \"another_router\", "
                 + "\"admin_state_up\": true, " + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
                 + "\"id\": \"8604a0de-7f6b-409a-a47c-a1cc7bc77b2f\" } } ";
-        ITNeutronE2E.test_create(url, content, "Singleton Router Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Router Post Failed NB");
     }
 
     //TODO handle SB check
@@ -53,7 +53,7 @@ public class NeutronRouterTests {
                 + "\"network_id\": \"8ca37218-28ff-41cb-9b10-039601ea7e6b\" }, " + "\"name\": \"new_name\", "
                 + "\"admin_state_up\": true, " + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
                 + "\"id\": \"8604a0de-7f6b-409a-a47c-a1cc7bc77b2e\" } } ";
-        ITNeutronE2E.test_modify(url, content, "Singleton Router Put Failed NB");
+        HttpUtils.test_modify(url, content, "Singleton Router Put Failed NB");
     }
 
     //TODO handle SB check
@@ -63,7 +63,7 @@ public class NeutronRouterTests {
                 + "\"port_id\": \"d8a4cc85-ad78-46ac-b5a1-8e04f16fa51e\", "
                 + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
                 + "\"id\": \"8604a0de-7f6b-409a-a47c-a1cc7bc77b2e\"}";
-        ITNeutronE2E.test_modify(url, content, "Add Interface to Router Put Failed NB");
+        HttpUtils.test_modify(url, content, "Add Interface to Router Put Failed NB");
     }
 
     //TODO handle SB check
@@ -73,7 +73,7 @@ public class NeutronRouterTests {
                 + "\"port_id\": \"d8a4cc85-ad78-46ac-b5a1-8e04f16fa51f\", "
                 + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
                 + "\"id\": \"8604a0de-7f6b-409a-a47c-a1cc7bc77b2f\"}";
-        ITNeutronE2E.test_modify(url, content, "Router Prep Interface Add Failed");
+        HttpUtils.test_modify(url, content, "Router Prep Interface Add Failed");
     }
 
     //TODO handle SB check
@@ -83,29 +83,29 @@ public class NeutronRouterTests {
                 + "\"port_id\": \"d8a4cc85-ad78-46ac-b5a1-8e04f16fa51f\", "
                 + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
                 + "\"id\": \"8604a0de-7f6b-409a-a47c-a1cc7bc77b2f\"}";
-        ITNeutronE2E.test_modify(url, content, "Remove Interface to Router Put Failed NB");
+        HttpUtils.test_modify(url, content, "Remove Interface to Router Put Failed NB");
     }
 
     public void router_element_get_test() {
         String url = base + "/routers/8604a0de-7f6b-409a-a47c-a1cc7bc77b2f";
-        ITNeutronE2E.test_fetch(url, true, "Router Element Get Test");
+        HttpUtils.test_fetch(url, true, "Router Element Get Test");
     }
 
     public void router_element_get_with_query_test() {
         String url = base + "/routers/8604a0de-7f6b-409a-a47c-a1cc7bc77b2f"
                 + "?fields=id&fields=admin_state_up&fields=name&fields=status"
                 + "&fields=tenant_id&fields=external_gateway_info" + "&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Router Element Get With Query Test");
+        HttpUtils.test_fetch(url, true, "Router Element Get With Query Test");
     }
 
     public void router_delete_test() {
         String url = base + "/routers/8604a0de-7f6b-409a-a47c-a1cc7bc77b2f";
-        ITNeutronE2E.test_delete(url, "Router Delete Test");
+        HttpUtils.test_delete(url, "Router Delete Test");
     }
 
     public void router_element_negative_get_test() {
         String url = base + "/routers/8604a0de-7f6b-409a-a47c-a1cc7bc77b2f";
-        ITNeutronE2E.test_fetch(url, false, "Router Element Negative Get Test");
+        HttpUtils.test_fetch(url, false, "Router Element Negative Get Test");
     }
 
     public static void runTests(String base) {
index 5a46074cbb594e861040ee02075ace6959fd0803..7b86305bae5296ba12dcf197da3ec5ef5071e6fe 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronSFCFlowClassifierTests {
 
     public void sfc_flowclassifier_collection_get_test() {
         String url = base + "/sfc/flowclassifiers";
-        ITNeutronE2E.test_fetch(url, "Flowclassifier group collection GET failed");
+        HttpUtils.test_fetch(url, "Flowclassifier group collection GET failed");
     }
 
     public String singleton_sfc_flowclassifier_create_test() {
@@ -40,18 +40,18 @@ public class NeutronSFCFlowClassifierTests {
             + "], "
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" } }";
-        ITNeutronE2E.test_create(url, content, " SFC Flowclassifier group singleton POST failed");
+        HttpUtils.test_create(url, content, " SFC Flowclassifier group singleton POST failed");
         return content;
     }
 
     public void singleton_sfc_flowclassifier_get_with_query_item(String createJsonString) {
         String url = base + "/sfc/flowclassifiers";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "flowclassifiers");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "flowclassifiers");
     }
 
     public void sfc_flowclassifier_element_get_test() {
         String url = base + "/sfc/flowclassifiers";
-        ITNeutronE2E.test_fetch(url, "SFC flowclassifier elements GET failed");
+        HttpUtils.test_fetch(url, "SFC flowclassifier elements GET failed");
     }
 
     public void sfc_flowclassifier_get_test_with_query_test() {
@@ -60,7 +60,7 @@ public class NeutronSFCFlowClassifierTests {
             + "&fields=source_port_range_max&fields=destination_port_range_min&fields=destination_port_range_max"
             + "&fields=source_ip_prefix&fields=destination_ip_prefix&fields=logical_source_port"
             + "&fields=logical_destination_port&fields=l7_parameters&fields=tenant_id&fields=id";
-        ITNeutronE2E.test_fetch(url, "SFC flowclassifier group element GET with query failed");
+        HttpUtils.test_fetch(url, "SFC flowclassifier group element GET with query failed");
     }
 
     public void sfc_flowclassifier_modify_test() {
@@ -83,17 +83,17 @@ public class NeutronSFCFlowClassifierTests {
             + "], "
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" } }";
-        ITNeutronE2E.test_modify(url, content, "SFC flowclassifier group singleton PUT failed");
+        HttpUtils.test_modify(url, content, "SFC flowclassifier group singleton PUT failed");
     }
 
     public void sfc_flowclassifier_delete_test() {
         String url = base + "/sfc/flowclassifiers/4e8e5957-649f-477b-9e5b-f1f75b21c03c";
-        ITNeutronE2E.test_delete(url, "SFC flowclassifier DELETE failed");
+        HttpUtils.test_delete(url, "SFC flowclassifier DELETE failed");
     }
 
     public void sfc_flowclassifier_element_negative_get_test() {
         String url = base + "/sfc/flowclassifiers/4e8e5957-649f-477b-9e5b-f1f75b21c03c";
-        ITNeutronE2E.test_fetch(url, false, "SFC flowclassifier Element negative GET failed");
+        HttpUtils.test_fetch(url, false, "SFC flowclassifier Element negative GET failed");
     }
 
     public void test_bug_6865() {
@@ -116,7 +116,7 @@ public class NeutronSFCFlowClassifierTests {
                 + "], "
                 + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
                 + "\"id\": \"5e8e5957-649f-477b-9e5b-f1f75b21c03c\" } }";
-        ITNeutronE2E.test_create(url, 400, content, "SFC Flowclassifier Bug 6865 regressed");
+        HttpUtils.test_create(url, 400, content, "SFC Flowclassifier Bug 6865 regressed");
     }
 
     public static void runTests(String base) {
index 24368c87cdad13f186d4b330041b40b98af04c51..76c61167abb19ba5e06ed6d4e59adc2ad2443cc2 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronSFCPortChainTests {
 
     public void sfc_portchain_collection_get_test() {
         String url = base + "/sfc/portchains";
-        ITNeutronE2E.test_fetch(url, "Portchains group collection GET failed");
+        HttpUtils.test_fetch(url, "Portchains group collection GET failed");
     }
 
     public String singleton_sfc_portchain_create_test() {
@@ -38,18 +38,18 @@ public class NeutronSFCPortChainTests {
             + "], "
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" } }";
-        ITNeutronE2E.test_create(url, content, "SFC Portchain group singleton POST failed");
+        HttpUtils.test_create(url, content, "SFC Portchain group singleton POST failed");
         return content;
     }
 
     public void singleton_sfc_portchain_get_with_query_item(String createJsonString) {
         String url = base + "/sfc/portchains";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "portchains");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "portchains");
     }
 
     public void sfc_portchain_element_get_test() {
         String url = base + "/sfc/portchains";
-        ITNeutronE2E.test_fetch(url, "SFC portchains elements GET failed");
+        HttpUtils.test_fetch(url, "SFC portchains elements GET failed");
     }
 
     public void sfc_portchain_element_get_test_with_query_test() {
@@ -57,7 +57,7 @@ public class NeutronSFCPortChainTests {
             + "?fields=name&fields=port_pair_groups&fields=flow_classifiers"
             + "&fields=chain_parameters&fields=tenant_id&fields=id"
             + "&fields=limits&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, "SFC portchain group element GET with query failed");
+        HttpUtils.test_fetch(url, "SFC portchain group element GET with query failed");
     }
 
     public void sfc_portchain_modify_test() {
@@ -79,17 +79,17 @@ public class NeutronSFCPortChainTests {
             + "], "
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" } }";
-        ITNeutronE2E.test_modify(url, content, "SFC portchain group singleton PUT failed");
+        HttpUtils.test_modify(url, content, "SFC portchain group singleton PUT failed");
     }
 
     public void sfc_portchain_delete_test() {
         String url = base + "/sfc/portchains/4e8e5957-649f-477b-9e5b-f1f75b21c03c";
-        ITNeutronE2E.test_delete(url, "SFC portchain DELETE failed");
+        HttpUtils.test_delete(url, "SFC portchain DELETE failed");
     }
 
     public void sfc_portchain_element_negative_get_test() {
         String url = base + "/sfc/portchains/4e8e5957-649f-477b-9e5b-f1f75b21c03c";
-        ITNeutronE2E.test_fetch(url, false, "SFC portchain Element negative GET failed");
+        HttpUtils.test_fetch(url, false, "SFC portchain Element negative GET failed");
     }
 
     public static void runTests(String base) {
index 737e6bedc3b0ac7c8be8f83c60eb839eedc69ba3..ab83c2bcf62115ad74966c2cf348e531a3bc7b67 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronSFCPortPairGroupTests {
 
     public void sfc_portpairgroup_collection_get_test() {
         String url = base + "/sfc/portpairgroups";
-        ITNeutronE2E.test_fetch(url, "Portpair group collection GET failed");
+        HttpUtils.test_fetch(url, "Portpair group collection GET failed");
     }
 
     public String singleton_sfc_portpairgroup_create_test() {
@@ -26,25 +26,25 @@ public class NeutronSFCPortPairGroupTests {
             + "\"port_pairs\":[],"
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\","
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" } }";
-        ITNeutronE2E.test_create(url, content, "SFC Portpair group singleton POST failed");
+        HttpUtils.test_create(url, content, "SFC Portpair group singleton POST failed");
         return content;
     }
 
     public void singleton_sfc_portpairgroup_get_with_query_item(String createJsonString) {
         String url = base + "/sfc/portpairgroups";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "portpairgroups");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "portpairgroups");
     }
 
     public void sfc_portpairgroup_element_get_test() {
         String url = base + "/sfc/portpairgroups";
-        ITNeutronE2E.test_fetch(url, "SFC portpairgroup Element GET failed");
+        HttpUtils.test_fetch(url, "SFC portpairgroup Element GET failed");
     }
 
     public void sfc_portpairgroup_element_get_with_query_test() {
         String url = base + "/sfc/portpairgroups/4e8e5957-649f-477b-9e5b-f1f75b21c03c"
             + "?fields=name&fields=port_pairs&fields=tenant_id&fields=id"
             + "&fields=limits&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, "SFC portpair group Element GET with query failed");
+        HttpUtils.test_fetch(url, "SFC portpair group Element GET with query failed");
     }
 
     public void sfc_portpairgroup_modify_test() {
@@ -53,17 +53,17 @@ public class NeutronSFCPortPairGroupTests {
             + "\"port_pairs\": [\"d11e9190-73d4-11e5-b392-2c27d72acb4c\", \"d11e9190-73d4-11e5-b392-2c27d72acb4d\"], "
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" } }";
-        ITNeutronE2E.test_modify(url, content, "SFC portpair group singleton PUT failed");
+        HttpUtils.test_modify(url, content, "SFC portpair group singleton PUT failed");
     }
 
     public void sfc_portpairgroup_delete_test() {
         String url = base + "/sfc/portpairgroups/4e8e5957-649f-477b-9e5b-f1f75b21c03c";
-        ITNeutronE2E.test_delete(url, "SFC portpairgroup DELETE failed");
+        HttpUtils.test_delete(url, "SFC portpairgroup DELETE failed");
     }
 
     public void sfc_portpairgroup_element_negative_get_test() {
         String url = base + "/sfc/portpairgroups/4e8e5957-649f-477b-9e5b-f1f75b21c03c";
-        ITNeutronE2E.test_fetch(url, false, "SFC Portpair Element negative GET failed");
+        HttpUtils.test_fetch(url, false, "SFC Portpair Element negative GET failed");
     }
 
     public static void runTests(String base) {
index ed1695fb9329fbca13727689ddaf51039b8055df..84b7d2224c4ab45f0d4a45910192f0e4b2f0d8e2 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronSFCPortPairTests {
 
     public void sfc_portpair_collection_get_test() {
         String url = base + "/sfc/portpairs";
-        ITNeutronE2E.test_fetch(url, "Portpair collection GET failed");
+        HttpUtils.test_fetch(url, "Portpair collection GET failed");
     }
 
     public String singleton_sfc_portpair_create_test() {
@@ -33,25 +33,25 @@ public class NeutronSFCPortPairTests {
             + "], "
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" } }";
-        ITNeutronE2E.test_create(url, content, "SFC Portpair Singleton POST failed");
+        HttpUtils.test_create(url, content, "SFC Portpair Singleton POST failed");
         return content;
     }
 
     public void singleton_sfc_portpair_get_with_query_item_test(String createJsonString) {
         String url = base + "/sfc/portpairs";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "portpairs");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "portpairs");
     }
 
     public void sfc_portpair_element_get_test() {
         String url = base + "/sfc/portpairs/4e8e5957-649f-477b-9e5b-f1f75b21c03c";
-        ITNeutronE2E.test_fetch(url, "SFC Portpair Element GET failed");
+        HttpUtils.test_fetch(url, "SFC Portpair Element GET failed");
     }
 
     public void sfc_portpair_element_get_with_query_test() {
         String url = base + "/sfc/portpairs/4e8e5957-649f-477b-9e5b-f1f75b21c03c"
             + "?fields=name&fields=ingress&fields=egress"
             + "&fields=limits&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, "SFC Portpair Element GET with query failed");
+        HttpUtils.test_fetch(url, "SFC Portpair Element GET with query failed");
     }
 
     public void sfc_portpair_modify_test() {
@@ -67,17 +67,17 @@ public class NeutronSFCPortPairTests {
             + "], "
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }}";
-        ITNeutronE2E.test_modify(url, content, "SFC Portpair Singleton PUT failed");
+        HttpUtils.test_modify(url, content, "SFC Portpair Singleton PUT failed");
     }
 
     public void sfc_portpair_delete_test() {
         String url = base + "/sfc/portpairs/4e8e5957-649f-477b-9e5b-f1f75b21c03c";
-        ITNeutronE2E.test_delete(url, "SFC Portpair DELETE failed");
+        HttpUtils.test_delete(url, "SFC Portpair DELETE failed");
     }
 
     public void sfc_portpair_element_negative_get_test() {
         String url = base + "/sfc/portpairs/4e8e5957-649f-477b-9e5b-f1f75b21c03c";
-        ITNeutronE2E.test_fetch(url, false, "SFC Portpair Element Negative GET Failed");
+        HttpUtils.test_fetch(url, false, "SFC Portpair Element Negative GET Failed");
     }
 
     public static void runTests(String base) {
index 0e921dfcd73e752be1f4e137abf6d08cb9996990..7735270937d3397f8910afedc0dbf2dcf1a4dda6 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronSecurityGroupTests {
 
     public void securityGroup_collection_get_test() {
         String url = base + "/security-groups";
-        ITNeutronE2E.test_fetch(url, "Security Group Collection GET failed");
+        HttpUtils.test_fetch(url, "Security Group Collection GET failed");
     }
 
     public String singleton_sg_create_test() {
@@ -38,13 +38,13 @@ public class NeutronSecurityGroupTests {
                 + "\"port_range_min\": null, \"id\": " + "\"d3329053-bae5-4bf4-a2d1-7330f11ba5db\", "
                 + "\"security_group_id\": \"d3329053-bae5-4bf4-a2d1-7330f11ba5db\"}], "
                 + "\"name\": \"tempest-secgroup-1272206251\"}}";
-        ITNeutronE2E.test_create(url, content, "Security Group Singleton Post Failed");
+        HttpUtils.test_create(url, content, "Security Group Singleton Post Failed");
         return content;
     }
 
     public void singleton_sg_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/security-groups";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "security_groups");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "security_groups");
     }
 
     public void sg_update_test() {
@@ -65,29 +65,29 @@ public class NeutronSecurityGroupTests {
                 + "\"port_range_min\": null, \"id\": " + "\"c376f7b5-a281-40e0-a703-5c832c03aeb3\", "
                 + "\"security_group_id\": " + "\"521e29d6-67b8-4b3c-8633-027d21195333\"}], \"name\": "
                 + "\"tempest-security--1135434738\"}}";
-        ITNeutronE2E.test_modify(url, content, "Security Group Put Failed");
+        HttpUtils.test_modify(url, content, "Security Group Put Failed");
     }
 
     public void sg_element_get_test() {
         String url = base + "/security-groups/521e29d6-67b8-4b3c-8633-027d21195333";
-        ITNeutronE2E.test_fetch(url, true, "Security Group Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Security Group Element Get Failed");
     }
 
     public void sg_element_get_with_query_test() {
         String url = base + "/security-groups/521e29d6-67b8-4b3c-8633-027d21195333"
                 + "?fields=id&fields=name&fields=description&fields=tenant_id"
                 + "&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Security Group Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Security Group Element Get Failed");
     }
 
     public void sg_delete_test() {
         String url = base + "/security-groups/521e29d6-67b8-4b3c-8633-027d21195333";
-        ITNeutronE2E.test_delete(url, "Security Group Delete Failed");
+        HttpUtils.test_delete(url, "Security Group Delete Failed");
     }
 
     public void sg_element_negative_get_test() {
         String url = base + "/security-groups/521e29d6-67b8-4b3c-8633-027d21195333";
-        ITNeutronE2E.test_fetch(url, false, "Security Group Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Security Group Element Negative Get Failed");
     }
 
     public static void runTests(String base) {
index 0a77a71e795a0361e00b140ce54321f4cc29337f..b7968a1665cd812fdf2e008f8ced889ec3a1a2c8 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronSecurityRuleTests {
 
     public void securityRule_collection_get_test() {
         String url = base + "/security-group-rules";
-        ITNeutronE2E.test_fetch(url, "Security Rule Collection GET failed");
+        HttpUtils.test_fetch(url, "Security Rule Collection GET failed");
     }
 
     public String singleton_sr_create_test() {
@@ -27,13 +27,13 @@ public class NeutronSecurityRuleTests {
                 + "\"00f340c7c3b34ab7be1fc690c05a0275\", \"port_range_max\": 77, " + "\"port_range_min\": 77, "
                 + "\"id\": \"9b4be7fa-e56e-40fb-9516-1f0fa9185669\", " + "\"security_group_id\": "
                 + "\"b60490fe-60a5-40be-af63-1d641381b784\"}}";
-        ITNeutronE2E.test_create(url, content, "Security Rule Singleton Post Failed");
+        HttpUtils.test_create(url, content, "Security Rule Singleton Post Failed");
         return content;
     }
 
     public void singleton_sr_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/security-group-rules";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "security_group_rules");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "security_group_rules");
     }
 
     public void multiple_sr_create_test() {
@@ -56,7 +56,7 @@ public class NeutronSecurityRuleTests {
                 + "  \"remote_group_id\": \"70f1b157-e79b-44dc-85a8-7de0fc9f2aab\","
                 + "  \"security_group_id\": \"70f1b157-e79b-44dc-85a8-7de0fc9f2aab\","
                 + "  \"tenant_id\": \"2640ee2ac2474bf3906e482047204fcb\"" + "}" + "]}";
-        ITNeutronE2E.test_create(url, content, "Security Rule Multiple Post Failed");
+        HttpUtils.test_create(url, content, "Security Rule Multiple Post Failed");
     }
 
     public void singleton_sr_modify_test() {
@@ -66,12 +66,12 @@ public class NeutronSecurityRuleTests {
                 + "\"00f340c7c3b34ab7be1fc690c05a0275\", \"port_range_max\": 77, " + "\"port_range_min\": 77, "
                 + "\"id\": \"9b4be7fa-e56e-40fb-9516-1f0fa9185669\", " + "\"security_group_id\": "
                 + "\"b60490fe-60a5-40be-af63-1d641381b784\"}}";
-        ITNeutronE2E.test_modify(url, content, "Security Rule Singleton Put Failed");
+        HttpUtils.test_modify(url, content, "Security Rule Singleton Put Failed");
     }
 
     public void sr_element_get_test() {
         String url = base + "/security-group-rules/9b4be7fa-e56e-40fb-9516-1f0fa9185669";
-        ITNeutronE2E.test_fetch(url, true, "Security Rule Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Security Rule Element Get Failed");
     }
 
     public void sr_element_get_with_query_test() {
@@ -80,22 +80,22 @@ public class NeutronSecurityRuleTests {
                 + "&fields=port_range_max&fields=ethertype&fields=remote_ip_prefix"
                 + "&fields=remote_group_id&fields=security_group_id&fields=tenant_id"
                 + "&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Security Rule Element Get With Query Failed");
+        HttpUtils.test_fetch(url, true, "Security Rule Element Get With Query Failed");
     }
 
     public void sr_delete_test() {
         String url = base + "/security-group-rules/9b4be7fa-e56e-40fb-9516-1f0fa9185669";
-        ITNeutronE2E.test_delete(url, "Security Rule Delete Failed");
+        HttpUtils.test_delete(url, "Security Rule Delete Failed");
     }
 
     public void sr_element_negative_get_test() {
         String url = base + "/security-group-rules/9b4be7fa-e56e-40fb-9516-1f0fa9185669";
-        ITNeutronE2E.test_fetch(url, false, "Security Rule Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Security Rule Element Negative Get Failed");
     }
 
     public void bug5478_rule_delete_negative_test() {
         String url = base + "/security-group-rules/9b4be7fa-e56e-40fb-9516-1f0fa9185669";
-        ITNeutronE2E.test_delete_404(url, "Security Rule Delete 404 Failed");
+        HttpUtils.test_delete_404(url, "Security Rule Delete 404 Failed");
     }
 
     public void bug4043_ipv4_test() {
@@ -106,10 +106,10 @@ public class NeutronSecurityRuleTests {
                 + "\"00f340c7c3b34ab7be1fc690c05a0275\", \"port_range_max\": 77, " + "\"port_range_min\": 77, "
                 + "\"id\": \"01234567-0123-0123-0123-01234567890a\", " + "\"security_group_id\": "
                 + "\"b60490fe-60a5-40be-af63-1d641381b784\"}}";
-        ITNeutronE2E.test_create(url, content, "Security Rule bug4043 IPv4 Failed");
+        HttpUtils.test_create(url, content, "Security Rule bug4043 IPv4 Failed");
 
         url = url + "/01234567-0123-0123-0123-01234567890a";
-        ITNeutronE2E.test_delete(url, "Security Rule Delete Failed");
+        HttpUtils.test_delete(url, "Security Rule Delete Failed");
     }
 
     public void bug4043_ipv6_test() {
@@ -120,10 +120,10 @@ public class NeutronSecurityRuleTests {
                 + "\"00f340c7c3b34ab7be1fc690c05a0275\", \"port_range_max\": 77, " + "\"port_range_min\": 77, "
                 + "\"id\": \"01234567-0123-0123-0123-01234567890a\", " + "\"security_group_id\": "
                 + "\"b60490fe-60a5-40be-af63-1d641381b784\"}}";
-        ITNeutronE2E.test_create(url, content, "Security Rule Bug4043 IPv6 Failed");
+        HttpUtils.test_create(url, content, "Security Rule Bug4043 IPv6 Failed");
 
         url = url + "/01234567-0123-0123-0123-01234567890a";
-        ITNeutronE2E.test_delete(url, "Security Rule Delete Failed");
+        HttpUtils.test_delete(url, "Security Rule Delete Failed");
     }
 
     public String bug6398_sr_create_test() {
@@ -133,7 +133,7 @@ public class NeutronSecurityRuleTests {
                 + "\"00f340c7c3b34ab7be1fc690c05a0275\", \"port_range_max\": 77, " + "\"port_range_min\": 77, "
                 + "\"id\": \"9b4be7fa-e56e-40fb-9516-1f0fa9185669\", " + "\"security_group_id\": "
                 + "\"b60490fe-60a5-40be-af63-1d641381b784\"}}";
-        ITNeutronE2E.test_create(url, 400, content, "Security Rule Singleton Post Bug 6398 regressed");
+        HttpUtils.test_create(url, 400, content, "Security Rule Singleton Post Bug 6398 regressed");
         return content;
     }
 
index b049001ba18de462a4bba7267050b7587d9902a5..d8febe528dc26cf7e9ee1006272340d063cb6b93 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronSubnetTests {
 
     public void subnet_collection_get_test() {
         String url = base + "/subnets";
-        ITNeutronE2E.test_fetch(url, "Subnet Collection GET failed");
+        HttpUtils.test_fetch(url, "Subnet Collection GET failed");
     }
 
     //TODO handle SB check
@@ -31,13 +31,13 @@ public class NeutronSubnetTests {
                 + " { \"destination\":\"192.168.0.0/24\", " + " \"nexthop\":\"10.0.0.2\" } ], " + "\"ip_version\": 4, "
                 + "\"gateway_ip\": \"10.0.0.1\", " + "\"cidr\": \"10.0.0.0/24\", "
                 + "\"id\": \"3b80198d-4f7b-4f77-9ef5-774d54e17126\" } } ";
-        ITNeutronE2E.test_create(url, content, "Singleton Subnet Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Subnet Post Failed NB");
         return content;
     }
 
     public void singleton_subnet_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/subnets";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "subnets");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "subnets");
     }
 
     //TODO handle SB check
@@ -49,7 +49,7 @@ public class NeutronSubnetTests {
                 + "\"allocation_pools\": [ { " + "\"start\": \"10.1.0.2\", " + "\"end\": \"10.1.0.254\" } ], "
                 + "\"host_routes\": [], " + "\"ip_version\": 4, " + "\"gateway_ip\": \"10.1.0.1\", "
                 + "\"cidr\": \"10.1.0.0/24\", " + "\"id\": \"f13b537f-1268-455f-b5fa-1e6817a9c204\" } } ";
-        ITNeutronE2E.test_create(url, content, "External Subnet Post Failed NB");
+        HttpUtils.test_create(url, content, "External Subnet Post Failed NB");
     }
 
     public void bulk_subnet_create_test() {
@@ -71,7 +71,7 @@ public class NeutronSubnetTests {
                 + " \"id\": \"b0e7435c-1512-45fb-aa9e-9a7c5932fb30\", " + " \"ip_version\": 4, " + " \"name\": \"\", "
                 + " \"network_id\": \"af374017-c9ae-4a1d-b799-ab73111476e2\", "
                 + " \"tenant_id\": \"4fd44f30292945e481c7b8a0c8908869\" } ] }";
-        ITNeutronE2E.test_create(url, content, "Bulk Subnet Post Failed");
+        HttpUtils.test_create(url, content, "Bulk Subnet Post Failed");
     }
 
     public void subnet_update_test() {
@@ -84,12 +84,12 @@ public class NeutronSubnetTests {
                 + " \"host_routes\": [{ \"destination\":\"192.168.0.0/24\", " + " \"nexthop\":\"10.0.0.11\" } ], "
                 + " \"ip_version\": 4, " + " \"gateway_ip\": \"10.0.0.1\", " + " \"cidr\": \"10.0.0.0/24\", "
                 + " \"id\": \"b0e7435c-1512-45fb-aa9e-9a7c5932fb30\" } }";
-        ITNeutronE2E.test_modify(url, content, "Subnet Put Failed");
+        HttpUtils.test_modify(url, content, "Subnet Put Failed");
     }
 
     public void subnet_element_get_test() {
         String url = base + "/subnets/b0e7435c-1512-45fb-aa9e-9a7c5932fb30";
-        ITNeutronE2E.test_fetch(url, true, "Subnet Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Subnet Element Get Failed");
     }
 
     public void subnet_element_get_with_query_test() {
@@ -98,17 +98,17 @@ public class NeutronSubnetTests {
                 + "&fields=cidr&fields=gateway_ip&fields=enable_dhcp"
                 + "&fields=tenant_id&fields=ipv6_address_mode&fields=ipv6_ra_mode"
                 + "&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Subnet Element Get with Query Failed");
+        HttpUtils.test_fetch(url, true, "Subnet Element Get with Query Failed");
     }
 
     public void subnet_delete_test() {
         String url = base + "/subnets/b0e7435c-1512-45fb-aa9e-9a7c5932fb30";
-        ITNeutronE2E.test_delete(url, "Subnet Element Delete Failed");
+        HttpUtils.test_delete(url, "Subnet Element Delete Failed");
     }
 
     public void subnet_element_negative_get_test() {
         String url = base + "/subnets/b0e7435c-1512-45fb-aa9e-9a7c5932fb30";
-        ITNeutronE2E.test_fetch(url, false, "Subnet Element Get Failed");
+        HttpUtils.test_fetch(url, false, "Subnet Element Get Failed");
     }
 
     public static void runTests(String base) {
index 324040c33036634828e4819f533142e17d16e8a1..d4933068aeadb3b23285b016b498c77aa14313da 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronTapFlowTests {
 
     public void tap_flow_collection_get_test() {
         String url = base + "/tap/flows";
-        ITNeutronE2E.test_fetch(url, "Tap Flow collection GET failed");
+        HttpUtils.test_fetch(url, "Tap Flow collection GET failed");
     }
 
     public String singleton_tap_flow_create_test() {
@@ -28,13 +28,13 @@ public class NeutronTapFlowTests {
                 + "\"tap_service_id\": \"b6440bbb-35f3-48ab-8eae-69c60aef3546\","
                 + "\"source_port\": \"411d75c3-4da8-4267-8aed-6dbb19a3dcfe\","
                 + "\"direction\": \"BOTH\" }}";
-        ITNeutronE2E.test_create(url, content, "Tap Flow Singleton POST Failed");
+        HttpUtils.test_create(url, content, "Tap Flow Singleton POST Failed");
         return content;
     }
 
     public void singleton_tap_flow_get_with_query_item_test(String createJsonString) {
         String url = base + "/tap/flows/b6440bbb-35f3-48ab-8eae-69c60aef3546";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "flows");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "flows");
     }
 
     public void tap_flow_modify_test() {
@@ -46,13 +46,13 @@ public class NeutronTapFlowTests {
                 + "\"tap_service_id\": \"b6440bbb-35f3-48ab-8eae-69c60aef3546\","
                 + "\"source_port\": \"611d75c3-4da8-4267-8aed-6dbb19a3dcfe\","
                 + "\"direction\": \"IN\" }}";
-        ITNeutronE2E.test_modify(url, content, "Tap Flow Singleton PUT failed");
+        HttpUtils.test_modify(url, content, "Tap Flow Singleton PUT failed");
     }
 
     public void tap_flow_element_get_test() {
         String url = base + "/tap/flows/b6440bbb-35f3-48ab-8eae-69c60aef3546"
                           + "/flows/f6220bbb-35f3-48ab-8eae-69c60aef3546";
-        ITNeutronE2E.test_fetch(url, true, "Tap Flow Element Get failed");
+        HttpUtils.test_fetch(url, true, "Tap Flow Element Get failed");
     }
 
     public void tap_flow_element_get_with_query_test() {
@@ -61,19 +61,19 @@ public class NeutronTapFlowTests {
                 + "?fields=tenant_id&fields=id&fields=name&fields=tap_service_id"
                 + "?fields=source_port&fields=direction"
                 + "&fields=limits&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Tap Flow Element Get with Query Failed");
+        HttpUtils.test_fetch(url, true, "Tap Flow Element Get with Query Failed");
     }
 
     public void tap_flow_delete_test() {
         String url = base + "/tap/flows/b6440bbb-35f3-48ab-8eae-69c60aef3546"
                           + "/flows/f6220bbb-35f3-48ab-8eae-69c60aef3546";
-        ITNeutronE2E.test_delete(url, "Tap Flow Delete Failed");
+        HttpUtils.test_delete(url, "Tap Flow Delete Failed");
     }
 
     public void tap_flow_element_negative_get_test() {
         String url = base + "/tap/flows/b6440bbb-35f3-48ab-8eae-69c60aef3546"
                           + "/flows/f6220bbb-35f3-48ab-8eae-69c60aef3546";
-        ITNeutronE2E.test_fetch(url, false, "Tap Flow Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Tap Flow Element Negative Get Failed");
     }
 
     public static void runTests(String base) {
index 99659898c3df4241a0ac7488e1eb3bcc42b26c39..c8f50e9436111a751ea1d7460351a1dff99b830f 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronTapServiceTests {
 
     public void tap_service_collection_get_test() {
         String url = base + "/tap/services";
-        ITNeutronE2E.test_fetch(url, "Tap Service collection GET failed");
+        HttpUtils.test_fetch(url, "Tap Service collection GET failed");
     }
 
     public String singleton_tap_service_create_test() {
@@ -26,13 +26,13 @@ public class NeutronTapServiceTests {
                 + "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\","
                 + "\"name\": \"tap-service-test\","
                 + "\"port_id\": \"311d75c3-4da8-4267-8aed-6dbb19a3dcfe\" }}";
-        ITNeutronE2E.test_create(url, content, "Tap Service Singleton POST Failed");
+        HttpUtils.test_create(url, content, "Tap Service Singleton POST Failed");
         return content;
     }
 
     public void singleton_tap_service_get_with_query_item_test(String createJsonString) {
         String url = base + "/tap/services";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "services");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "services");
     }
 
     public void tap_service_modify_test() {
@@ -41,29 +41,29 @@ public class NeutronTapServiceTests {
                 + "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\","
                 + "\"name\": \"tap-service-test\","
                 + "\"port_id\": \"311d75c3-4da8-4267-8aed-6dbb19a3dcfe\" }}";
-        ITNeutronE2E.test_modify(url, content, "Tap Service Singleton PUT failed");
+        HttpUtils.test_modify(url, content, "Tap Service Singleton PUT failed");
     }
 
     public void tap_service_element_get_test() {
         String url = base + "/tap/services/b6440bbb-35f3-48ab-8eae-69c60aef3546";
-        ITNeutronE2E.test_fetch(url, true, "Tap Service Element Get failed");
+        HttpUtils.test_fetch(url, true, "Tap Service Element Get failed");
     }
 
     public void tap_service_element_get_with_query_test() {
         String url = base + "/tap/services/b6440bbb-35f3-48ab-8eae-69c60aef3546"
                 + "?fields=tenant_id&fields=id&fields=name&fields=port_id"
                 + "&fields=limits&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "Tap Service Element Get with Query Failed");
+        HttpUtils.test_fetch(url, true, "Tap Service Element Get with Query Failed");
     }
 
     public void tap_service_delete_test() {
         String url = base + "/tap/services/b6440bbb-35f3-48ab-8eae-69c60aef3546";
-        ITNeutronE2E.test_delete(url, "Tap Service Delete Failed");
+        HttpUtils.test_delete(url, "Tap Service Delete Failed");
     }
 
     public void tap_service_element_negative_get_test() {
         String url = base + "/tap/services/b6440bbb-35f3-48ab-8eae-69c60aef3546";
-        ITNeutronE2E.test_fetch(url, false, "Tap Service Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Tap Service Element Negative Get Failed");
     }
 
     public static void runTests(String base) {
index dc3cc40494e2654574d5a98f5d07c482ad025245..a145d116b13ca4ffc377675347f52c9d821f9a49 100644 (file)
@@ -21,7 +21,7 @@ public class NeutronTrunkTests {
 
     public void trunk_collection_get_test() {
         String url = base + "/trunks";
-        ITNeutronE2E.test_fetch(url, "Trunk collection GET failed");
+        HttpUtils.test_fetch(url, "Trunk collection GET failed");
     }
 
     public String singleton_trunk_create_test() {
@@ -34,13 +34,13 @@ public class NeutronTrunkTests {
                 + "{\"segmentation_type\":\"vlan\",\"port_id\":\"be28febe-bdff-45cc-8a2d-872d54e62527\", "
                 + "\"segmentation_id\":102}],\"id\":\"c935240e-4aa6-496a-841c-d113c54499b9\", "
                 + "\"description\":\"test trunk0\"} }";
-        ITNeutronE2E.test_create(url, content, "Singleton Trunk Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Trunk Post Failed NB");
         return content;
     }
 
     public void singleton_trunk_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/trunks";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "trunks");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "trunks");
     }
 
     public String singleton_default_trunk_create_test() {
@@ -53,7 +53,7 @@ public class NeutronTrunkTests {
                 + "{\"segmentation_type\":\"vlan\",\"port_id\":\"be28febe-bdff-45cc-8a2d-872d54e62527\", "
                 + "\"segmentation_id\":102}],\"id\":\"d935240e-4aa6-d96a-d41c-d113c54499b9\", "
                 + "\"description\":\"test trunkdefault\"} }";
-        ITNeutronE2E.test_create(url, content, "Singleton Default Trunk Post Failed NB");
+        HttpUtils.test_create(url, content, "Singleton Default Trunk Post Failed NB");
         return content;
     }
 
@@ -64,13 +64,13 @@ public class NeutronTrunkTests {
         String url = base + "/trunks/d935240e-4aa6-d96a-d41c-d113c54499b9?fields=" + element;
         String expectedContent = "\"DOWN\"";
         String context = "Trunk details do not match.";
-        JsonObject jsonObjectOutput = ITNeutronE2E.test_fetch_gson(url, context);
+        JsonObject jsonObjectOutput = HttpUtils.test_fetch_gson(url, context);
         jsonObjectOutput = jsonObjectOutput.getAsJsonObject("trunk");
         JsonElement jsonElementValue = jsonObjectOutput.get(element);
         Assert.assertEquals(context, expectedContent, String.valueOf(jsonElementValue));
         element = "admin_state_up";
         url = base + "/trunks/d935240e-4aa6-d96a-d41c-d113c54499b9?fields=" + element;
-        jsonObjectOutput = ITNeutronE2E.test_fetch_gson(url, context);
+        jsonObjectOutput = HttpUtils.test_fetch_gson(url, context);
         jsonObjectOutput = jsonObjectOutput.getAsJsonObject("trunk");
         jsonElementValue = jsonObjectOutput.get(element);
         Assert.assertEquals(context, true, jsonElementValue.getAsBoolean());
@@ -94,7 +94,7 @@ public class NeutronTrunkTests {
                 + "{\"segmentation_type\":\"vlan\",\"port_id\":\"9dedb63e-ff66-4948-979f-e12f8356e299\", "
                 + "\"segmentation_id\":102}],"
                 + "\"id\":\"5e97b0a4-b5a3-49fd-b0cb-821bec16acfe\",\"description\":\"test trunk2\"}]}";
-        ITNeutronE2E.test_create(url, content, "Bulk Trunk Post Failed");
+        HttpUtils.test_create(url, content, "Bulk Trunk Post Failed");
     }
 
     public void trunk_update_test() {
@@ -104,34 +104,34 @@ public class NeutronTrunkTests {
                 + "\"sub_ports\":[{\"segmentation_type\":\"vlan\", "
                 + "\"port_id\":\"dca33436-2a7c-415b-aa35-14769e7834e3\",\"segmentation_id\":101}], "
                 + "\"id\":\"c935240e-4aa6-496a-841c-d113c54499b9\", \"description\":\"test trunk0 updated\"} }";
-        ITNeutronE2E.test_modify(url, content, "Trunk Put Failed");
+        HttpUtils.test_modify(url, content, "Trunk Put Failed");
     }
 
     public void trunk_bulk_get_test() {
         String url = base + "/trunks"; // /c935240e-4aa6-496a-841c-d113c54499b9";
-        ITNeutronE2E.test_fetch(url, true, "Trunk Bulk Get Failed");
+        HttpUtils.test_fetch(url, true, "Trunk Bulk Get Failed");
     }
 
     public void trunk_element_get_test() {
         String url = base + "/trunks/c935240e-4aa6-496a-841c-d113c54499b9";
-        ITNeutronE2E.test_fetch(url, true, "Trunk Element Get Failed");
+        HttpUtils.test_fetch(url, true, "Trunk Element Get Failed");
     }
 
     public void trunk_element_get_test_with_added_query() {
         String url = base + "/trunks/c935240e-4aa6-496a-841c-d113c54499b9"
                 + "?fields=id&fields=tenant_id&fields=name&fields=port_id"
                 + "&fields=status&fields=admin_state_up&fields=sub_ports";
-        ITNeutronE2E.test_fetch(url, true, "Trunk Element Get with query Failed");
+        HttpUtils.test_fetch(url, true, "Trunk Element Get with query Failed");
     }
 
     public void trunk_element_negative_get_test() {
         String url = base + "/trunks/bc1a76cb-8767-4c3a-bb95-018b822f2130";
-        ITNeutronE2E.test_fetch(url, false, "Trunk Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "Trunk Element Negative Get Failed");
     }
 
     public void trunk_delete_test() {
         String url = base + "/trunks/c935240e-4aa6-496a-841c-d113c54499b9";
-        ITNeutronE2E.test_delete(url, "Trunk Element Delete Failed");
+        HttpUtils.test_delete(url, "Trunk Element Delete Failed");
     }
 
     public static void runTests(String base) {
index da7614db417751df77758e8332afc7edadc9ec5f..d1ad45823f59e5d2e268a5424a7a0953c190a838 100644 (file)
@@ -17,7 +17,7 @@ public class NeutronVpnServicesTests {
 
     public void vpnService_collection_get_test() {
         String url = base + "/vpn/vpnservices";
-        ITNeutronE2E.test_fetch(url, "VPN Services GET failed");
+        HttpUtils.test_fetch(url, "VPN Services GET failed");
     }
 
     public String singleton_vpnservice_create_test() {
@@ -27,13 +27,13 @@ public class NeutronVpnServicesTests {
                 + "\"subnet_id\": \"f4fb4528-ed93-467c-a57b-11c7ea9f963e\","
                 + "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\","
                 + "\"id\": \"9faaf49f-dd89-4e39-a8c6-101839aa49bc\"," + "\"description\": \"\" } }";
-        ITNeutronE2E.test_create(url, content, "VPN Services POST failed");
+        HttpUtils.test_create(url, content, "VPN Services POST failed");
         return content;
     }
 
     public void singleton_vpnservice_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/vpn/vpnservices";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "vpnservices");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "vpnservices");
     }
 
     public void vpnservice_update_test() {
@@ -43,12 +43,12 @@ public class NeutronVpnServicesTests {
                 + "\"subnet_id\": \"25f8a35c-82d5-4f55-a45b-6965936b33f6\","
                 + "\"tenant_id\": \"26de9cd6cae94c8cb9f79d660d628e1f\","
                 + "\"id\": \"41bfef97-af4e-4f6b-a5d3-4678859d2485\"," + "\"description\": \"Updated description\" } }";
-        ITNeutronE2E.test_modify(url, content, "VPN Services PUT failed");
+        HttpUtils.test_modify(url, content, "VPN Services PUT failed");
     }
 
     public void vpnservice_element_get_test() {
         String url = base + "/vpn/vpnservices/9faaf49f-dd89-4e39-a8c6-101839aa49bc";
-        ITNeutronE2E.test_fetch(url, true, "VPN Services Element GET failed");
+        HttpUtils.test_fetch(url, true, "VPN Services Element GET failed");
     }
 
     public void vpnservice_element_get_with_query_test() {
@@ -56,17 +56,17 @@ public class NeutronVpnServicesTests {
                 + "?fields=id&fields=tenant_id&fields=name&fields=admin_state_up"
                 + "&fields=router_id&fields=status&fields=subnet_id"
                 + "&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true, "VPN Services Element GET failed");
+        HttpUtils.test_fetch(url, true, "VPN Services Element GET failed");
     }
 
     public void vpnservice_delete_test() {
         String url = base + "/vpn/vpnservices/9faaf49f-dd89-4e39-a8c6-101839aa49bc";
-        ITNeutronE2E.test_delete(url, "VPN Services DELETE failed");
+        HttpUtils.test_delete(url, "VPN Services DELETE failed");
     }
 
     public void vpnservice_element_negative_get_test() {
         String url = base + "/vpn/vpnservices/9faaf49f-dd89-4e39-a8c6-101839aa49bc";
-        ITNeutronE2E.test_fetch(url, false, "VPN Services Element Negative GET failed");
+        HttpUtils.test_fetch(url, false, "VPN Services Element Negative GET failed");
     }
 
     public static void runTests(String base) {
index 51d67bd3747417c4c9f1a26b1b111b5ed7ad79cf..d11b8fe23cb71cd08946feede2547dd23ea3cfce 100644 (file)
@@ -23,7 +23,7 @@ public class TempestPortsIpV6TestJSON {
                 + "\"tenant_id\": \"4c1be4874f0048fc8205acffe2821cd3\", \"admin_state_up\": true,"
                 + " \"mtu\": 0, \"shared\": false, \"port_security_enabled\": true, "
                 + "\"id\": \"114ddf69-8ccd-46bb-92fb-bc3e921318d4\"}}";
-        ITNeutronE2E.test_create(urlN, contentN, "test_create_port_in_allowed_allocation_pools Network Post Failed");
+        HttpUtils.test_create(urlN, contentN, "test_create_port_in_allowed_allocation_pools Network Post Failed");
 
         // create subnet
         String urlS = base + "/subnets";
@@ -34,7 +34,7 @@ public class TempestPortsIpV6TestJSON {
                 + "\"allocation_pools\": [{\"start\": \"2003::4\", \"end\": \"2003::6\"}], \"host_routes\": [], "
                 + "\"ip_version\": 6, \"ipv6_address_mode\": null, \"cidr\": \"2003::/64\", "
                 + "\"id\": \"77c68c25-72a6-415b-a6f0-886fe26f1b02\", \"subnetpool_id\": null}}";
-        ITNeutronE2E.test_create(urlS, contentS1, "test_create_port_in_allowed_allocation_pools Subnet Post Failed");
+        HttpUtils.test_create(urlS, contentS1, "test_create_port_in_allowed_allocation_pools Subnet Post Failed");
 
         String urlP = base + "/ports";
         String contentP1 = "{ \"port\": {\"status\": \"ACTIVE\", \"binding:host_id\": \"odl-devstack\","
@@ -47,7 +47,7 @@ public class TempestPortsIpV6TestJSON {
                 + "\"tenant_id\": \"4c1be4874f0048fc8205acffe2821cd3\", \"binding:vif_details\": "
                 + "{\"port_filter\": \"true\"}, \"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"ovs\", "
                 + "\"mac_address\": \"fa:16:3e:09:db:75\"}}";
-        ITNeutronE2E.test_create(urlP, contentP1, "test_create_port_in_allowed_allocation_pools Port Post Failed");
+        HttpUtils.test_create(urlP, contentP1, "test_create_port_in_allowed_allocation_pools Port Post Failed");
 
         String contentP2 = "{\"port\": {\"binding:host_id\": \"\", \"allowed_address_pairs\": [], "
                 + "\"device_owner\": \"\", \"port_security_enabled\": true, \"binding:profile\": {}, "
@@ -80,7 +80,7 @@ public class TempestPortsIpV6TestJSON {
                 + "\"tenant_id\": \"4c1be4874f0048fc8205acffe2821cd3\", \"binding:vif_details\": {}, "
                 + "\"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"unbound\","
                 + " \"mac_address\": \"FA:16:3E:66:B1:38\"}}";
-        ITNeutronE2E.test_create(urlP, contentP2, "test_create_port_in_allowed_allocation_pools Port Post 2 Failed");
+        HttpUtils.test_create(urlP, contentP2, "test_create_port_in_allowed_allocation_pools Port Post 2 Failed");
 
     }