add blueprint wiring for neutron/transcriber 11/40911/5
authorIsaku Yamahata <isaku.yamahata@intel.com>
Tue, 28 Jun 2016 05:07:55 +0000 (22:07 -0700)
committerIsaku Yamahata <isaku.yamahata@intel.com>
Tue, 28 Jun 2016 19:18:58 +0000 (12:18 -0700)
Change-Id: I502d78e17ec956f1bdf0c12907e6fdbb2dfcf35d
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
34 files changed:
features/production/pom.xml
features/production/src/main/features/features.xml
transcriber/src/main/config/default-config.xml [deleted file]
transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractNeutronInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java [deleted file]
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronL2gatewayConnectionInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronL2gatewayInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTranscriber.java [new file with mode: 0644]
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTranscriberProvider.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIKEPolicyInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECPolicyInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECSiteConnectionsInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNServiceInterface.java
transcriber/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/neutron/transcriber/impl/rev141210/NeutronTranscriberImplModule.java [deleted file]
transcriber/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/neutron/transcriber/impl/rev141210/NeutronTranscriberImplModuleFactory.java [deleted file]
transcriber/src/main/resources/org/opendaylight/blueprint/transcriber.xml [new file with mode: 0644]
transcriber/src/main/yang/neutron-transcriber.yang [deleted file]

index d6aa5490061271ce260191e5e38477631288420f..fa07c2d9e5cc27ea920400b79f6f65b65a2f7bf0 100644 (file)
       <artifactId>transcriber</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>transcriber</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
   </dependencies>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</connection>
index 64335b50a0cf90a8c00ff77f1dcdfbfd6546fb0b..352f1b8951a37c84c6f1b22e172f9d96e3a11b0b 100644 (file)
@@ -41,6 +41,5 @@
     <bundle>mvn:org.opendaylight.neutron/transcriber/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.neutron/model/{{VERSION}}</bundle>
     <bundle>mvn:org.osgi/org.osgi.core/{{VERSION}}</bundle>
-    <configfile finalname="etc/opendaylight/karaf/neutron-transcriber-default-config.xml">mvn:org.opendaylight.neutron/transcriber/{{VERSION}}/xml/config</configfile>
   </feature>
 </features>
diff --git a/transcriber/src/main/config/default-config.xml b/transcriber/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 1916fc1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-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
--->
-<snapshot>
-  <required-capabilities>
-    <capability>urn:opendaylight:params:xml:ns:yang:neutron:transcriber:impl?module=neutron-transcriber-impl&amp;revision=2014-12-10</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:neutron:transcriber:impl">prefix:neutron-transcriber-impl</type>
-          <name>neutron-transcriber-default</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>
index c1374238cb563dab7061883c47fdffbec5c57f0f..96110633a570e67adc072e7212f15f500109944b 100644 (file)
@@ -25,7 +25,6 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.OptimisticLockFailedException;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yangtools.yang.binding.Augmentable;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
@@ -54,8 +53,8 @@ public abstract class AbstractNeutronInterface<T extends DataObject, U extends C
 
     private final DataBroker db;
 
-    AbstractNeutronInterface(ProviderContext providerContext) {
-        this.db = providerContext.getSALService(DataBroker.class);
+    AbstractNeutronInterface(DataBroker db) {
+        this.db = Preconditions.checkNotNull(db);
     }
 
     public DataBroker getDataBroker() {
diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java
deleted file mode 100644 (file)
index 8743dcb..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2015 IBM Corporation 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.neutron.transcriber;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-public class Activator implements BundleActivator {
-    private final List<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>();
-    private final ProviderContext providerContext;
-
-    public Activator(ProviderContext providerContext) {
-        this.providerContext = providerContext;
-    }
-
-    @Override
-    public void start(BundleContext context) throws Exception {
-        NeutronRouterInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronPortInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronSubnetInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronNetworkInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronSecurityGroupInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronSecurityRuleInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronFirewallInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronFirewallPolicyInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronFirewallRuleInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronLoadBalancerInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronLoadBalancerPoolInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronLoadBalancerListenerInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronLoadBalancerHealthMonitorInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronMeteringLabelInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronMeteringLabelRuleInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronVPNServiceInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronVPNIKEPolicyInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronVPNIPSECPolicyInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronVPNIPSECSiteConnectionsInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronFloatingIPInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronBgpvpnInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronL2gatewayInterface.registerNewInterface(context, providerContext, registrations);
-        NeutronL2gatewayConnectionInterface.registerNewInterface(context, providerContext, registrations);
-    }
-
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        for (final ServiceRegistration registration : registrations) {
-            if (registration != null) {
-                registration.unregister();
-            }
-        }
-    }
-}
index b651350a71ae6c05bfdce81db7e0ebf203b9dd45..408d7d51cf59ad3030119ccf2937f1a3eba75eb9 100644 (file)
@@ -13,7 +13,7 @@ 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.INeutronBgpvpnCRUD;
 import org.opendaylight.neutron.spi.NeutronBgpvpn;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
@@ -25,8 +25,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.b
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.bgpvpns.attributes.bgpvpns.BgpvpnBuilder;
 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;
 
@@ -39,8 +37,8 @@ public class NeutronBgpvpnInterface extends AbstractNeutronInterface<Bgpvpn, Bgp
             .put(BgpvpnTypeL3.class,"l3")
             .build();
 
-    NeutronBgpvpnInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronBgpvpnInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -212,14 +210,4 @@ public class NeutronBgpvpnInterface extends AbstractNeutronInterface<Bgpvpn, Bgp
         return InstanceIdentifier.create(Neutron.class)
                 .child(Bgpvpns.class);
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronBgpvpnInterface neutronNetworkInterface = new NeutronBgpvpnInterface(providerContext);
-        final ServiceRegistration<INeutronBgpvpnCRUD> neutronNetworkInterfaceRegistration = context.registerService(INeutronBgpvpnCRUD.class, neutronNetworkInterface, null);
-        if(neutronNetworkInterfaceRegistration != null) {
-            registrations.add(neutronNetworkInterfaceRegistration);
-        }
-    }
 }
index c9c02f335b88c65f91dac28b274d7aeec8ebfeba..fc655d77b18d5828f5a81a2c07173e8a972c0236 100644 (file)
@@ -8,7 +8,7 @@
 
 package org.opendaylight.neutron.transcriber;
 
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.neutron.spi.INeutronFirewallCRUD;
 import org.opendaylight.neutron.spi.NeutronFirewall;
 
