X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=transcriber%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fneutron%2Ftranscriber%2FNeutronLoadBalancerHealthMonitorInterface.java;h=4a0ed41c337a2337e04104f72cc79d789f0bc9db;hb=857a9aeaabaecd31fd28fb96c2f42279b318fa3d;hp=af28d0b1329eb811d1183b9174d736a09ef59a97;hpb=374c62b6e7ccbc5314ce94e3b02465efc8647db7;p=neutron.git

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
index af28d0b13..4a0ed41c3 100644
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
@@ -8,10 +8,10 @@
 
 package org.opendaylight.neutron.transcriber;
 
+import com.google.common.collect.ImmutableBiMap;
 import java.util.ArrayList;
 import java.util.List;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
 import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor;
 import org.opendaylight.neutron.spi.Neutron_ID;
@@ -26,27 +26,21 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev150712.l
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev150712.lbaas.attributes.healthmonitors.HealthmonitorBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableBiMap;
-
-public class NeutronLoadBalancerHealthMonitorInterface extends AbstractNeutronInterface<Healthmonitor, Healthmonitors, NeutronLoadBalancerHealthMonitor> implements INeutronLoadBalancerHealthMonitorCRUD {
+public final class NeutronLoadBalancerHealthMonitorInterface
+        extends AbstractNeutronInterface<Healthmonitor, Healthmonitors, NeutronLoadBalancerHealthMonitor>
+        implements INeutronLoadBalancerHealthMonitorCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronLoadBalancerHealthMonitorInterface.class);
 
-    private static final ImmutableBiMap<Class<? extends ProbeBase>,String> PROBE_MAP
-            = new ImmutableBiMap.Builder<Class<? extends ProbeBase>,String>()
-            .put(ProbeHttp.class,"HTTP")
-            .put(ProbeHttps.class,"HTTPS")
-            .put(ProbePing.class,"PING")
-            .put(ProbeTcp.class,"TCP")
-            .build();
+    private static final ImmutableBiMap<Class<? extends ProbeBase>,
+            String> PROBE_MAP = new ImmutableBiMap.Builder<Class<? extends ProbeBase>, String>()
+                    .put(ProbeHttp.class, "HTTP").put(ProbeHttps.class, "HTTPS").put(ProbePing.class, "PING")
+                    .put(ProbeTcp.class, "TCP").build();
 
-
-    NeutronLoadBalancerHealthMonitorInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronLoadBalancerHealthMonitorInterface(DataBroker db) {
+        super(HealthmonitorBuilder.class, db);
     }
 
     @Override
@@ -55,24 +49,9 @@ public class NeutronLoadBalancerHealthMonitorInterface extends AbstractNeutronIn
     }
 
     @Override
-    protected Healthmonitor toMd(String uuid) {
-        final HealthmonitorBuilder healthmonitorBuilder = new HealthmonitorBuilder();
-        healthmonitorBuilder.setUuid(toUuid(uuid));
-        return healthmonitorBuilder.build();
-    }
-
-    @Override
-    protected InstanceIdentifier<Healthmonitor> createInstanceIdentifier(
-            Healthmonitor healthMonitor) {
-        return InstanceIdentifier.create(Neutron.class)
-                .child(Healthmonitors.class )
-                .child(Healthmonitor.class, healthMonitor.getKey());
-    }
-
-    @Override
-    protected InstanceIdentifier<Healthmonitors> createInstanceIdentifier() {
-        return InstanceIdentifier.create(Neutron.class)
-                .child(Healthmonitors.class);
+    protected InstanceIdentifier<Healthmonitor> createInstanceIdentifier(Healthmonitor healthMonitor) {
+        return InstanceIdentifier.create(Neutron.class).child(Healthmonitors.class).child(Healthmonitor.class,
+                healthMonitor.getKey());
     }
 
     @Override
@@ -105,9 +84,9 @@ public class NeutronLoadBalancerHealthMonitorInterface extends AbstractNeutronIn
             healthmonitorBuilder.setTimeout(Long.valueOf(healthMonitor.getLoadBalancerHealthMonitorTimeout()));
         }
         if (healthMonitor.getLoadBalancerHealthMonitorType() != null) {
-            final ImmutableBiMap<String, Class<? extends ProbeBase>> mapper =
-                    PROBE_MAP.inverse();
-            healthmonitorBuilder.setType((Class<? extends ProbeBase>) mapper.get(healthMonitor.getLoadBalancerHealthMonitorType()));
+            final ImmutableBiMap<String, Class<? extends ProbeBase>> mapper = PROBE_MAP.inverse();
+            healthmonitorBuilder
+                    .setType((Class<? extends ProbeBase>) mapper.get(healthMonitor.getLoadBalancerHealthMonitorType()));
         }
         if (healthMonitor.getLoadBalancerHealthMonitorUrlPath() != null) {
             healthmonitorBuilder.setUrlPath(healthMonitor.getLoadBalancerHealthMonitorUrlPath());
@@ -123,7 +102,7 @@ public class NeutronLoadBalancerHealthMonitorInterface extends AbstractNeutronIn
     protected NeutronLoadBalancerHealthMonitor fromMd(Healthmonitor healthMonitor) {
         final NeutronLoadBalancerHealthMonitor answer = new NeutronLoadBalancerHealthMonitor();
         if (healthMonitor.isAdminStateUp() != null) {
-             answer.setLoadBalancerHealthMonitorAdminStateIsUp(healthMonitor.isAdminStateUp());
+            answer.setLoadBalancerHealthMonitorAdminStateIsUp(healthMonitor.isAdminStateUp());
         }
         if (healthMonitor.getDelay() != null) {
             answer.setLoadBalancerHealthMonitorDelay(healthMonitor.getDelay().intValue());
@@ -163,14 +142,4 @@ public class NeutronLoadBalancerHealthMonitorInterface extends AbstractNeutronIn
         }
         return answer;
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronLoadBalancerHealthMonitorInterface neutronLoadBalancerHealthMonitorInterface = new NeutronLoadBalancerHealthMonitorInterface(providerContext);
-        final ServiceRegistration<INeutronLoadBalancerHealthMonitorCRUD> neutronLoadBalancerHealthMonitorInterfaceRegistration = context.registerService(INeutronLoadBalancerHealthMonitorCRUD.class, neutronLoadBalancerHealthMonitorInterface, null);
-        if(neutronLoadBalancerHealthMonitorInterfaceRegistration != null) {
-            registrations.add(neutronLoadBalancerHealthMonitorInterfaceRegistration);
-        }
-    }
 }