From: michal rehak <mirehak@cisco.com>
Date: Tue, 31 Jan 2017 12:36:25 +0000 (+0000)
Subject: Merge "BUG-7608: use blueprint action-provider/action-service"
X-Git-Tag: release/carbon~88
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e33345cc06bc3ecb9e9cd298c4131df3ef29da75;hp=80cee5d71d306b8806d9316d12dceb5c1d1d63e6;p=openflowplugin.git

Merge "BUG-7608: use blueprint action-provider/action-service"
---

diff --git a/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml b/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml
index ca8fa54dd9..d07cc2d1ee 100644
--- a/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml
+++ b/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml
@@ -14,7 +14,7 @@
     ]]></odl:default-config>
   </odl:clustered-app-config>
 
-  <odl:rpc-service id="packetProcessingService"
+  <odl:action-service id="packetProcessingService"
       interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService"/>
 
   <bean id="lldpSpeaker" class="org.opendaylight.openflowplugin.applications.lldpspeaker.LLDPSpeaker"
@@ -40,4 +40,4 @@
   </bean>
 
   <odl:rpc-implementation ref="operationalStatusChangeService"/>
-</blueprint>
\ No newline at end of file
+</blueprint>
diff --git a/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml b/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml
index 20b907b416..976efaabee 100644
--- a/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml
+++ b/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml
@@ -6,4 +6,6 @@
 
   <service ref="ofPluginProviderFactory" interface="org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProviderFactory"
           odl:type="default"/>
-</blueprint>
\ No newline at end of file
+
+  <odl:action-provider interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService"/>
+</blueprint>