@@ -18,9 +18,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev150712.fir
 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;
 
@@ -30,8 +27,8 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronFirewallInterface.class);
 
-    NeutronFirewallInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronFirewallInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -103,14 +100,4 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
         firewallBuilder.setUuid(toUuid(uuid));
         return firewallBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronFirewallInterface neutronFirewallInterface = new NeutronFirewallInterface(providerContext);
-        final ServiceRegistration<INeutronFirewallCRUD> neutronFirewallInterfaceRegistration = context.registerService(INeutronFirewallCRUD.class, neutronFirewallInterface, null);
-        if(neutronFirewallInterfaceRegistration != null) {
-            registrations.add(neutronFirewallInterfaceRegistration);
-        }
-    }
 }
index f324a1cbdf1d4feb24bb257295f63853626f5a00..d1281b4d99dece194be64eb30133f35e5b270c23 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronFirewallPolicyCRUD;
 import org.opendaylight.neutron.spi.NeutronFirewallPolicy;
 
@@ -21,8 +21,6 @@ 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;
 
@@ -32,8 +30,8 @@ import org.slf4j.LoggerFactory;
 public class NeutronFirewallPolicyInterface extends AbstractNeutronInterface<FirewallPolicy, FirewallPolicies, NeutronFirewallPolicy> implements INeutronFirewallPolicyCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronFirewallPolicyInterface.class);
 
-    NeutronFirewallPolicyInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronFirewallPolicyInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -101,14 +99,4 @@ public class NeutronFirewallPolicyInterface extends AbstractNeutronInterface<Fir
         policyBuilder.setUuid(toUuid(uuid));
         return policyBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronFirewallPolicyInterface neutronFirewallPolicyInterface = new NeutronFirewallPolicyInterface(providerContext);
-        final ServiceRegistration<INeutronFirewallPolicyCRUD> neutronFirewallPolicyInterfaceRegistration = context.registerService(INeutronFirewallPolicyCRUD.class, neutronFirewallPolicyInterface, null);
-        if(neutronFirewallPolicyInterfaceRegistration != null) {
-            registrations.add(neutronFirewallPolicyInterfaceRegistration);
-        }
-    }
 }
index e4c623e4393518885148016637e3cb04f650c518..51f651e6563accebdf510aaf45e8ed93f687bf10 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronFirewallRuleCRUD;
 import org.opendaylight.neutron.spi.NeutronFirewallRule;
 
@@ -31,8 +31,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 
 import com.google.common.collect.ImmutableBiMap;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,8 +49,8 @@ public class NeutronFirewallRuleInterface extends AbstractNeutronInterface<Firew
             .put(IpVersionV6.class, Integer.valueOf(6))
             .build();
 
-    NeutronFirewallRuleInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronFirewallRuleInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -199,14 +197,4 @@ public class NeutronFirewallRuleInterface extends AbstractNeutronInterface<Firew
         ruleBuilder.setUuid(toUuid(uuid));
         return ruleBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronFirewallRuleInterface neutronFirewallRuleInterface = new NeutronFirewallRuleInterface(providerContext);
-        final ServiceRegistration<INeutronFirewallRuleCRUD> neutronFirewallRuleInterfaceRegistration = context.registerService(INeutronFirewallRuleCRUD.class, neutronFirewallRuleInterface, null);
-        if(neutronFirewallRuleInterfaceRegistration != null) {
-            registrations.add(neutronFirewallRuleInterfaceRegistration);
-        }
-    }
 }
index 6f1fd0eed10a2fd7fe341d88a7d89923f7dd02f9..6718a77521733f00a4eec42091d6bcc20beb7382 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronFloatingIPCRUD;
 import org.opendaylight.neutron.spi.NeutronFloatingIP;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
@@ -19,16 +19,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.floati
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.floatingips.attributes.floatingips.FloatingipBuilder;
 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;
 
 public class NeutronFloatingIPInterface extends AbstractNeutronInterface<Floatingip, Floatingips, NeutronFloatingIP> implements INeutronFloatingIPCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronFloatingIPInterface.class);
 
-    NeutronFloatingIPInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronFloatingIPInterface(DataBroker db) {
+        super(db);
     }
 
     // IfNBFloatingIPCRUD interface methods
@@ -116,14 +114,4 @@ public class NeutronFloatingIPInterface extends AbstractNeutronInterface<Floatin
         return InstanceIdentifier.create(Neutron.class)
                 .child(Floatingips.class);
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronFloatingIPInterface neutronFloatingIPInterface = new NeutronFloatingIPInterface(providerContext);
-        final ServiceRegistration<INeutronFloatingIPCRUD> neutronFloatingIPInterfaceRegistration = context.registerService(INeutronFloatingIPCRUD.class, neutronFloatingIPInterface, null);
-        if (neutronFloatingIPInterfaceRegistration != null) {
-            registrations.add(neutronFloatingIPInterfaceRegistration);
-        }
-    }
 }
index 7e0faef34631133f9b6c17f1d1b26be11801652d..04874b51d29014d6d976cbc445ef26e796af1e97 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronL2gatewayConnectionCRUD;
 import org.opendaylight.neutron.spi.NeutronL2gatewayConnection;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev150712.l2gateway.connections.attributes.L2gatewayConnections;
@@ -18,8 +18,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev15071
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev150712.l2gateway.connections.attributes.l2gatewayconnections.L2gatewayConnectionBuilder;
 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;
 
@@ -29,8 +27,8 @@ implements INeutronL2gatewayConnectionCRUD {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronL2gatewayConnectionInterface.class);
 
-    NeutronL2gatewayConnectionInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronL2gatewayConnectionInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -113,17 +111,4 @@ implements INeutronL2gatewayConnectionCRUD {
         l2gatewayConnectionBuilder.setUuid(toUuid(uuid));
         return l2gatewayConnectionBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronL2gatewayConnectionInterface neutronL2gatewayConnectionInterface =
-                new NeutronL2gatewayConnectionInterface(providerContext);
-        final ServiceRegistration<INeutronL2gatewayConnectionCRUD> neutronL2gatewayConInterfaceRegistration = context
-        .registerService(INeutronL2gatewayConnectionCRUD.class, neutronL2gatewayConnectionInterface, null);
-        if (neutronL2gatewayConInterfaceRegistration != null) {
-            registrations.add(neutronL2gatewayConInterfaceRegistration);
-        }
-    }
-
 }
