Clean-up older s-n-d implementation

Now that ELAN is using infrautils.diagstatus
let us clean-up the older s-n-d implementation
in ELAN

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

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
index e49af511d6479ea34a59ee364ea8732b355e9acd..609816821e18648301ee1eae49b226e060bb75d8 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
@@ -41,7 +41,6 @@ import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipCandidateRegistrati
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.netvirt.elan.arp.responder.ArpResponderInput;
-import org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitor;
 import org.opendaylight.netvirt.elan.utils.ElanConstants;
 import org.opendaylight.netvirt.elan.utils.ElanUtils;
 import org.opendaylight.netvirt.elanmanager.api.ElanHelper;
@@ -91,7 +90,6 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi
     private final ElanInstanceManager elanInstanceManager;
     private final ElanBridgeManager bridgeMgr;
     private final DataBroker broker;
-    private final ElanStatusMonitor elanStatusMonitor;
     private final ElanUtils elanUtils;
     private final SouthboundUtils southboundUtils;
     private boolean isL2BeforeL3;
@@ -103,7 +101,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi
                                ElanInstanceManager elanInstanceManager, ElanBridgeManager bridgeMgr,
                                DataBroker dataBroker,
                                ElanInterfaceManager elanInterfaceManager,
-                               ElanStatusMonitor elanStatusMonitor, ElanUtils elanUtils,
+                               ElanUtils elanUtils,
                                EntityOwnershipService entityOwnershipService,
                                SouthboundUtils southboundUtils) {
         this.idManager = idManager;
@@ -111,7 +109,6 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi
         this.elanInstanceManager = elanInstanceManager;
         this.bridgeMgr = bridgeMgr;
         this.broker = dataBroker;
-        this.elanStatusMonitor = elanStatusMonitor;
         this.elanUtils = elanUtils;
         this.southboundUtils = southboundUtils;
 
@@ -133,15 +130,8 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi
     @SuppressWarnings("checkstyle:IllegalCatch")
     protected void start() throws Exception {
         LOG.info("Starting ElanServiceProvider");
-        elanStatusMonitor.reportStatus("STARTING");
         setIsL2BeforeL3();
-        try {
-            createIdPool();
-            elanStatusMonitor.reportStatus("OPERATIONAL");
-        } catch (Exception e) {
-            elanStatusMonitor.reportStatus("ERROR");
-            throw e;
-        }
+        createIdPool();
     }
 
     @Override

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitor.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitor.java
deleted file mode 100644 (file)
index ed8ca09..0000000
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitor.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2016 Red Hat, 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.netvirt.elan.statusanddiag;
-
-public interface ElanStatusMonitor {
-
-    void reportStatus(String serviceStatus);
-
-}

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitorJMX.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitorJMX.java
deleted file mode 100644 (file)
index 06adb1f..0000000
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitorJMX.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. 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.netvirt.elan.statusanddiag;
-
-import java.lang.management.ManagementFactory;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Singleton;
-import javax.management.JMException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Singleton
-public class ElanStatusMonitorJMX implements ElanStatusMonitor, ElanStatusMonitorMBean {
-
-    private String serviceStatus;
-    private static final String JMX_ELAN_OBJ_NAME = "org.opendaylight.netvirt.elan:type=SvcElanService";
-    private static final Logger LOG = LoggerFactory.getLogger(ElanStatusMonitorJMX.class);
-    private static final MBeanServer MBS = ManagementFactory.getPlatformMBeanServer();
-
-    @PostConstruct
-    public void init() throws Exception {
-        registerMbean();
-    }
-
-    public void registerMbean() throws JMException {
-        ObjectName objName = new ObjectName(JMX_ELAN_OBJ_NAME);
-        MBS.registerMBean(this, objName);
-        LOG.info("ElanStatusMonitor MXBean successfully registered {}", JMX_ELAN_OBJ_NAME);
-    }
-
-    @PreDestroy
-    public void close() {
-        try {
-            ObjectName objName = new ObjectName(JMX_ELAN_OBJ_NAME);
-            if (MBS.isRegistered(objName)) {
-                MBS.unregisterMBean(objName);
-                LOG.info("Successfully unregistered MXBean {}", JMX_ELAN_OBJ_NAME);
-            }
-        } catch (JMException e) {
-            LOG.error("Error unregistering MXBean " + JMX_ELAN_OBJ_NAME, e);
-        }
-    }
-
-    @Override
-    public String acquireServiceStatus() {
-        return serviceStatus;
-    }
-
-    @Override
-    @SuppressWarnings("hiding")
-    public void reportStatus(String reportStatus) {
-        this.serviceStatus = reportStatus;
-    }
-}

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitorMBean.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitorMBean.java
deleted file mode 100644 (file)
index fdcd7ef..0000000
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitorMBean.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. 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.netvirt.elan.statusanddiag;
-
-import javax.management.MXBean;
-
-@MXBean
-public interface ElanStatusMonitorMBean {
-
-    String acquireServiceStatus();
-
-}

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/statusanddiag/tests/ElanStatusMonitorJMXTest.java b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/statusanddiag/tests/ElanStatusMonitorJMXTest.java
deleted file mode 100644 (file)
index adb616a..0000000
--- a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/statusanddiag/tests/ElanStatusMonitorJMXTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2016 Red Hat, 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.netvirt.elan.statusanddiag.tests;
-
-import org.junit.Test;
-import org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitorJMX;
-
-/**
- * Test to make sure that ElanStatusMonitorJMX is a valid JMX MBean.
- *
- * @author Michael Vorburger
- */
-public class ElanStatusMonitorJMXTest {
-
-    @Test
-    public void testRegisterMbean() throws Exception {
-        ElanStatusMonitorJMX jmxMBean = new ElanStatusMonitorJMX();
-        jmxMBean.init();
-    }
-
-}

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
index 5f98f0afd5f2e932498ebf7ce4c210ca62b17ac1..ff586b9989b0773d0807a9bdd1b88c60daed6086 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
@@ -28,7 +28,6 @@ import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Mod
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
 import org.opendaylight.netvirt.bgpmanager.api.IBgpManager;
 import org.opendaylight.netvirt.elan.internal.ElanServiceProvider;
-import org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitor;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.netvirt.elanmanager.tests.utils.BgpManagerTestImpl;
 import org.opendaylight.netvirt.elanmanager.tests.utils.ElanEgressActionsHelper;
@@ -61,7 +60,6 @@ public class ElanServiceTestModule extends AbstractGuiceJsr250Module {
     protected void configureBindings() {
         DataBroker dataBroker = DataBrokerTestModule.dataBroker();
         bind(EntityOwnershipService.class).toInstance(Mockito.mock(EntityOwnershipService.class));
-        bind(ElanStatusMonitor.class).toInstance(Mockito.mock(ElanStatusMonitor.class));
         bind(INeutronVpnManager.class).toInstance(Mockito.mock(NeutronvpnManagerImpl.class));
         IVpnManager ivpnManager = Mockito.mock(VpnManagerTestImpl.class, CALLS_REAL_METHODS);
         bind(IMdsalApiManager.class).toInstance(new MDSALManager(dataBroker,