BUG 6396 iovisor-renderer project migration to blueprint

Change-Id: I1ac2a9f4f8698511c8ac383a2af98f6b4d6023e3
Signed-off-by: Matej Perina <mperina@cisco.com>

diff --git a/renderers/iovisor/src/main/config/default-config.xml b/renderers/iovisor/src/main/config/default-config.xml
index 1f2fc922e0f342cca5d881099ca1c4b960e2f9b0..a09575e87de7c1e5d5b6f8b37dbe28c3f25dfdbe 100644 (file)
--- a/renderers/iovisor/src/main/config/default-config.xml
+++ b/renderers/iovisor/src/main/config/default-config.xml
@@ -16,22 +16,6 @@
                         iovisor:iovisor-provider-impl
                     </type>
                     <name>iovisor-provider-impl</name>
-
-                    <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>
-
-                    <ep-renderer-augmentation-registry>
-                        <type xmlns:gbp="urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy">gbp:ep-renderer-augmentation-registry</type>
-                        <name>ep-renderer-augmentation-registry</name>
-                    </ep-renderer-augmentation-registry>
-
-                    <policy-validator-registry>
-                        <type xmlns:gbp="urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy">gbp:policy-validator-registry</type>
-                        <name>policy-validator-registry</name>
-                    </policy-validator-registry>
-
                 </module>
             </modules>
         </data>

diff --git a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderInstance.java b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderInstance.java
new file mode 100644 (file)
index 0000000..d6537b2
--- /dev/null
+++ b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderInstance.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016 Cisco System.  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.iovisor_provider.impl;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.groupbasedpolicy.api.EpRendererAugmentationRegistry;
+import org.opendaylight.groupbasedpolicy.api.PolicyValidatorRegistry;
+import org.opendaylight.groupbasedpolicy.renderer.iovisor.IovisorRenderer;
+
+public class IovisorProviderInstance implements AutoCloseable{
+
+    private IovisorRenderer renderer;
+
+    public IovisorProviderInstance (DataBroker dataBroker, EpRendererAugmentationRegistry epRegistry,
+            PolicyValidatorRegistry policyValidator) {
+        renderer = new IovisorRenderer(dataBroker, epRegistry, policyValidator);
+    }
+
+    @Override
+    public void close() throws Exception {
+        renderer.close();
+    }
+
+}

diff --git a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java
index 3dc8533e72a56f41e5fe938b3957df32b9873f36..29780d5c080ea334639550a008aedbc85e3a2774 100644 (file)
--- a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java
+++ b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.controller.config.yang.config.iovisor_provider.impl;
 
-import org.opendaylight.groupbasedpolicy.renderer.iovisor.IovisorRenderer;
+import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
 
 public class IovisorProviderModule
         extends org.opendaylight.controller.config.yang.config.iovisor_provider.impl.AbstractIovisorProviderModule {
@@ -32,7 +32,6 @@ public class IovisorProviderModule
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-        return new IovisorRenderer(getDataBrokerDependency(), getEpRendererAugmentationRegistryDependency(),
-                getPolicyValidatorRegistryDependency());
+        return NoopAutoCloseable.INSTANCE;
     }
 }

diff --git a/renderers/iovisor/src/main/resources/org/opendaylight/blueprint/iovisor-renderer.xml b/renderers/iovisor/src/main/resources/org/opendaylight/blueprint/iovisor-renderer.xml
new file mode 100644 (file)
index 0000000..cd195ad
--- /dev/null
+++ b/renderers/iovisor/src/main/resources/org/opendaylight/blueprint/iovisor-renderer.xml
@@ -0,0 +1,16 @@
+<?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="epRegistry" interface="org.opendaylight.groupbasedpolicy.api.EpRendererAugmentationRegistry"/>
+    <reference id="policyValidator" interface="org.opendaylight.groupbasedpolicy.api.PolicyValidatorRegistry"/>
+
+    <bean id="iovisor" class="org.opendaylight.controller.config.yang.config.iovisor_provider.impl.IovisorProviderInstance"
+        destroy-method="close">
+        <argument ref="dataBroker"/>
+        <argument ref="epRegistry"/>
+        <argument ref="policyValidator"/>
+    </bean>
+</blueprint>
\ No newline at end of file

diff --git a/renderers/iovisor/src/main/yang/iovisor-provider-impl.yang b/renderers/iovisor/src/main/yang/iovisor-provider-impl.yang
index d64758f4195c6f687cd678e96ac4abb5003e3c11..173bd947f4dd6a82d093d552fc6f51a4bd2b3cca 100644 (file)
--- a/renderers/iovisor/src/main/yang/iovisor-provider-impl.yang
+++ b/renderers/iovisor/src/main/yang/iovisor-provider-impl.yang
@@ -35,34 +35,6 @@ module iovisor-provider-impl {
     augment "/config:modules/config:module/config:configuration" {
         case iovisor-provider-impl {
             when "/config:modules/config:module/config:type = 'iovisor-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;
-                    }
-                }
-            }
-            // EpRendererAugmentationRegistry service
-            container ep-renderer-augmentation-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity gbpcfg:ep-renderer-augmentation-registry;
-                    }
-                }
-            }
-            // PolicyProviderRegistry service
-            container policy-validator-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity gbpcfg:policy-validator-registry;
-                    }
-                }
-            }
         }
     }
 }