index eeb93c1e09fc7429d87563f3d35172584644c32a..7bdd6d9b3d997258a0519f2eecd8a1d274c15d7c 100644 (file)
@@ -11,11 +11,9 @@ package org.opendaylight.neutron.transcriber;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.neutron.spi.INeutronL2gatewayCRUD;
 import org.opendaylight.neutron.spi.NeutronL2gatewayDevice;
 import org.opendaylight.neutron.spi.NeutronL2gatewayDeviceInterface;
@@ -35,8 +33,8 @@ public class NeutronL2gatewayInterface extends
     implements INeutronL2gatewayCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronL2gatewayInterface.class);
 
-    NeutronL2gatewayInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronL2gatewayInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -165,16 +163,4 @@ public class NeutronL2gatewayInterface extends
         l2gatewayBuilder.setUuid(toUuid(uuid));
         return l2gatewayBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronL2gatewayInterface neutronL2gatewayInterface = new NeutronL2gatewayInterface(providerContext);
-        final ServiceRegistration<INeutronL2gatewayCRUD> neutronL2gatewayInterfaceRegistration = context
-                        .registerService(INeutronL2gatewayCRUD.class, neutronL2gatewayInterface, null);
-        if (neutronL2gatewayInterfaceRegistration != null) {
-            registrations.add(neutronL2gatewayInterfaceRegistration);
-        }
-    }
-
 }
index af28d0b1329eb811d1183b9174d736a09ef59a97..0b9b59faf42ad0169c8aaff4b570502a8cbb6640 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.neutron.transcriber;
 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,8 +26,6 @@ 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;
 
@@ -45,8 +43,8 @@ public class NeutronLoadBalancerHealthMonitorInterface extends AbstractNeutronIn
             .build();
 
 
-    NeutronLoadBalancerHealthMonitorInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronLoadBalancerHealthMonitorInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -163,14 +161,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);
-        }
-    }
 }
index 96f13049f945bae6361f64df2c07f11e891ae7d3..48f97679f5f0ede036eb91c011404be57c7b9119 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronLoadBalancerCRUD;
 import org.opendaylight.neutron.spi.NeutronLoadBalancer;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
@@ -19,8 +19,6 @@ 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.loadbalancers.LoadbalancerBuilder;
 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;
 
@@ -28,8 +26,8 @@ public class NeutronLoadBalancerInterface extends AbstractNeutronInterface<Loadb
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronLoadBalancerInterface.class);
 
 
-    NeutronLoadBalancerInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronLoadBalancerInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -110,14 +108,4 @@ public class NeutronLoadBalancerInterface extends AbstractNeutronInterface<Loadb
         }
         return loadBalancerBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronLoadBalancerInterface neutronLoadBalancerInterface = new NeutronLoadBalancerInterface(providerContext);
-        final ServiceRegistration<INeutronLoadBalancerCRUD> neutronLoadBalancerInterfaceRegistration = context.registerService(INeutronLoadBalancerCRUD.class, neutronLoadBalancerInterface, null);
-        if(neutronLoadBalancerInterfaceRegistration != null) {
-            registrations.add(neutronLoadBalancerInterfaceRegistration);
-        }
-    }
 }
index 1acbe7d7f7e5192882ac29e66e845ee5b836d09d..c3d7ef8ba29170ac5fc5d2dc3ca02f7e34b7eed9 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.neutron.transcriber;
 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.INeutronLoadBalancerListenerCRUD;
 import org.opendaylight.neutron.spi.NeutronLoadBalancerListener;
 import org.opendaylight.neutron.spi.Neutron_ID;
@@ -26,8 +26,6 @@ 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.listeners.ListenerBuilder;
 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;
 
@@ -44,8 +42,8 @@ public class NeutronLoadBalancerListenerInterface extends AbstractNeutronInterfa
             .put(ProtocolTerminatedHttps.class,"TERMINATED_HTTPS")
             .build();
 
-    NeutronLoadBalancerListenerInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronLoadBalancerListenerInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -148,14 +146,4 @@ public class NeutronLoadBalancerListenerInterface extends AbstractNeutronInterfa
         }
         return answer;
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronLoadBalancerListenerInterface neutronLoadBalancerListenerInterface = new NeutronLoadBalancerListenerInterface(providerContext);
-        final ServiceRegistration<INeutronLoadBalancerListenerCRUD> neutronLoadBalancerListenerInterfaceRegistration = context.registerService(INeutronLoadBalancerListenerCRUD.class, neutronLoadBalancerListenerInterface, null);
-        if(neutronLoadBalancerListenerInterfaceRegistration != null) {
-            registrations.add(neutronLoadBalancerListenerInterfaceRegistration);
-        }
-    }
 }
index 69f3e6c42ec84b1ac83461975fb22140735262c5..43ea98b7f10e568a1a35ee72dd1f84063af2708c 100644 (file)
@@ -19,7 +19,7 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD;
 import org.opendaylight.neutron.spi.NeutronLoadBalancerPool;
 import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember;
@@ -41,8 +41,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev150712.l
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev150712.pool.attributes.SessionPersistenceBuilder;
 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;
 
@@ -61,8 +59,8 @@ public class NeutronLoadBalancerPoolInterface extends AbstractNeutronInterface<P
             .put(ProtocolTerminatedHttps.class,"TERMINATED_HTTPS")
             .build();
 
-    NeutronLoadBalancerPoolInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronLoadBalancerPoolInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -182,16 +180,6 @@ public class NeutronLoadBalancerPoolInterface extends AbstractNeutronInterface<P
         return answer;
     }
 
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronLoadBalancerPoolInterface neutronLoadBalancerPoolInterface = new NeutronLoadBalancerPoolInterface(providerContext);
-        final ServiceRegistration<INeutronLoadBalancerPoolCRUD> neutronLoadBalancerPoolInterfaceRegistration = context.registerService(INeutronLoadBalancerPoolCRUD.class, neutronLoadBalancerPoolInterface, null);
-        if(neutronLoadBalancerPoolInterfaceRegistration != null) {
-            registrations.add(neutronLoadBalancerPoolInterfaceRegistration);
-        }
-    }
-
     public boolean neutronLoadBalancerPoolMemberExists(String poolUuid, String uuid) {
         final Member member = readMemberMd(
                 createMemberInstanceIdentifier(toMd(poolUuid),
index f279e833b97985673a3f1142d7937305e3d3c0de..bd85dabe4d6b39796a9ef7ac7a94b9473af09928 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronMeteringLabelCRUD;
 import org.opendaylight.neutron.spi.NeutronMeteringLabel;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev150712.metering.labels.attributes.MeteringLabels;
@@ -18,16 +18,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev150712.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev150712.metering.labels.attributes.metering.labels.MeteringLabelBuilder;
 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;
 
 public class NeutronMeteringLabelInterface extends AbstractNeutronInterface<MeteringLabel, MeteringLabels, NeutronMeteringLabel> implements INeutronMeteringLabelCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronMeteringLabelInterface.class);
 
-    NeutronMeteringLabelInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronMeteringLabelInterface(DataBroker db) {
+        super(db);
     }
 
     // IfNBMeteringLabelCRUD methods
@@ -91,14 +89,4 @@ public class NeutronMeteringLabelInterface extends AbstractNeutronInterface<Mete
         meteringLabelBuilder.setUuid(toUuid(uuid));
         return meteringLabelBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronMeteringLabelInterface neutronMeteringLabelInterface = new NeutronMeteringLabelInterface(providerContext);
-        final ServiceRegistration<INeutronMeteringLabelCRUD> neutronMeteringLabelInterfaceRegistration = context.registerService(INeutronMeteringLabelCRUD.class, neutronMeteringLabelInterface, null);
-        if(neutronMeteringLabelInterfaceRegistration != null) {
-            registrations.add(neutronMeteringLabelInterfaceRegistration);
-        }
-    }
 }
index 6bbdac7f5592ad9381ae8246bc3c6a2328017339..295a4336fe3c9c22162af3e8c0e8cb79029ee8a1 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronMeteringLabelRuleCRUD;
 import org.opendaylight.neutron.spi.NeutronMeteringLabelRule;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
@@ -22,8 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev150712.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev150712.metering.rules.attributes.metering.rules.MeteringRuleBuilder;
 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;
 
@@ -40,8 +38,8 @@ public class NeutronMeteringLabelRuleInterface extends AbstractNeutronInterface<
             .build();
 
 
-    NeutronMeteringLabelRuleInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronMeteringLabelRuleInterface(DataBroker db) {
+        super(db);
     }
 
     // IfNBMeteringLabelRuleCRUD methods
@@ -116,14 +114,4 @@ public class NeutronMeteringLabelRuleInterface extends AbstractNeutronInterface<
         meteringRuleBuilder.setUuid(toUuid(uuid));
         return meteringRuleBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronMeteringLabelRuleInterface neutronMeteringLabelRuleInterface = new NeutronMeteringLabelRuleInterface(providerContext);
-        final ServiceRegistration<INeutronMeteringLabelRuleCRUD> neutronMeteringLabelRuleInterfaceRegistration = context.registerService(INeutronMeteringLabelRuleCRUD.class, neutronMeteringLabelRuleInterface, null);
-        if (neutronMeteringLabelRuleInterfaceRegistration != null) {
-            registrations.add(neutronMeteringLabelRuleInterfaceRegistration);
-        }
-    }
 }
index 5de288f18f638852fd609b1853049b7d40467bcd..f392f71e97124ac9d541f04e4c13fb35d2715c20 100644 (file)
@@ -13,7 +13,7 @@ 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.INeutronNetworkCRUD;
 import org.opendaylight.neutron.spi.NeutronNetwork;
 import org.opendaylight.neutron.spi.NeutronNetwork_Segment;
@@ -33,8 +33,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.NetworkProviderExtensionBuilder;
 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;
 
@@ -49,8 +47,8 @@ public class NeutronNetworkInterface extends AbstractNeutronInterface<Network, N
             .put(NetworkTypeVxlan.class,"vxlan")
             .build();
 
-    NeutronNetworkInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronNetworkInterface(DataBroker db) {
+        super(db);
     }
 
     // IfNBNetworkCRUD methods
@@ -184,14 +182,4 @@ public class NeutronNetworkInterface extends AbstractNeutronInterface<Network, N
         return InstanceIdentifier.create(Neutron.class)
                 .child(Networks.class);
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronNetworkInterface neutronNetworkInterface = new NeutronNetworkInterface(providerContext);
-        final ServiceRegistration<INeutronNetworkCRUD> neutronNetworkInterfaceRegistration = context.registerService(INeutronNetworkCRUD.class, neutronNetworkInterface, null);
-        if(neutronNetworkInterfaceRegistration != null) {
-            registrations.add(neutronNetworkInterfaceRegistration);
-        }
-    }
 }
index 3dbf7fc052c349c945ccb311e83202c64dfb5e6b..f1c816f54382050dd740621cf052fd455d3be313 100644 (file)
@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.neutron.spi.INeutronPortCRUD;
 import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD;
 import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
@@ -48,8 +48,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.portsecurity.rev150
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.types.rev160517.IpPrefixOrAddress;
 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;
 
@@ -65,8 +63,8 @@ public class NeutronPortInterface extends AbstractNeutronInterface<Port, Ports,
             .put(IpVersionV6.class, Integer.valueOf(6))
             .build();
 
-    NeutronPortInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronPortInterface(DataBroker db) {
+        super(db);
     }
 
     // IfNBPortCRUD methods
@@ -285,14 +283,4 @@ public class NeutronPortInterface extends AbstractNeutronInterface<Port, Ports,
         portBuilder.setUuid(toUuid(uuid));
         return portBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronPortInterface neutronPortInterface = new NeutronPortInterface(providerContext);
-        final ServiceRegistration<INeutronPortCRUD> neutronPortInterfaceRegistration = context.registerService(INeutronPortCRUD.class, neutronPortInterface, null);
-        if(neutronPortInterfaceRegistration != null) {
-            registrations.add(neutronPortInterfaceRegistration);
-        }
-    }
 }
index cf25247367bbc43e80beff71554fed61df1f009e..465da20b85c604e17b3b18a03f26b4dbc1a980bb 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronRouterCRUD;
 import org.opendaylight.neutron.spi.NeutronRoute;
 import org.opendaylight.neutron.spi.Neutron_IPs;
@@ -29,8 +29,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.router
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.router.external_gateway_info.ExternalFixedIps;
 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;
 
@@ -39,8 +37,8 @@ public class NeutronRouterInterface extends AbstractNeutronInterface<Router, Rou
     // methods needed for creating caches
 
 
-    NeutronRouterInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronRouterInterface(DataBroker db) {
+        super(db);
     }
 
 
