Migrate to using blueprints for unimgr initialisation.

[unimgr.git] / cisco-xr-driver / src / main / java / org / opendaylight / unimgr / mef / nrp / cisco / xr / L2vpnBridgeDriverBuilder.java

diff --git a/cisco-xr-driver/src/main/java/org/mef/nrp/cisco/xr/L2vpnBridgeDriverBuilder.java b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/L2vpnBridgeDriverBuilder.java
similarity index 67%
rename from cisco-xr-driver/src/main/java/org/mef/nrp/cisco/xr/L2vpnBridgeDriverBuilder.java
rename to cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/L2vpnBridgeDriverBuilder.java
index 2e64db4095aca4562630939a673b7ec6fefc0ded..854217eb8321150319298387f115686194561a00 100644 (file)
--- a/cisco-xr-driver/src/main/java/org/mef/nrp/cisco/xr/L2vpnBridgeDriverBuilder.java
+++ b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/L2vpnBridgeDriverBuilder.java
@@ -6,16 +6,14 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.mef.nrp.cisco.xr;
+package org.opendaylight.unimgr.mef.nrp.cisco.xr;
 
 import java.util.Optional;
 
-import org.mef.nrp.impl.ActivationDriver;
-import org.mef.nrp.impl.ActivationDriverBuilder;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.MountPointService;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer;
+import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
+import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverBuilder;
 import org.opendaylight.yang.gen.v1.uri.onf.coremodel.corenetworkmodule.objectclasses.rev160413.GFcPort;
 import org.opendaylight.yang.gen.v1.uri.onf.coremodel.corenetworkmodule.objectclasses.rev160413.GForwardingConstruct;
 
@@ -23,15 +21,14 @@ import org.opendaylight.yang.gen.v1.uri.onf.coremodel.corenetworkmodule.objectcl
  * Provides drivers for binding two ports on the same node.
  * @author bartosz.michalik@amartus.com
  */
-public class L2vpnBridgeDriverBuilder implements ActivationDriverBuilder, BindingAwareConsumer {
+public class L2vpnBridgeDriverBuilder implements ActivationDriverBuilder {
 
     private L2vpnBridgeActivator activator;
 
-    @Override
-    public void onSessionInitialized(BindingAwareBroker.ConsumerContext session) {
-         DataBroker dataBroker = session.getSALService(DataBroker.class);
-         MountPointService mountService = session.getSALService(MountPointService.class);
-         activator = new L2vpnBridgeActivator(dataBroker, mountService);
+    private static final String GROUP_NAME = "local";
+
+    public L2vpnBridgeDriverBuilder(DataBroker dataBroker, MountPointService mountPointService) {
+        activator = new L2vpnBridgeActivator(dataBroker, mountPointService);
     }
 
     @Override
@@ -46,7 +43,6 @@ public class L2vpnBridgeDriverBuilder implements ActivationDriverBuilder, Bindin
 
     protected ActivationDriver getDriver() {
         final ActivationDriver driver = new ActivationDriver() {
-            public GForwardingConstruct ctx;
             public GFcPort aEnd;
             public GFcPort zEnd;
 
@@ -64,29 +60,22 @@ public class L2vpnBridgeDriverBuilder implements ActivationDriverBuilder, Bindin
             public void initialize(GFcPort from, GFcPort to, GForwardingConstruct ctx) {
                 this.zEnd = to;
                 this.aEnd = from;
-                this.ctx = ctx;
             }
 
             @Override
             public void activate() {
-                String id = ctx.getUuid();
                 long mtu = 1500;
-                String outerName = "outer";
-                String innerName = "inner";
 
                 String aEndNodeName = aEnd.getLtpRefList().get(0).getValue().split(":")[0];
-                activator.activate(aEndNodeName, outerName, innerName, aEnd, zEnd, mtu);
+                activator.activate(aEndNodeName, GROUP_NAME, GROUP_NAME, aEnd, zEnd, mtu);
             }
 
             @Override
             public void deactivate() {
-                String id = ctx.getUuid();
                 long mtu = 1500;
-                String outerName = "outer";
-                String innerName = "inner";
 
                 String aEndNodeName = aEnd.getLtpRefList().get(0).getValue().split(":")[0];
-                activator.deactivate(aEndNodeName, outerName, innerName, aEnd, zEnd, mtu);
+                activator.deactivate(aEndNodeName, GROUP_NAME, GROUP_NAME, aEnd, zEnd, mtu);
             }
 
             @Override