Changes are related to provide a command to display acl caches.

[netvirt.git] / vpnservice / aclservice / impl / src / main / resources / org / opendaylight / blueprint / aclservice.xml

diff --git a/vpnservice/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml b/vpnservice/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml
index cc11cdcd5f9e864fbdc4e7c956b23484b1d899d6..e7edd0342375f7d6f0cb9cec7a0ca55d07705bfd 100644 (file)
--- a/vpnservice/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml
+++ b/vpnservice/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml
@@ -6,76 +6,33 @@
 
   <reference id="dataBroker"
     interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" />
-  <reference id="mdsalManager"
+  <reference id="iMdsalApiManager"
     interface="org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager" />
   <reference id="entityOwnershipService"
-             interface="org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService" />
+             interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService" />
+  <reference id="iInterfaceManager"
+             interface="org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager" />
+  <reference id="jobCoordinator"
+             interface="org.opendaylight.infrautils.jobcoordinator.JobCoordinator" />
+
+  <odl:rpc-service id="idManagerService"
+    interface="org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService" />
+  <odl:rpc-service id="opendaylightDirectStatisticsService"
+    interface="org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.OpendaylightDirectStatisticsService" />
 
   <odl:clustered-app-config id="aclserviceConfig"
-                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.config.rev160806.AclserviceConfig">
-    <!--<odl:default-config><![CDATA[
-    <aclservice-config xmlns="urn:opendaylight:netvirt:aclservice-config">
-      <security-group-mode>stateless</security-group-mode>
-    </aclservice-config>
-  ]]></odl:default-config>-->
+                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.config.rev160806.AclserviceConfig"
+                            default-config-file-name="netvirt-aclservice-config.xml"
+                            update-strategy="none">
   </odl:clustered-app-config>
 
-  <!--<cm:property-placeholder persistent-id="org.opendaylight.netvirt.aclservice" update-strategy="none">
-    <cm:default-properties>
-      <cm:property name="security-group-mode" value="stateless"/>
-    </cm:default-properties>
-  </cm:property-placeholder>-->
+  <odl:rpc-implementation ref="aclLiveStatisticsRpcServiceImpl" />
+
+  <service ref="aclServiceUtilFacade"
+        interface="org.opendaylight.netvirt.aclservice.api.utils.IAclServiceUtil" />
 
-  <bean id="aclServiceFactory"
-    class="org.opendaylight.netvirt.aclservice.AclServiceImplFactory" init-method="start" destroy-method="close">
-    <argument ref="dataBroker" />
-    <argument ref="mdsalManager" />
-    <argument ref="aclserviceConfig" />
-    <!--<property name="securityGroupMode" value="${security-group-mode}"/>-->
-    <!--<cm:managed-properties persistent-id="org.opendaylight.netvirt.aclservice"
-                           update-strategy="component-managed"
-                           update-method="updateConfigParameter"/>-->
-  </bean>
-  <bean id="ingressAclService"
-    class="org.opendaylight.netvirt.aclservice.AclServiceImplFactory" factory-ref="aclServiceFactory" factory-method="createIngressAclServiceImpl">
-  </bean>
-  <bean id="egressAclService"
-    class="org.opendaylight.netvirt.aclservice.AclServiceImplFactory" factory-ref="aclServiceFactory" factory-method="createEgressAclServiceImpl">
-  </bean>
-  <bean id="aclServiceManager"
-    class="org.opendaylight.netvirt.aclservice.AclServiceManagerImpl">
-    <argument ref="ingressAclService" />
-    <argument ref="egressAclService" />
-  </bean>
-  <bean id="aclInterfaceStateListener"
-    class="org.opendaylight.netvirt.aclservice.listeners.AclInterfaceStateListener"
-    init-method="start" destroy-method="close">
-    <argument ref="aclServiceManager" />
-    <argument ref="dataBroker" />
-  </bean>
-  <bean id="aclNodeListener"
-    class="org.opendaylight.netvirt.aclservice.listeners.AclNodeListener"
-    init-method="start" destroy-method="close">
-    <argument ref="mdsalManager" />
-    <argument ref="dataBroker" />
-    <argument ref="aclserviceConfig" />
-  </bean>
-  <bean id="aclInterfaceListener"
-    class="org.opendaylight.netvirt.aclservice.listeners.AclInterfaceListener"
-    init-method="start" destroy-method="close">
-    <argument ref="aclServiceManager" />
-    <argument ref="dataBroker" />
-  </bean>
-  <bean id="aclEventListener"
-    class="org.opendaylight.netvirt.aclservice.listeners.AclEventListener"
-    init-method="start" destroy-method="close">
-    <argument ref="aclServiceManager" />
-    <argument ref="dataBroker" />
-  </bean>
-  <bean id="aclClusterUtil"
-    class="org.opendaylight.netvirt.aclservice.utils.AclClusterUtil"
-    init-method="start" destroy-method="close">
-    <argument ref="entityOwnershipService" />
-  </bean>
+  <service ref="aclDataUtil"
+           interface="org.opendaylight.netvirt.aclservice.api.utils.AclDataUtil" />
 
+  <odl:notification-listener ref="aclVpnChangeListener" />
 </blueprint>