@@ -131,16 +129,6 @@ public class NeutronRouterInterface extends AbstractNeutronInterface<Router, Rou
         return routerBuilder.build();
     }
 
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronRouterInterface neutronRouterInterface = new NeutronRouterInterface(providerContext);
-        final ServiceRegistration<INeutronRouterCRUD> neutronRouterInterfaceRegistration = context.registerService(INeutronRouterCRUD.class, neutronRouterInterface, null);
-        if(neutronRouterInterfaceRegistration != null) {
-            registrations.add(neutronRouterInterfaceRegistration);
-        }
-    }
-
     public NeutronRouter fromMd(Router router) {
         final NeutronRouter result = new NeutronRouter();
         result.setID(router.getUuid().getValue());
index d61d428d475dc3796f41e1aa94e0d8edee57a350..403cd30e1822c6db9086ec6983ed19430cade909 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronSecurityGroupCRUD;
 import org.opendaylight.neutron.spi.NeutronSecurityGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
@@ -18,8 +18,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroupBuilder;
 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;
 
@@ -28,8 +26,8 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronSecurityGroupInterface.class);
 
 
-    NeutronSecurityGroupInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronSecurityGroupInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -88,14 +86,4 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
         securityGroupBuilder.setUuid(toUuid(uuid));
         return securityGroupBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronSecurityGroupInterface neutronSecurityGroupInterface = new NeutronSecurityGroupInterface(providerContext);
-        final ServiceRegistration<INeutronSecurityGroupCRUD> neutronSecurityGroupInterfaceRegistration = context.registerService(INeutronSecurityGroupCRUD.class, neutronSecurityGroupInterface, null);
-        if(neutronSecurityGroupInterfaceRegistration != null) {
-            registrations.add(neutronSecurityGroupInterfaceRegistration);
-        }
-    }
 }
index 2a12796162eaa2e83c8796e557ead04135fa07b3..4f08aead9bc13564ab2749a3eafc3600e9f3e87b 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronSecurityRuleCRUD;
 import org.opendaylight.neutron.spi.NeutronSecurityRule;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
@@ -27,8 +27,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRuleBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.SecurityRuleAttributes.Protocol;
 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;
 
@@ -49,8 +47,8 @@ public class NeutronSecurityRuleInterface extends AbstractNeutronInterface<Secur
             .put(EthertypeV6.class,"IPv6")
             .build();
 
-    NeutronSecurityRuleInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronSecurityRuleInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -165,14 +163,4 @@ public class NeutronSecurityRuleInterface extends AbstractNeutronInterface<Secur
         securityRuleBuilder.setUuid(toUuid(uuid));
         return securityRuleBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronSecurityRuleInterface neutronSecurityRuleInterface = new NeutronSecurityRuleInterface(providerContext);
-        final ServiceRegistration<INeutronSecurityRuleCRUD> neutronSecurityRuleInterfaceRegistration = context.registerService(INeutronSecurityRuleCRUD.class, neutronSecurityRuleInterface, null);
-        if(neutronSecurityRuleInterfaceRegistration != null) {
-            registrations.add(neutronSecurityRuleInterfaceRegistration);
-        }
-    }
 }
index 1899c9f66023fa6f22a4a1c756a2b837fabcded6..8cf824983a7ae9e356d15a21e1607c42793890b4 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronSubnetCRUD;
 import org.opendaylight.neutron.spi.NeutronSubnet;
 import org.opendaylight.neutron.spi.NeutronSubnet_HostRoute;
@@ -35,8 +35,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.s
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.SubnetBuilder;
 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;
 
@@ -62,8 +60,8 @@ public class NeutronSubnetInterface extends AbstractNeutronInterface<Subnet, Sub
             .put(Dhcpv6Stateless.class,"dhcpv6-stateless")
             .build();
 
-    NeutronSubnetInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronSubnetInterface(DataBroker db) {
+        super(db);
     }
 
     // IfNBSubnetCRUD methods
@@ -214,14 +212,4 @@ public class NeutronSubnetInterface extends AbstractNeutronInterface<Subnet, Sub
         subnetBuilder.setUuid(toUuid(uuid));
         return subnetBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronSubnetInterface neutronSubnetInterface = new NeutronSubnetInterface(providerContext);
-        final ServiceRegistration<INeutronSubnetCRUD> neutronSubnetInterfaceRegistration = context.registerService(INeutronSubnetCRUD.class, neutronSubnetInterface, null);
-        if(neutronSubnetInterfaceRegistration != null) {
-            registrations.add(neutronSubnetInterfaceRegistration);
-        }
-    }
 }
diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTranscriber.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTranscriber.java
new file mode 100644 (file)
index 0000000..1f76d99
--- /dev/null
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2016 Intel Corp. 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.neutron.transcriber;
+
+// Marker interface for NeutronTranscriber service for advertisement
+public interface NeutronTranscriber {
+}
index 88ad2fc3439d2e47f3a60f7940f2b50da9187cde..fd81da6c998d7e26858fd4a37aec55b461ab0da0 100644 (file)
 
 package org.opendaylight.neutron.transcriber;
 
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
+import com.google.common.base.Preconditions;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.neutron.spi.INeutronBgpvpnCRUD;
+import org.opendaylight.neutron.spi.INeutronCRUD;
+import org.opendaylight.neutron.spi.INeutronFirewallCRUD;
+import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD;
+import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD;
+import org.opendaylight.neutron.spi.INeutronFloatingIPCRUD;
+import org.opendaylight.neutron.spi.INeutronL2gatewayCRUD;
+import org.opendaylight.neutron.spi.INeutronL2gatewayConnectionCRUD;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD;
+import org.opendaylight.neutron.spi.INeutronMeteringLabelCRUD;
+import org.opendaylight.neutron.spi.INeutronMeteringLabelRuleCRUD;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.spi.INeutronRouterCRUD;
+import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD;
+import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD;
+import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.spi.INeutronVPNIKEPolicyCRUD;
+import org.opendaylight.neutron.spi.INeutronVPNIPSECPolicyCRUD;
+import org.opendaylight.neutron.spi.INeutronVPNIPSECSiteConnectionsCRUD;
+import org.opendaylight.neutron.spi.INeutronVPNServiceCRUD;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NeutronTranscriberProvider implements BindingAwareProvider, AutoCloseable {
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class NeutronTranscriberProvider
+    implements AutoCloseable, NeutronTranscriber {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronTranscriberProvider.class);
 
-    private final BundleContext bundleContext;
+    private BundleContext context;
+    private DataBroker db;
+    private final List<ServiceRegistration<? extends INeutronCRUD<?>>> registrations = new ArrayList<>();
+    private final List<AutoCloseable> neutronInterfaces = new ArrayList<>();
 
-    private Activator activator;
+    private NeutronBgpvpnInterface bgpvpnInterface;
+    private NeutronFirewallInterface firewallInterface;
+    private NeutronFirewallPolicyInterface firewallPolicyInterface;
+    private NeutronFirewallRuleInterface firewallRuleInterface;
+    private NeutronFloatingIPInterface floatingIPInterface;
+    private NeutronL2gatewayConnectionInterface l2gatewayConnectionInterface;
+    private NeutronL2gatewayInterface l2gatewayInterface;
+    private NeutronLoadBalancerHealthMonitorInterface loadBalancerHealthMonitorInterface;
+    private NeutronLoadBalancerInterface loadBalancerInterface;
+    private NeutronLoadBalancerListenerInterface loadBalancerListenerInterface;
+    private NeutronLoadBalancerPoolInterface loadBalancerPoolInterface;
+    private NeutronMeteringLabelInterface meteringLabelInterface;
+    private NeutronMeteringLabelRuleInterface meteringLabelRuleInterface;
+    private NeutronNetworkInterface networkInterface;
+    private NeutronPortInterface portInterface;
+    private NeutronRouterInterface routerInterface;
+    private NeutronSecurityGroupInterface securityGroupInterface;
+    private NeutronSecurityRuleInterface securityRuleInterface;
+    private NeutronSubnetInterface subnetInterface;
+    private NeutronVPNIKEPolicyInterface vPNIKEPolicyInterface;
+    private NeutronVPNIPSECPolicyInterface vPNIPSECPolicyInterface;
+    private NeutronVPNIPSECSiteConnectionsInterface vPNIPSECSiteConnectionsInterface;
+    private NeutronVPNServiceInterface vPNServiceInterface;
 
-    public NeutronTranscriberProvider(BundleContext bundleContext) {
-        LOGGER.warn("BundleContext set to: {}",bundleContext);
-        this.bundleContext = bundleContext;
+    public NeutronTranscriberProvider(BundleContext context, DataBroker db) {
+        LOGGER.debug("DataBroker set to: {}", db);
+        this.context = Preconditions.checkNotNull(context);
+        this.db = Preconditions.checkNotNull(db);
     }
 
-    @Override
-    public void onSessionInitiated(ProviderContext providerContext) {
-        this.activator = new Activator(providerContext);
-        try {
-            LOGGER.warn("BundleContext found to be: {}",bundleContext);
-            this.activator.start(bundleContext);
-        } catch (final Exception e) {
-            LOGGER.warn("Unable to start Neutron Transcriber because: ",e);
-        }
+    private <S extends INeutronCRUD<?>, T extends AutoCloseable /* & S */>
+    void registerCRUDInterface(java.lang.Class<S> clazz, T crudInterface) {
+        neutronInterfaces.add(crudInterface);
+        final ServiceRegistration<S> crudInterfaceRegistration =
+            context.registerService(clazz, (S)crudInterface, null);
+        registrations.add(crudInterfaceRegistration);
+    }
+
+    public void init() {
+        bgpvpnInterface = new NeutronBgpvpnInterface(db);
+        registerCRUDInterface(INeutronBgpvpnCRUD.class, bgpvpnInterface);
+
+        firewallInterface = new NeutronFirewallInterface(db);
+        registerCRUDInterface(INeutronFirewallCRUD.class, firewallInterface);
+
+        firewallPolicyInterface = new NeutronFirewallPolicyInterface(db);
+        registerCRUDInterface(INeutronFirewallPolicyCRUD.class, firewallPolicyInterface);
+
+        firewallRuleInterface = new NeutronFirewallRuleInterface(db);
+        registerCRUDInterface(INeutronFirewallRuleCRUD.class, firewallRuleInterface);
+
+        floatingIPInterface = new NeutronFloatingIPInterface(db);
+        registerCRUDInterface(INeutronFloatingIPCRUD.class, floatingIPInterface);
+
+        l2gatewayConnectionInterface = new NeutronL2gatewayConnectionInterface(db);
+        registerCRUDInterface(INeutronL2gatewayConnectionCRUD.class, l2gatewayConnectionInterface);
+
+        l2gatewayInterface = new NeutronL2gatewayInterface(db);
+        registerCRUDInterface(INeutronL2gatewayCRUD.class, l2gatewayInterface);
+
+        loadBalancerHealthMonitorInterface = new NeutronLoadBalancerHealthMonitorInterface(db);
+        registerCRUDInterface(INeutronLoadBalancerHealthMonitorCRUD.class, loadBalancerHealthMonitorInterface);
+
+        loadBalancerInterface = new NeutronLoadBalancerInterface(db);
+        registerCRUDInterface(INeutronLoadBalancerCRUD.class, loadBalancerInterface);
+
+        loadBalancerListenerInterface = new NeutronLoadBalancerListenerInterface(db);
+        registerCRUDInterface(INeutronLoadBalancerListenerCRUD.class, loadBalancerListenerInterface);
+
+        loadBalancerPoolInterface = new NeutronLoadBalancerPoolInterface(db);
+        registerCRUDInterface(INeutronLoadBalancerPoolCRUD.class, loadBalancerPoolInterface);
+
+        meteringLabelInterface = new NeutronMeteringLabelInterface(db);
+        registerCRUDInterface(INeutronMeteringLabelCRUD.class, meteringLabelInterface);
+
+        meteringLabelRuleInterface = new NeutronMeteringLabelRuleInterface(db);
+        registerCRUDInterface(INeutronMeteringLabelRuleCRUD.class, meteringLabelRuleInterface);
+
+        networkInterface = new NeutronNetworkInterface(db);
+        registerCRUDInterface(INeutronNetworkCRUD.class, networkInterface);
+
+        portInterface = new NeutronPortInterface(db);
+        registerCRUDInterface(INeutronPortCRUD.class, portInterface);
+
+        routerInterface = new NeutronRouterInterface(db);
+        registerCRUDInterface(INeutronRouterCRUD.class, routerInterface);
+
+        securityGroupInterface = new NeutronSecurityGroupInterface(db);
+        registerCRUDInterface(INeutronSecurityGroupCRUD.class, securityGroupInterface);
+
+        securityRuleInterface = new NeutronSecurityRuleInterface(db);
+        registerCRUDInterface(INeutronSecurityRuleCRUD.class, securityRuleInterface);
+
+        subnetInterface = new NeutronSubnetInterface(db);
+        registerCRUDInterface(INeutronSubnetCRUD.class, subnetInterface);
+
+        vPNIKEPolicyInterface = new NeutronVPNIKEPolicyInterface(db);
+        registerCRUDInterface(INeutronVPNIKEPolicyCRUD.class, vPNIKEPolicyInterface);
+
+        vPNIPSECPolicyInterface = new NeutronVPNIPSECPolicyInterface(db);
+        registerCRUDInterface(INeutronVPNIPSECPolicyCRUD.class, vPNIPSECPolicyInterface);
+
+        vPNIPSECSiteConnectionsInterface = new NeutronVPNIPSECSiteConnectionsInterface(db);
+        registerCRUDInterface(INeutronVPNIPSECSiteConnectionsCRUD.class, vPNIPSECSiteConnectionsInterface);
+
+        vPNServiceInterface = new NeutronVPNServiceInterface(db);
+        registerCRUDInterface(INeutronVPNServiceCRUD.class, vPNServiceInterface);
+
+        // We don't need context any more
+        this.context = null;
     }
 
     @Override
     public void close() throws Exception {
-        this.activator.stop(bundleContext);
+        for (final ServiceRegistration registration : registrations) {
+            registration.unregister();
+        }
+        for (final AutoCloseable neutronCRUD : neutronInterfaces) {
+            neutronCRUD.close();
+        }
+        neutronInterfaces.clear();
     }
 }
index cd2075a409b675bf7803b5e97d9636d1fbd5e057..ceb81438bc88428c5bdaa0c64a732845a89f01be 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronVPNIKEPolicyCRUD;
 import org.opendaylight.neutron.spi.NeutronVPNIKEPolicy;
 import org.opendaylight.neutron.spi.NeutronVPNLifetime;
@@ -20,16 +20,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.ik
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.ikepolicies.attributes.ike.policies.IkepolicyBuilder;
 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;
 
 public class NeutronVPNIKEPolicyInterface extends AbstractNeutronInterface<Ikepolicy, IkePolicies, NeutronVPNIKEPolicy> implements INeutronVPNIKEPolicyCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronVPNIKEPolicyInterface.class);
 
-    NeutronVPNIKEPolicyInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronVPNIKEPolicyInterface(DataBroker db) {
+        super(db);
     }
 
     // IfNBVPNIKEPolicyCRUD methods
@@ -133,14 +131,4 @@ ikePolicy.getLifetime();
         ikePolicyBuilder.setUuid(toUuid(uuid));
         return ikePolicyBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronVPNIKEPolicyInterface neutronVPNIKEPolicyInterface = new NeutronVPNIKEPolicyInterface(providerContext);
-        final ServiceRegistration<INeutronVPNIKEPolicyCRUD> neutronVPNIKEPolicyInterfaceRegistration = context.registerService(INeutronVPNIKEPolicyCRUD.class, neutronVPNIKEPolicyInterface, null);
-        if(neutronVPNIKEPolicyInterfaceRegistration != null) {
-            registrations.add(neutronVPNIKEPolicyInterfaceRegistration);
-        }
-    }
 }
