From 3c00146651abdf8cfeaf103b789b6c0b95bd1d89 Mon Sep 17 00:00:00 2001
From: Sangwook Ha <sangwook.ha@verizon.com>
Date: Mon, 14 Mar 2022 14:28:27 -0700
Subject: [PATCH] Consolidate blueprint XML files for openflowplugin-impl

There are two Blueprint XML files cross-referencing between them.
Merge them into a single file for better readability.

Change-Id: Ib46dd02259658484a278908dc8af46f553a9d4f7
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
---
 .../resources/OSGI-INF/blueprint/autowire.xml | 32 --------
 .../resources/OSGI-INF/blueprint/commands.xml |  3 +-
 .../blueprint/openflowplugin-impl.xml         | 77 +++++++++++++++----
 3 files changed, 64 insertions(+), 48 deletions(-)
 delete mode 100644 openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/autowire.xml

diff --git a/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/autowire.xml b/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/autowire.xml
deleted file mode 100644
index ad51e5552a..0000000000
--- a/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/autowire.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <bean id="flowGroupCacheManagerImpl" class="org.opendaylight.openflowplugin.impl.services.cache.FlowGroupCacheManagerImpl"/>
-    <bean id="mastershipChangeServiceManagerImpl" class="org.opendaylight.openflowplugin.impl.mastership.MastershipChangeServiceManagerImpl"/>
-    <bean id="openFlowPluginProviderImpl" class="org.opendaylight.openflowplugin.impl.OpenFlowPluginProviderImpl" init-method="initialize" destroy-method="close">
-        <argument ref="configurationService"/>
-        <argument ref="switchConnectionProviderList"/>
-        <argument ref="pingPongDataBroker"/>
-        <argument ref="rpcProviderService"/>
-        <argument ref="notificationPublishService"/>
-        <argument ref="clusterSingletonServiceProvider"/>
-        <argument ref="entityOwnershipService"/>
-        <argument ref="mastershipChangeServiceManagerImpl"/>
-        <argument ref="openflowDiagStatusProvider"/>
-        <argument ref="systemReadyMonitor"/>
-    </bean>
-    <reference id="systemReadyMonitor" interface="org.opendaylight.infrautils.ready.SystemReadyMonitor"/>
-    <reference id="notificationPublishService" interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
-    <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
-    <reference id="entityOwnershipService" interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
-    <reference id="clusterSingletonServiceProvider" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
-    <reference id="openflowDiagStatusProvider" interface="org.opendaylight.openflowjava.protocol.api.connection.OpenflowDiagStatusProvider"/>
-    <service ref="flowGroupCacheManagerImpl" interface="org.opendaylight.openflowplugin.api.openflow.FlowGroupCacheManager"/>
-    <service ref="mastershipChangeServiceManagerImpl" interface="org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeServiceManager"/>
-    <service ref="openFlowPluginProviderImpl">
-        <interfaces>
-            <value>org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider</value>
-            <value>org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegistratorProvider</value>
-            <value>org.opendaylight.openflowplugin.api.openflow.FlowGroupInfoHistories</value>
-        </interfaces>
-    </service>
-</blueprint>
diff --git a/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/commands.xml b/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/commands.xml
index 67be069039..0b8e99a554 100644
--- a/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/commands.xml
+++ b/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/commands.xml
@@ -8,7 +8,6 @@
   -->
 
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="ofp/showStats">
             <action class="org.opendaylight.openflowplugin.impl.karaf.ShowStatsCommandProvider"/>
@@ -29,4 +28,4 @@
             <action class="org.opendaylight.openflowplugin.impl.karaf.ResetSessionStatsComandProvider"/>
         </command>
     </command-bundle>
-</blueprint>
\ No newline at end of file
+</blueprint>
diff --git a/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/openflowplugin-impl.xml b/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/openflowplugin-impl.xml
index 7b80dbb1a9..fc1cf6e4e1 100644
--- a/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/openflowplugin-impl.xml
+++ b/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/openflowplugin-impl.xml
@@ -5,32 +5,81 @@
            xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
            odl:use-default-for-reference-types="true">
 
