Merge "Increase timeout for waiting for broker service in sal-binding-it."

[controller.git] / opendaylight / statisticsmanager / integrationtest / src / test / java / org / opendaylight / controller / statisticsmanager / internal / StatisticsManagerIT.java

diff --git a/opendaylight/statisticsmanager/integrationtest/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerIT.java b/opendaylight/statisticsmanager/integrationtest/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerIT.java
index 00629a43b11470f66b6b1f2045e4ae3d3aabbf76..18cce74c1dbcc49571a33cf72744cc8148e64191 100644 (file)
--- a/opendaylight/statisticsmanager/integrationtest/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerIT.java
+++ b/opendaylight/statisticsmanager/integrationtest/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerIT.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * 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.controller.statisticsmanager.internal;
 
 import static org.junit.Assert.assertFalse;
@@ -35,7 +42,7 @@ import org.opendaylight.controller.sal.reader.NodeConnectorStatistics;
 import org.opendaylight.controller.sal.reader.NodeDescription;
 import org.opendaylight.controller.statisticsmanager.IStatisticsManager;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.util.PathUtils;
 import org.osgi.framework.Bundle;
@@ -67,20 +74,13 @@ public class StatisticsManagerIT {
                 // Set the systemPackages (used by clustering)
                 systemPackages("sun.reflect", "sun.reflect.misc", "sun.misc"),
                 // List framework bundles
-                mavenBundle("equinoxSDK381", "org.eclipse.equinox.console",
-                        "1.0.0.v20120522-1841"),
-                mavenBundle("equinoxSDK381", "org.eclipse.equinox.util",
-                        "1.0.400.v20120522-2049"),
-                mavenBundle("equinoxSDK381", "org.eclipse.osgi.services",
-                        "3.3.100.v20120522-1822"),
-                mavenBundle("equinoxSDK381", "org.eclipse.equinox.ds",
-                        "1.4.0.v20120522-1841"),
-                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command",
-                        "0.8.0.v201108120515"),
-                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime",
-                        "0.8.0.v201108120515"),
-                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.shell",
-                        "0.8.0.v201110170705"),
+                mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject(),
+                mavenBundle("equinoxSDK381", "org.eclipse.equinox.util").versionAsInProject(),
+                mavenBundle("equinoxSDK381", "org.eclipse.osgi.services").versionAsInProject(),
+                mavenBundle("equinoxSDK381", "org.eclipse.equinox.ds").versionAsInProject(),
+                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command").versionAsInProject(),
+                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime").versionAsInProject(),
+                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.shell").versionAsInProject(),
                 // List logger bundles
                 mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(),
                 mavenBundle("org.slf4j", "log4j-over-slf4j")
@@ -92,7 +92,7 @@ public class StatisticsManagerIT {
                 // needed by statisticsmanager
                 mavenBundle("org.opendaylight.controller", "containermanager")
                     .versionAsInProject(),
-                mavenBundle("org.opendaylight.controller", "containermanager.implementation")
+                mavenBundle("org.opendaylight.controller", "containermanager.it.implementation")
                     .versionAsInProject(),
                 mavenBundle("org.opendaylight.controller", "clustering.services")
                     .versionAsInProject(),
@@ -123,6 +123,14 @@ public class StatisticsManagerIT {
                     .versionAsInProject(),
                 mavenBundle("org.opendaylight.controller", "forwardingrulesmanager")
                     .versionAsInProject(),
+                mavenBundle("org.opendaylight.controller", "connectionmanager.implementation").
+                    versionAsInProject(),
+                mavenBundle("org.opendaylight.controller",  "connectionmanager").
+                    versionAsInProject(),
+                mavenBundle("org.opendaylight.controller",  "sal.connection").
+                    versionAsInProject(),
+                mavenBundle("org.opendaylight.controller",  "sal.connection.implementation").
+                    versionAsInProject(),
 
                 // needed by hosttracker
                 mavenBundle("org.opendaylight.controller", "topologymanager")
@@ -326,4 +334,4 @@ public class StatisticsManagerIT {
         }
     }
 
-}
\ No newline at end of file
+}