BUG 6396 faas-renderer project migration to blueprint

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

diff --git a/renderers/faas/src/main/config/default-config.xml b/renderers/faas/src/main/config/default-config.xml
index 4da9c6b0af2e837acb48dd6c2223148d0e4b2a5b..655dd5f5ed06e05334cbf3ba0695a80a976bc5bc 100644 (file)
--- a/renderers/faas/src/main/config/default-config.xml
+++ b/renderers/faas/src/main/config/default-config.xml
@@ -16,17 +16,6 @@
                         faas:faas-provider-impl
                     </type>
                     <name>faas-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:epr="urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy">epr:ep-renderer-augmentation-registry</type>
-                        <name>ep-renderer-augmentation-registry</name>
-                    </ep-renderer-augmentation-registry>
-                    
                 </module>
             </modules>
         </data>

diff --git a/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderInstance.java b/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderInstance.java
new file mode 100644 (file)
index 0000000..f20b1aa
--- /dev/null
+++ b/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderInstance.java
@@ -0,0 +1,28 @@
+/*
+ * 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.faas_provider.impl;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.groupbasedpolicy.api.EpRendererAugmentationRegistry;
+import org.opendaylight.groupbasedpolicy.renderer.faas.FaasRenderer;
+
+public class FaasProviderInstance implements AutoCloseable{
+
+    private FaasRenderer renderer;
+
+    public FaasProviderInstance (DataBroker dataBroker, EpRendererAugmentationRegistry epRegistry) {
+        renderer = new FaasRenderer(dataBroker, epRegistry);
+    }
+
+    @Override
+    public void close() throws Exception {
+        renderer.close();
+    }
+
+}

diff --git a/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModule.java b/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModule.java
index 3909c975bcdba135a2ee67433d05b77906db6bfa..78943c3af187ec637971d362833aba400642324e 100644 (file)
--- a/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModule.java
+++ b/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModule.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2015 Huawei Technologies 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
@@ -8,7 +8,7 @@
 
 package org.opendaylight.controller.config.yang.config.faas_provider.impl;
 
-import org.opendaylight.groupbasedpolicy.renderer.faas.FaasRenderer;
+import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
 
 public class FaasProviderModule extends
         org.opendaylight.controller.config.yang.config.faas_provider.impl.AbstractFaasProviderModule {
@@ -32,7 +32,7 @@ public class FaasProviderModule extends
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-        return new FaasRenderer(getDataBrokerDependency(), getEpRendererAugmentationRegistryDependency());
+        return NoopAutoCloseable.INSTANCE;
     }
 
 }

diff --git a/renderers/faas/src/main/resources/org/opendaylight/blueprint/faas-renderer.xml b/renderers/faas/src/main/resources/org/opendaylight/blueprint/faas-renderer.xml
new file mode 100644 (file)
index 0000000..a72c7a8
--- /dev/null
+++ b/renderers/faas/src/main/resources/org/opendaylight/blueprint/faas-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="epRegistry" interface="org.opendaylight.groupbasedpolicy.api.EpRendererAugmentationRegistry"/>
+
+    <bean id="faasRenderer" class="org.opendaylight.controller.config.yang.config.faas_provider.impl.FaasProviderInstance"
+        destroy-method="close">
+        <argument ref="dataBroker"/>
+        <argument ref="epRegistry"/>
+    </bean>
+</blueprint>
\ No newline at end of file

diff --git a/renderers/faas/src/main/yang/faas-provider-impl.yang b/renderers/faas/src/main/yang/faas-provider-impl.yang
index d41bf78c42608121566233aa666fbe7f7a4d19c5..4b49b4e7b4486535a4ba70e046e4c278ae0ce926 100644 (file)
--- a/renderers/faas/src/main/yang/faas-provider-impl.yang
+++ b/renderers/faas/src/main/yang/faas-provider-impl.yang
@@ -35,25 +35,6 @@ module faas-provider-impl {
     augment "/config:modules/config:module/config:configuration" {
         case faas-provider-impl {
             when "/config:modules/config:module/config:type = 'faas-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;
-                    }
-                }
-            }
         }
     }
 }