From 9f76dd5bf44bee363b9ac4cb69ab5ddc91175dac Mon Sep 17 00:00:00 2001
From: Matej Perina <mperina@cisco.com>
Date: Thu, 18 Aug 2016 15:23:56 +0200
Subject: [PATCH] BUG 6396 vpp-renderer project migration to blueprint

Change-Id: I278450e52e98d06b5a33f525b6239bf3ce085d59
Signed-off-by: Matej Perina <mperina@cisco.com>
---
 .../vpp/src/main/config/default-config.xml    |  8 ------
 .../impl/GbpVppProviderInstance.java          | 26 +++++++++++++++++++
 .../impl/GbpVppProviderModule.java            | 13 ++--------
 .../opendaylight/blueprint/vpp-renderer.xml   | 14 ++++++++++
 .../vpp/src/main/yang/vpp-provider-impl.yang  | 19 --------------
 5 files changed, 42 insertions(+), 38 deletions(-)
 create mode 100644 renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java
 create mode 100644 renderers/vpp/src/main/resources/org/opendaylight/blueprint/vpp-renderer.xml

diff --git a/renderers/vpp/src/main/config/default-config.xml b/renderers/vpp/src/main/config/default-config.xml
index 8049bcfaa..9b16d70b8 100644
--- a/renderers/vpp/src/main/config/default-config.xml
+++ b/renderers/vpp/src/main/config/default-config.xml
@@ -16,14 +16,6 @@
                     <type xmlns:vpp="urn:opendaylight:params:xml:ns:yang:controller:config:vpp-provider:impl">
                         vpp:vpp-provider-impl
                     </type>
-                    <data-broker>
-                      <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                      <name>binding-data-broker</name>
-                    </data-broker>
-                    <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>
diff --git a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java b/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java
new file mode 100644
index 000000000..b33484f0a
--- /dev/null
+++ b/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 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
+ */
+
+package org.opendaylight.controller.config.yang.config.vpp_provider.impl;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
+
+public class GbpVppProviderInstance implements AutoCloseable {
+
+    private VppRenderer renderer;
+
+    public GbpVppProviderInstance (DataBroker dataBroker, BindingAwareBroker broker) {
+        renderer = new VppRenderer(dataBroker, broker);
+    }
+    @Override
+    public void close() throws Exception {
+        renderer.close();
+    }
+
+}
diff --git a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModule.java b/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModule.java
index 744f116c9..feb106533 100644
--- a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModule.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModule.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.controller.config.yang.config.vpp_provider.impl;
 
+import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,17 +31,7 @@ public class GbpVppProviderModule extends org.opendaylight.controller.config.yan
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-        final VppRenderer vppRenderer = new VppRenderer(getDataBrokerDependency(), getBrokerDependency());
-
-        LOG.info("VPP Renderer instance has been created");
-
-        return new AutoCloseable() {
-
-            @Override
-            public void close() throws Exception {
-                vppRenderer.close();
-            }
-        };
+        return NoopAutoCloseable.INSTANCE;
     }
 
 }
diff --git a/renderers/vpp/src/main/resources/org/opendaylight/blueprint/vpp-renderer.xml b/renderers/vpp/src/main/resources/org/opendaylight/blueprint/vpp-renderer.xml
new file mode 100644
index 000000000..daf5e222a
--- /dev/null
+++ b/renderers/vpp/src/main/resources/org/opendaylight/blueprint/vpp-renderer.xml
@@ -0,0 +1,14 @@
+<?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"/>
+    <reference id="broker" interface="org.opendaylight.controller.sal.binding.api.BindingAwareBroker"/>
+
+    <bean id="vppRenderer" class="org.opendaylight.controller.config.yang.config.vpp_provider.impl.GbpVppProviderInstance"
+        destroy-method="close">
+        <argument ref="dataBroker"/>
+        <argument ref="broker"/>
+    </bean>
+</blueprint>
\ No newline at end of file
diff --git a/renderers/vpp/src/main/yang/vpp-provider-impl.yang b/renderers/vpp/src/main/yang/vpp-provider-impl.yang
index 4dd23ae8d..035302cfd 100644
--- a/renderers/vpp/src/main/yang/vpp-provider-impl.yang
+++ b/renderers/vpp/src/main/yang/vpp-provider-impl.yang
@@ -36,25 +36,6 @@ module vpp-provider-impl {
     augment "/config:modules/config:module/config:configuration" {
         case vpp-provider-impl {
             when "/config:modules/config:module/config:type = 'vpp-provider-impl'";
-
-            // Wires in the data-broker service
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-async-data-broker;
-                    }
-                }
-            }
-            // binding aware broker
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-broker-osgi-registry;
-                    }
-                }
-            }
         }
     }
 }
-- 
2.36.6