-  <bean id="configurationServiceFactory" class="org.opendaylight.openflowplugin.impl.configuration.ConfigurationServiceFactoryOsgiImpl">
-    <argument ref="blueprintBundleContext"/>
+  <bean id="openFlowPluginProviderImpl"
+        class="org.opendaylight.openflowplugin.impl.OpenFlowPluginProviderImpl"
+        init-method="initialize"
+        destroy-method="close">
+    <argument ref="configurationService"/>
+    <argument ref="switchConnectionProviderList"/>
+    <argument ref="pingPongDataBroker"/>
+    <argument ref="rpcProviderService"/>
+    <argument ref="notificationPublishService"/>
+    <argument ref="clusterSingletonServiceProvider"/>
+    <argument ref="entityOwnershipService"/>
+    <argument ref="mastershipChangeServiceManagerImpl"/>
+    <argument ref="openflowDiagStatusProvider"/>
+    <argument ref="systemReadyMonitor"/>
   </bean>
-  <service ref="configurationServiceFactory" interface="org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationServiceFactory"/>
+  <service ref="openFlowPluginProviderImpl">
+    <interfaces>
+      <value>org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider</value>
+      <value>org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegistratorProvider</value>
+      <value>org.opendaylight.openflowplugin.api.openflow.FlowGroupInfoHistories</value>
+    </interfaces>
+  </service>
+
+  <bean id="flowGroupCacheManagerImpl"
+        class="org.opendaylight.openflowplugin.impl.services.cache.FlowGroupCacheManagerImpl"/>
+  <service ref="flowGroupCacheManagerImpl"
+           interface="org.opendaylight.openflowplugin.api.openflow.FlowGroupCacheManager"/>
 
-  <odl:clustered-app-config id="openflowProviderConfig"
-                          binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig"/>
   <bean id="configurationService"
         factory-ref="configurationServiceFactory"
         factory-method="newInstance"
         destroy-method="close">
-      <argument ref="openflowProviderConfig" />
-      <cm:managed-properties persistent-id="org.opendaylight.openflowplugin"
-                             update-strategy="component-managed"
-                             update-method="update"/>
+    <argument ref="openflowProviderConfig" />
+    <cm:managed-properties persistent-id="org.opendaylight.openflowplugin"
+                           update-strategy="component-managed"
+                           update-method="update"/>
   </bean>
-  <service ref="configurationService" interface="org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationService"/>
+  <service ref="configurationService"
+           interface="org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationService"/>
+  <bean id="configurationServiceFactory"
+        class="org.opendaylight.openflowplugin.impl.configuration.ConfigurationServiceFactoryOsgiImpl">
+    <argument ref="blueprintBundleContext"/>
+  </bean>
+  <service ref="configurationServiceFactory"
+           interface="org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationServiceFactory"/>
+  <odl:clustered-app-config id="openflowProviderConfig"
+                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig"/>
 
-  <reference id="ppDB" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
-  <bean id="pingPongDataBroker" class="org.opendaylight.openflowplugin.impl.ForwardingPingPongDataBroker">
+  <bean id="pingPongDataBroker"
+        class="org.opendaylight.openflowplugin.impl.ForwardingPingPongDataBroker">
     <argument ref="ppDB"/>
   </bean>
+  <reference id="ppDB"
+             interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
 
-  <reference id="switchConnectionProviderList" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderList" ext:proxy-method="classes"/>
+  <bean id="mastershipChangeServiceManagerImpl"
+        class="org.opendaylight.openflowplugin.impl.mastership.MastershipChangeServiceManagerImpl"/>
+  <service ref="mastershipChangeServiceManagerImpl"
+           interface="org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeServiceManager"/>
 
-  <reference id="openflowPluginDiagStatusProviderImpl" interface="org.opendaylight.openflowjava.protocol.api.connection.OpenflowDiagStatusProvider" ext:proxy-method="classes"/>
+  <reference id="switchConnectionProviderList"
+             interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderList"
+             ext:proxy-method="classes"/>
+  <reference id="rpcProviderService"
+             interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
+  <reference id="notificationPublishService"
+             interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
+  <reference id="clusterSingletonServiceProvider"
+             interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
+  <reference id="entityOwnershipService"
+             interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
+  <reference id="openflowDiagStatusProvider"
+             interface="org.opendaylight.openflowjava.protocol.api.connection.OpenflowDiagStatusProvider"/>
+  <reference id="systemReadyMonitor"
+             interface="org.opendaylight.infrautils.ready.SystemReadyMonitor"/>
 
   <odl:action-provider interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService"/>
 </blueprint>
-- 
2.36.6