Pass MetricProvider to JC Test Module

This requires Ie90562c2f8205bab8817d370d077def9a3419d52 and
I530d20946a80933b05371c5220def447be1ee5e6 in infrautils in order to be
able to compile, and must be merged together (with the 2nd, the first
can go in before).

Change-Id: If3c3bcdb8a972c7e57cff20fd24d5addefa7746b
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/pom.xml b/vpnservice/cloud-servicechain/cloud-servicechain-impl/pom.xml
index 61af8fea99da543317deaabd37b157cf14c94327..d5157b22629893b2c182e1f8a517e2d1d629b9fe 100644 (file)
--- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/pom.xml
+++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/pom.xml
@@ -57,6 +57,12 @@
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>metrics-impl-test</artifactId>
+      <version>${infrautils.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>jobcoordinator-impl</artifactId>

diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java
index 970085744c1144e8d5f05e0a7e0192a29cfba404..ae757564dc6ec01b371ae3834fb2fb11690f88b6 100755 (executable)
--- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java
+++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java
@@ -45,6 +45,8 @@ import org.opendaylight.genius.mdsalutil.FlowEntity;
 import org.opendaylight.genius.mdsalutil.NwConstants;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.infrautils.jobcoordinator.internal.JobCoordinatorImpl;
+import org.opendaylight.infrautils.metrics.MetricProvider;
+import org.opendaylight.infrautils.metrics.testimpl.TestMetricProviderImpl;
 import org.opendaylight.netvirt.cloudservicechain.matchers.FlowEntityMatcher;
 import org.opendaylight.netvirt.cloudservicechain.matchers.FlowMatcher;
 import org.opendaylight.netvirt.cloudservicechain.utils.VpnServiceChainUtils;
@@ -94,7 +96,9 @@ public class VPNServiceChainHandlerTest {
     static final int LPORT_TAG = 1;
     static final String DC_GW_IP = "3.3.3.3";
 
-    private static JobCoordinatorImpl jobCoordinator = new JobCoordinatorImpl();
+    private static MetricProvider metricProvider = new TestMetricProviderImpl();
+
+    private static JobCoordinatorImpl jobCoordinator = new JobCoordinatorImpl(metricProvider);
 
     private VPNServiceChainHandler vpnsch; // SUT
 

diff --git a/vpnservice/neutronvpn/neutronvpn-impl/pom.xml b/vpnservice/neutronvpn/neutronvpn-impl/pom.xml
index 6162da5dc5b504d4a6d83d96b2e81eba7f87546e..d2f1e2c4dd4bfa4da8358617bcb4794a83ef6fd5 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-impl/pom.xml
+++ b/vpnservice/neutronvpn/neutronvpn-impl/pom.xml
@@ -122,9 +122,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>gson</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.opendaylight.neutron</groupId>
-        <artifactId>neutron-spi</artifactId>
-        <version>${neutron.version}</version>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>neutron-spi</artifactId>
+      <version>${neutron.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>metrics-impl-test</artifactId>
+      <version>${infrautils.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java b/vpnservice/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java
index 1f9c196d6ab3e922e5592ff7e7420f1ba8b5045b..16de148c3a4069fde8033d297758b035b45c9c41 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java
@@ -33,6 +33,8 @@ import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.infrautils.caches.baseimpl.internal.CacheManagersRegistryImpl;
 import org.opendaylight.infrautils.caches.guava.internal.GuavaCacheProvider;
 import org.opendaylight.infrautils.jobcoordinator.internal.JobCoordinatorImpl;
+import org.opendaylight.infrautils.metrics.MetricProvider;
+import org.opendaylight.infrautils.metrics.testimpl.TestMetricProviderImpl;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
@@ -84,7 +86,9 @@ public class NeutronPortChangeListenerTest {
     @Mock
     IdManagerService idManager;
 
-    private final JobCoordinatorImpl jobCoordinator = new JobCoordinatorImpl();
+    MetricProvider metricProvider = new TestMetricProviderImpl();
+
+    private final JobCoordinatorImpl jobCoordinator = new JobCoordinatorImpl(metricProvider);
 
     @Before
     public void setUp() {