index ca71a0116ab7a27281d7b55499d1b735904a86fa..8a79a2e2ac2fa752f245083ab7dd635bc015db34 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronVPNIPSECPolicyCRUD;
 import org.opendaylight.neutron.spi.NeutronVPNIPSECPolicy;
 import org.opendaylight.neutron.spi.NeutronVPNLifetime;
@@ -20,16 +20,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.ip
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.ipsecpolicies.attributes.ipsec.policies.IpsecpolicyBuilder;
 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;
 
 public class NeutronVPNIPSECPolicyInterface extends AbstractNeutronInterface<Ipsecpolicy, IpsecPolicies, NeutronVPNIPSECPolicy> implements INeutronVPNIPSECPolicyCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronVPNIPSECPolicyInterface.class);
 
-    NeutronVPNIPSECPolicyInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronVPNIPSECPolicyInterface(DataBroker db) {
+        super(db);
     }
 
     // IfNBVPNIPSECPolicyCRUD methods
@@ -133,14 +131,4 @@ public class NeutronVPNIPSECPolicyInterface extends AbstractNeutronInterface<Ips
         ipsecPolicyBuilder.setUuid(toUuid(uuid));
         return ipsecPolicyBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronVPNIPSECPolicyInterface neutronVPNIPSECPolicyInterface = new NeutronVPNIPSECPolicyInterface(providerContext);
-        final ServiceRegistration<INeutronVPNIPSECPolicyCRUD> neutronVPNIPSECPolicyInterfaceRegistration = context.registerService(INeutronVPNIPSECPolicyCRUD.class, neutronVPNIPSECPolicyInterface, null);
-        if(neutronVPNIPSECPolicyInterfaceRegistration != null) {
-            registrations.add(neutronVPNIPSECPolicyInterfaceRegistration);
-        }
-    }
 }
index 6e2a5a46fe8dcce47133c9cff85464cec76a5f29..e98b86d84f18f9d6c3dcb2f80a7fa5a87aa00fbb 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.neutron.transcriber;
 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.INeutronVPNIPSECSiteConnectionsCRUD;
 import org.opendaylight.neutron.spi.NeutronVPNDeadPeerDetection;
 import org.opendaylight.neutron.spi.NeutronVPNIPSECSiteConnection;
@@ -21,16 +21,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.ip
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.ipsecconnections.attributes.ipsec.site.connections.IpsecsiteconnectionBuilder;
 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;
 
 public class NeutronVPNIPSECSiteConnectionsInterface extends AbstractNeutronInterface<Ipsecsiteconnection, IpsecSiteConnections, NeutronVPNIPSECSiteConnection> implements INeutronVPNIPSECSiteConnectionsCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronVPNIKEPolicyInterface.class);
 
-    NeutronVPNIPSECSiteConnectionsInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronVPNIPSECSiteConnectionsInterface(DataBroker db) {
+        super(db);
     }
 
     // INeutronVPNIPSECSiteConnectionsCRUD methods
@@ -191,14 +189,4 @@ public class NeutronVPNIPSECSiteConnectionsInterface extends AbstractNeutronInte
         ipsecSiteConnectionBuilder.setUuid(toUuid(uuid));
         return ipsecSiteConnectionBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronVPNIPSECSiteConnectionsInterface neutronVPNIPSECSiteConnectionsInterface = new NeutronVPNIPSECSiteConnectionsInterface(providerContext);
-        final ServiceRegistration<INeutronVPNIPSECSiteConnectionsCRUD> neutronVPNIPSECSiteConnectionsInterfaceRegistration = context.registerService(INeutronVPNIPSECSiteConnectionsCRUD.class, neutronVPNIPSECSiteConnectionsInterface, null);
-        if (neutronVPNIPSECSiteConnectionsInterfaceRegistration != null) {
-            registrations.add(neutronVPNIPSECSiteConnectionsInterfaceRegistration);
-        }
-    }
 }
