BUG 6396 gbp-ise-adapter migration to blueprint

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

diff --git a/groupbasedpolicy-ise-adapter/src/main/config/default-config.xml b/groupbasedpolicy-ise-adapter/src/main/config/default-config.xml
index 2f71a2c51e39223c4e002682973f832b93589f4b..cb913b3b5ec1121c6c1d68ccd6772ac9d91c0d01 100755 (executable)
--- a/groupbasedpolicy-ise-adapter/src/main/config/default-config.xml
+++ b/groupbasedpolicy-ise-adapter/src/main/config/default-config.xml
@@ -18,15 +18,6 @@
                         gbp-ise-adapter:gbp-ise-adapter-impl
                     </type>
                     <name>gbp-ise-adapter</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>
-                    <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/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java
new file mode 100644 (file)
index 0000000..c1af905
--- /dev/null
+++ b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.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.groupbasedpolicy.gbp_ise_adapter;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
+import org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl.GbpIseAdapterProvider;
+
+public class GbpIseAdapterProviderInstance implements AutoCloseable{
+
+    private GbpIseAdapterProvider iseAdapterProvider;
+
+    public GbpIseAdapterProviderInstance(DataBroker dataBroker, BindingAwareBroker broker) {
+        iseAdapterProvider = new GbpIseAdapterProvider(dataBroker, broker);
+    }
+
+    @Override
+    public void close() throws Exception {
+        iseAdapterProvider.close();
+    }
+
+}

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java
index 415f9e908778a1a3c5c977358d76d85d4ca43fcc..c5373c98eaab9fe647423b5a9efadcac28bcc07a 100644 (file)
--- a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java
+++ b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter;
 
-import org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl.GbpIseAdapterProvider;
+import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
 
 /**
 * gbp-ise-adapter impl module
@@ -29,7 +29,7 @@ public class GpbIseAdapterProviderModule extends org.opendaylight.controller.con
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-        return new GbpIseAdapterProvider(getDataBrokerDependency(), getBrokerDependency());
+        return NoopAutoCloseable.INSTANCE;
     }
 
 }

diff --git a/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml b/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml
new file mode 100644 (file)
index 0000000..acea223
--- /dev/null
+++ b/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.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="gbpIseAdapter" class="org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter.GbpIseAdapterProviderInstance"
+        destroy-method="close">
+        <argument ref="dataBroker"/>
+        <argument ref="broker"/>
+    </bean>
+</blueprint>
\ No newline at end of file

diff --git a/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang b/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang
index 90548b0162cbc0aca1d7832164417063b4a69382..81451105eed4352803f6e9d7f72ed96a1a5f5c70 100644 (file)
--- a/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang
+++ b/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang
@@ -35,26 +35,6 @@ module gbp-ise-adapter-cfg {
     augment "/config:modules/config:module/config:configuration" {
         case gbp-ise-adapter-impl {
             when "/config:modules/config:module/config:type = 'gbp-ise-adapter-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;
-                    }
-                }
-            }
-
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-broker-osgi-registry;
-                    }
-                }
-            }
-
         }
     }
 }