Enable OVSDB northbound V2 integration tests.

Change-Id: Id764c4ba12b7059ea991a32d7a862247ca4230f9
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index c3ff905a4c07abed0546ca5f9cc2372d6407e159..cf21b5c3d15b486ac6d1ada09a0b114c35729c62 100644 (file)
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -118,8 +118,6 @@
               <parallel>none</parallel>
               <threadCount>1</threadCount>
               <excludes>
-              <!-- Disabling NorthboundIT tests till the issues are resolved in Jenkins -->
-                <exclude>**/*NorthboundIT*</exclude>
               </excludes>
             </configuration>
           </execution>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundV2IT.java
similarity index 96%
rename from integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java
rename to integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundV2IT.java
index 506388868581b029dc67f7b6e1c16ddb527cfda5..29d01aecf8af6662ee900a7677d335b9b8b83b68 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundV2IT.java
@@ -60,9 +60,9 @@ import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
 
 @RunWith(PaxExamParameterized.class)
 @ExamReactorStrategy(PerClass.class)
-public class OvsdbNorthboundIT extends OvsdbIntegrationTestBase {
+public class OvsdbNorthboundV2IT extends OvsdbIntegrationTestBase {
 
-    private Logger log = LoggerFactory.getLogger(OvsdbNorthboundIT.class);
+    private Logger log = LoggerFactory.getLogger(OvsdbNorthboundV2IT.class);
     public static final String USERNAME = "admin";
     public static final String PASSWORD = "admin";
     public static final String BASE_URI = "http://localhost:8888";
@@ -81,7 +81,7 @@ public class OvsdbNorthboundIT extends OvsdbIntegrationTestBase {
 
     @Parameterized.Parameters(name = "ApiTest{index}:{0}")
     public static List<Object[]> getData() throws FileNotFoundException {
-        ClassLoader classloader = OvsdbNorthboundIT.class.getClassLoader();
+        ClassLoader classloader = OvsdbNorthboundV2IT.class.getClassLoader();
         InputStream input = classloader.getResourceAsStream("northbound.yaml");
         Yaml yaml = new Yaml();
         List<Map<String, Object>> object = (List<Map<String, Object>>) yaml.load(input);
@@ -102,7 +102,7 @@ public class OvsdbNorthboundIT extends OvsdbIntegrationTestBase {
     private String fJson;
     private int fExpectedStatusCode;
 
-    public OvsdbNorthboundIT(String testCase, String operation, String path, String json, int expectedStatusCode){
+    public OvsdbNorthboundV2IT (String testCase, String operation, String path, String json, int expectedStatusCode){
         fTestCase = testCase;
         fOperation = operation;
         fPath = path;
@@ -191,7 +191,7 @@ public class OvsdbNorthboundIT extends OvsdbIntegrationTestBase {
         if (UuidHelper.getOvsUuid() == null) {
             Client client = Client.create();
             client.addFilter(new HTTPBasicAuthFilter(USERNAME, PASSWORD));
-            String uri = OvsdbNorthboundIT.BASE_URI + "/ovsdb/nb/v2/node/OVS/${node}/tables/open_vswitch/rows";
+            String uri = OvsdbNorthboundV2IT.BASE_URI + "/ovsdb/nb/v2/node/OVS/${node}/tables/open_vswitch/rows";
             WebResource webResource = client.resource(expand(uri));
             ClientResponse response = webResource.accept(MEDIA_TYPE_JSON)
                     .get(ClientResponse.class);
@@ -282,4 +282,3 @@ public class OvsdbNorthboundIT extends OvsdbIntegrationTestBase {
         );
     }
 }
-