index 53612a3db684e4d6720664a0f629c198ed4d1aae..f209c71ac7015a6e13318b68a8eb94bff72c036a 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.neutron.transcriber;
 
 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.INeutronVPNServiceCRUD;
 import org.opendaylight.neutron.spi.NeutronVPNService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.vpnservices.attributes.VpnServices;
@@ -18,16 +18,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.vp
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.vpnservices.attributes.vpn.services.VpnserviceBuilder;
 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;
 
 public class NeutronVPNServiceInterface extends AbstractNeutronInterface<Vpnservice, VpnServices, NeutronVPNService> implements INeutronVPNServiceCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronVPNServiceInterface.class);
 
-    NeutronVPNServiceInterface(ProviderContext providerContext) {
-        super(providerContext);
+    NeutronVPNServiceInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -110,14 +108,4 @@ public class NeutronVPNServiceInterface extends AbstractNeutronInterface<Vpnserv
         vpnServiceBuilder.setUuid(toUuid(uuid));
         return vpnServiceBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronVPNServiceInterface neutronVPNServiceInterface = new NeutronVPNServiceInterface(providerContext);
-        final ServiceRegistration<INeutronVPNServiceCRUD> neutronVPNServiceInterfaceRegistration = context.registerService(INeutronVPNServiceCRUD.class, neutronVPNServiceInterface, null);
-        if(neutronVPNServiceInterfaceRegistration != null) {
-            registrations.add(neutronVPNServiceInterfaceRegistration);
-        }
-    }
 }
diff --git a/transcriber/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/neutron/transcriber/impl/rev141210/NeutronTranscriberImplModule.java b/transcriber/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/neutron/transcriber/impl/rev141210/NeutronTranscriberImplModule.java
deleted file mode 100644 (file)
index bcc6676..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.neutron.transcriber.impl.rev141210;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.neutron.transcriber.NeutronTranscriberProvider;
-import org.osgi.framework.BundleContext;
-
-public class NeutronTranscriberImplModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.neutron.transcriber.impl.rev141210.AbstractNeutronTranscriberImplModule {
-    private BundleContext bundleContext;
-
-    public NeutronTranscriberImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public NeutronTranscriberImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.neutron.transcriber.impl.rev141210.NeutronTranscriberImplModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        final NeutronTranscriberProvider provider = new NeutronTranscriberProvider(bundleContext);
-        final BindingAwareBroker localBroker = getBrokerDependency();
-        localBroker.registerProvider(provider);
-        return provider;
-    }
-
-    public void setBundleContext(BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-
-}
diff --git a/transcriber/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/neutron/transcriber/impl/rev141210/NeutronTranscriberImplModuleFactory.java b/transcriber/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/neutron/transcriber/impl/rev141210/NeutronTranscriberImplModuleFactory.java
deleted file mode 100644 (file)
index bc90dca..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: neutron-transcriber-impl yang module local name: neutron-transcriber-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Apr 20 09:49:26 PDT 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.neutron.transcriber.impl.rev141210;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.DynamicMBeanWithInstance;
-import org.opendaylight.controller.config.spi.Module;
-import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class NeutronTranscriberImplModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.neutron.transcriber.impl.rev141210.AbstractNeutronTranscriberImplModuleFactory {
-
-    private static final Logger logger = LoggerFactory.getLogger(NeutronTranscriberImplModuleFactory.class);
-
-    @Override
-    public Module createModule(String instanceName,
-            DependencyResolver dependencyResolver,
-            DynamicMBeanWithInstance old, BundleContext bundleContext)
-            throws Exception {
-        // TODO Auto-generated method stub
-        final Module neutronTranscriberModule =  super.createModule(instanceName, dependencyResolver, old, bundleContext);
-        setModuleBundleContext(bundleContext, neutronTranscriberModule);
-        return neutronTranscriberModule;
-    }
-
-    private void setModuleBundleContext(BundleContext bundleContext,
-            Module neutronTranscriberModule) {
-        if(neutronTranscriberModule instanceof NeutronTranscriberImplModule) {
-            ((NeutronTranscriberImplModule)neutronTranscriberModule).setBundleContext(bundleContext);
-        } else {
-            logger.warn("Mysteriously, Module is of type {} expected type {}",
-                    neutronTranscriberModule.getClass(),
-                    NeutronTranscriberImplModule.class);
-        }
-    }
-
-    @Override
-    public Module createModule(String instanceName,
-            DependencyResolver dependencyResolver, BundleContext bundleContext) {
-        // TODO Auto-generated method stub
-        final Module neutronTranscriberModule = super.createModule(instanceName, dependencyResolver, bundleContext);
-        setModuleBundleContext(bundleContext, neutronTranscriberModule);
-        return neutronTranscriberModule;
-    }
-
-
-
-}
diff --git a/transcriber/src/main/resources/org/opendaylight/blueprint/transcriber.xml b/transcriber/src/main/resources/org/opendaylight/blueprint/transcriber.xml
new file mode 100644 (file)
index 0000000..15fea56
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+    xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+    odl:use-default-for-reference-types="true">
+
+  <reference id="dataBroker"
+      interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+      odl:type="default" />
+
+  <bean id="neutronTranscriberImpl"
+     class="org.opendaylight.neutron.transcriber.NeutronTranscriberProvider"
+     init-method="init"
+     destroy-method="close">
+    <argument ref="blueprintBundleContext"/>
+    <argument ref="dataBroker"/>
+  </bean>
+
+  <service ref="neutronTranscriberImpl"
+    interface="org.opendaylight.neutron.transcriber.NeutronTranscriber"
+    odl:type="default"/>
+
+</blueprint>
diff --git a/transcriber/src/main/yang/neutron-transcriber.yang b/transcriber/src/main/yang/neutron-transcriber.yang
deleted file mode 100644 (file)
index 9c4a4ea..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-module neutron-transcriber-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:neutron:transcriber:impl";
-    prefix "neutron-transcriber-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-
-    description
-        "Service definition for southbound project";
-
-    revision "2014-12-10" {
-        description
-            "Initial revision";
-    }
-
-    identity neutron-transcriber-impl {
-        base config:module-type;
-        config:java-name-prefix NeutronTranscriberImpl;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case neutron-transcriber-impl {
-            when "/config:modules/config:module/config:type = 'neutron-transcriber-impl'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}