From 4ad7d0ff152b97a444b276857327500e343d38d8 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Wed, 28 Jun 2017 10:47:10 +0200 Subject: [PATCH] Migrate to odlparent 2.0.0 - migrating to odl parent 2.0.0 - fixing issues after guava migration - disabling FaaS renderer temporarily Change-Id: I5aaa7b9c79ce21f3c3f22d984219bf35608379d5 Signed-off-by: Michal Cmarada --- artifacts/pom.xml | 2 +- distribution-karaf/pom.xml | 9 +- .../pom.xml | 14 +- features/features-groupedpolicy/pom.xml | 424 ------------------ .../src/main/features/features.xml | 242 ---------- features/odl-groupbasedpolicy-base/pom.xml | 2 +- features/odl-groupbasedpolicy-faas/pom.xml | 65 --- .../src/main/feature/features.xml | 16 - features/odl-groupbasedpolicy-ios-xe/pom.xml | 2 +- features/odl-groupbasedpolicy-iovisor/pom.xml | 3 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/odl-groupbasedpolicy-netconf/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../odl-groupbasedpolicy-ofoverlay/pom.xml | 2 +- features/odl-groupbasedpolicy-ovssfc/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/odl-groupbasedpolicy-ui/pom.xml | 2 +- features/odl-groupbasedpolicy-vpp/pom.xml | 37 +- features/pom.xml | 6 +- pom.xml | 2 +- .../impl/manager/PolicyManagerImpl.java | 6 +- renderers/ofoverlay/pom.xml | 5 + .../renderer/ofoverlay/PolicyManager.java | 2 +- .../vpp/adapter/VppRpcServiceImpl.java | 22 +- .../renderer/vpp/iface/InterfaceManager.java | 4 +- .../vpp/policy/BridgeDomainManagerImpl.java | 6 +- .../provider/impl/SxpMapperReactorImpl.java | 2 +- .../dao/EPPolicyTemplateDaoFacadeImpl.java | 2 +- .../EPForwardingTemplateListenerImpl.java | 4 +- .../listen/EPPolicyTemplateListenerImpl.java | 4 +- .../MasterDatabaseBindingListenerImpl.java | 2 +- .../impl/GbpIseSgtHarvesterImpl.java | 2 +- 36 files changed, 97 insertions(+), 810 deletions(-) rename features/{features4-groupbasedpolicy => features-groupbasedpolicy}/pom.xml (91%) delete mode 100644 features/features-groupedpolicy/pom.xml delete mode 100755 features/features-groupedpolicy/src/main/features/features.xml delete mode 100644 features/odl-groupbasedpolicy-faas/pom.xml delete mode 100644 features/odl-groupbasedpolicy-faas/src/main/feature/features.xml diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 3bda0eb7c..d0e45b861 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index afeb1db41..e7229c0e0 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -3,14 +3,15 @@ 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 --> - + 4.0.0 org.opendaylight.odlparent - karaf-parent - 1.9.0 + karaf4-parent + 2.0.0 diff --git a/features/features4-groupbasedpolicy/pom.xml b/features/features-groupbasedpolicy/pom.xml similarity index 91% rename from features/features4-groupbasedpolicy/pom.xml rename to features/features-groupbasedpolicy/pom.xml index c9db81fee..0233d728d 100644 --- a/features/features4-groupbasedpolicy/pom.xml +++ b/features/features-groupbasedpolicy/pom.xml @@ -1,17 +1,17 @@ - 4.0.0 org.opendaylight.odlparent feature-repo-parent - 1.9.0 + 2.0.0 org.opendaylight.groupbasedpolicy - features4-groupbasedpolicy + features-groupbasedpolicy 0.6.0-SNAPSHOT feature - - 4.0.0 - - org.opendaylight.odlparent - features-parent - 1.9.0 - - - - org.opendaylight.groupbasedpolicy - features-groupbasedpolicy - 0.6.0-SNAPSHOT - pom - - ODL :: groupbasedpolicy :: ${project.artifactId} - - - 3.0 - - - - 0.6.0-SNAPSHOT - 2.3.0-SNAPSHOT - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.5.0-SNAPSHOT - 0.9.0-SNAPSHOT - 1.3.0-SNAPSHOT - 0.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - 1.5.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.2.0-SNAPSHOT - - 1.9.0-SNAPSHOT - - - - - - - org.opendaylight.groupbasedpolicy - groupbasedpolicy-artifacts - ${project.version} - pom - import - - - - - org.opendaylight.mdsal - mdsal-artifacts - ${mdsal.version} - import - pom - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${mdsal.model.version} - import - pom - - - org.opendaylight.controller - mdsal-artifacts - ${controller.mdsal.version} - import - pom - - - - org.opendaylight.controller - features-extras - ${feature.controller.extras.version} - features - xml - - - - - - org.opendaylight.netconf - netconf-artifacts - ${netconf.version} - pom - import - - - - - org.opendaylight.openflowplugin - openflowplugin-artifacts - ${openflowplugin.version} - import - pom - - - - - org.opendaylight.honeycomb.vbd - vbd-artifacts - ${vbd.version} - pom - import - - - - - - - - org.opendaylight.mdsal - features-mdsal - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - xml - - - org.opendaylight.netconf - features-netconf-connector - features - xml - runtime - - - org.opendaylight.controller - features-extras - features - xml - - - - - org.opendaylight.openflowplugin - features-openflowplugin - features - xml - - - org.opendaylight.openflowplugin - features-openflowplugin-extension - features - xml - - - - - org.opendaylight.ovsdb - southbound-features - ${ovsdb.southbound.version} - features - xml - - - - - org.opendaylight.neutron - features-neutron - features - ${neutron.version} - xml - - - - - org.opendaylight.faas - features-faas - features - ${faas.version} - xml - - - - - org.opendaylight.sfc - features-sfc - ${sfc.version} - features - xml - runtime - - - - - org.opendaylight.netconf - features-restconf - ${restconf.version} - features - xml - - - - - org.opendaylight.dlux - features-dlux - ${dlux.version} - features - xml - - - - - org.opendaylight.aaa - features-aaa-shiro - ${aaa.version} - features - xml - - - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-server - - - - - org.opendaylight.sxp - sxp-api - ${sxp.version} - - - org.opendaylight.sxp - sxp-core - ${sxp.version} - - - org.opendaylight.sxp - sxp-controller - ${sxp.version} - - - org.opendaylight.sxp - features - ${sxp.version} - xml - features - - - - - org.opendaylight.honeycomb.vbd - vbd-features - features - xml - - - - - commons-net - commons-net - - - org.opendaylight.groupbasedpolicy - groupbasedpolicy - - - org.opendaylight.groupbasedpolicy - l2-l3-domain-extension - - - org.opendaylight.groupbasedpolicy - ofoverlay-renderer - - - org.opendaylight.groupbasedpolicy - ovssfc-renderer - - - org.opendaylight.groupbasedpolicy - faas-renderer - - - org.opendaylight.groupbasedpolicy - netconf-renderer - - - org.opendaylight.groupbasedpolicy - iovisor-renderer - - - org.opendaylight.groupbasedpolicy - ne-location-provider - - - org.opendaylight.groupbasedpolicy - vpp-renderer - - - org.opendaylight.groupbasedpolicy - neutron-mapper - - - org.opendaylight.groupbasedpolicy - neutron-vpp-mapper - - - org.opendaylight.groupbasedpolicy - neutron-ovsdb - - - org.opendaylight.groupbasedpolicy - groupbasedpolicy-ui-bundle - - - org.opendaylight.groupbasedpolicy - sxp-ep-provider - - - org.opendaylight.groupbasedpolicy - ip-sgt-distribution-service - - - org.opendaylight.groupbasedpolicy - ios-xe-renderer - - - org.opendaylight.groupbasedpolicy - sxp-ise-adapter - - - - - org.opendaylight.groupbasedpolicy - l2-l3-domain-extension - xml - config - - - org.opendaylight.groupbasedpolicy - ovssfc-renderer - xml - config - - - org.opendaylight.groupbasedpolicy - netconf-renderer - xml - config - - - org.opendaylight.groupbasedpolicy - iovisor-renderer - xml - config - - - org.opendaylight.groupbasedpolicy - ne-location-provider - xml - config - - - org.opendaylight.groupbasedpolicy - neutron-ovsdb - xml - config - - - org.opendaylight.groupbasedpolicy - sxp-ep-provider - xml - config - - - org.opendaylight.groupbasedpolicy - ip-sgt-distribution-service - xml - config - - - org.opendaylight.groupbasedpolicy - ios-xe-renderer - xml - config - - - org.opendaylight.groupbasedpolicy - sxp-ise-adapter - xml - config - - - ${project.groupId} - vpp-renderer - ${project.version} - cfg - config - - - ${project.groupId} - neutron-vpp-mapper - cfg - config - - - ${project.groupId} - neutron-mapper - cfg - config - - - diff --git a/features/features-groupedpolicy/src/main/features/features.xml b/features/features-groupedpolicy/src/main/features/features.xml deleted file mode 100755 index 945d05798..000000000 --- a/features/features-groupedpolicy/src/main/features/features.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features - mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features - mvn:org.opendaylight.controller/features-extras/{{VERSION}}/xml/features - - mvn:org.opendaylight.openflowplugin/features-openflowplugin/{{VERSION}}/xml/features - mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/{{VERSION}}/xml/features - mvn:org.opendaylight.ovsdb/southbound-features/{{VERSION}}/xml/features - - mvn:org.opendaylight.faas/features-faas/{{VERSION}}/xml/features - - mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features - - mvn:org.opendaylight.sfc/features-sfc/{{VERSION}}/xml/features - - mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features - - mvn:org.opendaylight.aaa/features-aaa-shiro/${aaa.version}/xml/features - - mvn:org.opendaylight.sxp/features/${sxp.version}/xml/features - - mvn:org.opendaylight.netconf/features-netconf-connector/${netconf.version}/xml/features - - mvn:org.opendaylight.honeycomb.vbd/vbd-features/${vbd.version}/xml/features - - - - odl-mdsal-broker - odl-mdsal-binding-base - odl-mdsal-models - mvn:commons-net/commons-net/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy/{{VERSION}} - - - - - odl-groupbasedpolicy-base - odl-openflowplugin-flow-services - odl-openflowplugin-nxm-extensions - odl-ovsdb-southbound-impl - odl-sfc-openflow-renderer - odl-sfc-ui - mvn:commons-net/commons-net/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/{{VERSION}} - mvn:com.sun.jersey/jersey-core/{{VERSION}} - mvn:com.sun.jersey/jersey-client/{{VERSION}} - mvn:com.google.code.gson/gson/{{VERSION}} - - - - - odl-groupbasedpolicy-base - odl-openflowplugin-flow-services - odl-openflowplugin-nxm-extensions - odl-ovsdb-southbound-impl - odl-sfc-openflow-renderer - odl-sfc-ui - mvn:commons-net/commons-net/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/ovssfc-renderer/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/ovssfc-renderer/{{VERSION}}/xml/config - - - - - odl-groupbasedpolicy-base - odl-faas-uln-mapper - mvn:org.opendaylight.groupbasedpolicy/faas-renderer/{{VERSION}} - - - - - war - odl-aaa-shiro - odl-groupbasedpolicy-base - odl-restconf - mvn:org.opendaylight.groupbasedpolicy/iovisor-renderer/{{VERSION}} - mvn:com.sun.jersey/jersey-core/{{VERSION}} - mvn:com.sun.jersey/jersey-client/{{VERSION}} - mvn:com.google.code.gson/gson/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/iovisor-renderer/{{VERSION}}/xml/config - - - - - odl-groupbasedpolicy-base - mvn:org.opendaylight.groupbasedpolicy/netconf-renderer/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/netconf-renderer/{{VERSION}}/xml/config - - - - - odl-neutron-service - odl-groupbasedpolicy-base - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/neutron-mapper/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}/xml/config - - mvn:org.opendaylight.groupbasedpolicy/neutron-mapper/{{VERSION}}/cfg/config - - - - - odl-groupbasedpolicy-ofoverlay - odl-groupbasedpolicy-neutronmapper - mvn:org.opendaylight.groupbasedpolicy/neutron-ovsdb/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/neutron-ovsdb/{{VERSION}}/xml/config - - - - - odl-groupbasedpolicy-base - odl-netconf-clustered-topology - odl-vbd - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/vpp-renderer/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}/xml/config - mvn:org.opendaylight.groupbasedpolicy/vpp-renderer/{{VERSION}}/cfg/config - - - - - odl-groupbasedpolicy-neutronmapper - odl-groupbasedpolicy-vpp - mvn:org.opendaylight.groupbasedpolicy/neutron-vpp-mapper/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/neutron-vpp-mapper/{{VERSION}}/cfg/config - - - - - odl-dlux-core - mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ui-bundle/{{VERSION}} - - - - - odl-groupbasedpolicy-base - odl-sxp-core - odl-sxp-controller - mvn:org.opendaylight.groupbasedpolicy/ip-sgt-distribution-service/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/ip-sgt-distribution-service/{{VERSION}}/xml/config - - - - - odl-groupbasedpolicy-base - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/ne-location-provider/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}/xml/config - mvn:org.opendaylight.groupbasedpolicy/ne-location-provider/{{VERSION}}/xml/config - - - - - odl-groupbasedpolicy-base - odl-groupbasedpolicy-sxp-ep-provider - odl-groupbasedpolicy-ip-sgt-distribution-service - odl-sfc-provider - odl-sxp-core - odl-netconf-clustered-topology - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/ios-xe-renderer/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/ios-xe-renderer/{{VERSION}}/xml/config - - - - - odl-sxp-core - odl-groupbasedpolicy-base - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/sxp-ep-provider/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/sxp-ep-provider/{{VERSION}}/xml/config - - - - - odl-groupbasedpolicy-sxp-ep-provider - mvn:com.sun.jersey/jersey-client/{{VERSION}} - mvn:com.sun.jersey/jersey-core/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/sxp-ise-adapter/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/sxp-ise-adapter/{{VERSION}}/xml/config - - - diff --git a/features/odl-groupbasedpolicy-base/pom.xml b/features/odl-groupbasedpolicy-base/pom.xml index f1e840c92..bf83512cd 100644 --- a/features/odl-groupbasedpolicy-base/pom.xml +++ b/features/odl-groupbasedpolicy-base/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-faas/pom.xml b/features/odl-groupbasedpolicy-faas/pom.xml deleted file mode 100644 index a5f1e9ca2..000000000 --- a/features/odl-groupbasedpolicy-faas/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - 4.0.0 - - org.opendaylight.odlparent - single-feature-parent - 1.9.0 - - - - org.opendaylight.groupbasedpolicy - odl-groupbasedpolicy-faas - 0.6.0-SNAPSHOT - feature - - - ODL :: groupbasedpolicy :: ${project.artifactId} - - - 1.3.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - - ${project.groupId} - groupbasedpolicy-artifacts - ${project.version} - pom - import - - - - - - - ${project.groupId} - faas-renderer - - - ${project.groupId} - odl-groupbasedpolicy-base - xml - features - - - org.opendaylight.faas - odl-faas-uln-mapper - ${faas.version} - xml - features - - - diff --git a/features/odl-groupbasedpolicy-faas/src/main/feature/features.xml b/features/odl-groupbasedpolicy-faas/src/main/feature/features.xml deleted file mode 100644 index 6ed46ea0c..000000000 --- a/features/odl-groupbasedpolicy-faas/src/main/feature/features.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - mvn:org.opendaylight.groupbasedpolicy/faas-renderer/{{VERSION}}/xml/config - - \ No newline at end of file diff --git a/features/odl-groupbasedpolicy-ios-xe/pom.xml b/features/odl-groupbasedpolicy-ios-xe/pom.xml index e392a4b5d..a6284ea95 100644 --- a/features/odl-groupbasedpolicy-ios-xe/pom.xml +++ b/features/odl-groupbasedpolicy-ios-xe/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-iovisor/pom.xml b/features/odl-groupbasedpolicy-iovisor/pom.xml index a3188c9ea..df784983e 100644 --- a/features/odl-groupbasedpolicy-iovisor/pom.xml +++ b/features/odl-groupbasedpolicy-iovisor/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 @@ -83,6 +83,7 @@ org.opendaylight.aaa odl-aaa-shiro + ${aaa.version} xml features diff --git a/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml b/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml index 7866b49c2..52b7ba6f4 100644 --- a/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml +++ b/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-ne-location-provider/pom.xml b/features/odl-groupbasedpolicy-ne-location-provider/pom.xml index f55d64f52..3c696cabb 100644 --- a/features/odl-groupbasedpolicy-ne-location-provider/pom.xml +++ b/features/odl-groupbasedpolicy-ne-location-provider/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-netconf/pom.xml b/features/odl-groupbasedpolicy-netconf/pom.xml index aac85808e..fef42d146 100644 --- a/features/odl-groupbasedpolicy-netconf/pom.xml +++ b/features/odl-groupbasedpolicy-netconf/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml b/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml index 24210c603..a14e10e66 100644 --- a/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml +++ b/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml b/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml index b22bd0678..7f56b4ee0 100644 --- a/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml +++ b/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-neutronmapper/pom.xml b/features/odl-groupbasedpolicy-neutronmapper/pom.xml index f84dd5e57..c607ce1ea 100644 --- a/features/odl-groupbasedpolicy-neutronmapper/pom.xml +++ b/features/odl-groupbasedpolicy-neutronmapper/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-ofoverlay/pom.xml b/features/odl-groupbasedpolicy-ofoverlay/pom.xml index 7a7e9a300..708848492 100644 --- a/features/odl-groupbasedpolicy-ofoverlay/pom.xml +++ b/features/odl-groupbasedpolicy-ofoverlay/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-ovssfc/pom.xml b/features/odl-groupbasedpolicy-ovssfc/pom.xml index 13705ba99..45214eb28 100644 --- a/features/odl-groupbasedpolicy-ovssfc/pom.xml +++ b/features/odl-groupbasedpolicy-ovssfc/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml b/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml index 6fe98b3e9..1fb1e61c5 100644 --- a/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml +++ b/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml b/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml index 9db77b505..c0c4db2ba 100644 --- a/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml +++ b/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-ui/pom.xml b/features/odl-groupbasedpolicy-ui/pom.xml index eec2981c5..3c77f7ec3 100644 --- a/features/odl-groupbasedpolicy-ui/pom.xml +++ b/features/odl-groupbasedpolicy-ui/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 diff --git a/features/odl-groupbasedpolicy-vpp/pom.xml b/features/odl-groupbasedpolicy-vpp/pom.xml index 76b33c05b..602c24a44 100644 --- a/features/odl-groupbasedpolicy-vpp/pom.xml +++ b/features/odl-groupbasedpolicy-vpp/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0 + 2.0.0 @@ -24,6 +24,7 @@ 1.3.0-SNAPSHOT 1.2.0-SNAPSHOT + 1.6.0-SNAPSHOT @@ -52,6 +53,13 @@ pom import + + org.opendaylight.lispflowmapping + lispflowmapping-artifacts + ${lisp.version} + pom + import + @@ -76,12 +84,25 @@ xml features + + org.opendaylight.netconf + odl-restconf + 1.6.0-SNAPSHOT + xml + features + org.opendaylight.honeycomb.vbd odl-vbd xml features + + org.opendaylight.honeycomb.vbd + odl-vbd-rest + xml + features + ${project.groupId} l2-l3-domain-extension @@ -94,5 +115,19 @@ cfg config + + org.opendaylight.lispflowmapping + odl-lispflowmapping-msmr + ${lisp.version} + xml + features + + + org.opendaylight.lispflowmapping + odl-lispflowmapping-mappingservice-shell + ${lisp.version} + xml + features + diff --git a/features/pom.xml b/features/pom.xml index 90914759d..56e4071f1 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 @@ -18,12 +18,10 @@ ODL :: groupbasedpolicy :: ${project.artifactId} - features-groupedpolicy - features4-groupbasedpolicy + features-groupbasedpolicy odl-groupbasedpolicy-base odl-groupbasedpolicy-ofoverlay odl-groupbasedpolicy-ovssfc - odl-groupbasedpolicy-faas odl-groupbasedpolicy-iovisor odl-groupbasedpolicy-netconf odl-groupbasedpolicy-neutronmapper diff --git a/pom.xml b/pom.xml index 751a1f20c..674c7cfc8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImpl.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImpl.java index 3cd543e19..b1d6e3ccc 100644 --- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImpl.java +++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImpl.java @@ -83,7 +83,7 @@ public class PolicyManagerImpl implements PolicyManager { creationResult = syncEndpoints(dataBefore, Delete); } else { final ListenableFuture> deletionResult = syncEndpoints(dataBefore, Delete); - creationResult = Futures.transform(deletionResult, new AsyncFunction, Optional>() { + creationResult = Futures.transformAsync(deletionResult, new AsyncFunction, Optional>() { @Nonnull @Override public ListenableFuture> apply(@Nonnull Optional deletionResult) throws Exception { @@ -95,7 +95,7 @@ public class PolicyManagerImpl implements PolicyManager { } }); } - return Futures.transform(creationResult, new AsyncFunction, Boolean>() { + return Futures.transformAsync(creationResult, new AsyncFunction, Boolean>() { @Override public ListenableFuture apply(@Nullable final Optional statusValue) throws Exception { Preconditions.checkArgument(statusValue != null, "provided status must not be null"); @@ -294,4 +294,4 @@ public class PolicyManagerImpl implements PolicyManager { return mountpoint; } } -} \ No newline at end of file +} diff --git a/renderers/ofoverlay/pom.xml b/renderers/ofoverlay/pom.xml index f7150d2e6..655fa13f3 100755 --- a/renderers/ofoverlay/pom.xml +++ b/renderers/ofoverlay/pom.xml @@ -39,6 +39,11 @@ openflowplugin-extension-nicira ${openflowplugin.version} + + org.opendaylight.openflowplugin + openflowplugin-api + ${openflowplugin.version} + org.opendaylight.controller liblldp diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/PolicyManager.java b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/PolicyManager.java index c5277068c..5676ec0e7 100755 --- a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/PolicyManager.java +++ b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/PolicyManager.java @@ -211,7 +211,7 @@ public class PolicyManager } } ListenableFuture> allAsListFuture = Futures.allAsList(checkList); - return Futures.transform(allAsListFuture, new AsyncFunction, Void>() { + return Futures.transformAsync(allAsListFuture, new AsyncFunction, Void>() { @Override public ListenableFuture apply(List readyToSubmit) { diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/adapter/VppRpcServiceImpl.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/adapter/VppRpcServiceImpl.java index f322ac7d1..a26266f6c 100644 --- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/adapter/VppRpcServiceImpl.java +++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/adapter/VppRpcServiceImpl.java @@ -112,7 +112,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { futures.add(bridgeDomainManager.createVlanBridgeDomainOnVppNode(input.getId(), vlanId, nodeId)); }); } - return Futures.transform(Futures.allAsList(futures), voidsToRpcResult()); + return Futures.transformAsync(Futures.allAsList(futures), voidsToRpcResult()); } public Future> deleteVirtualBridgeDomainFromNodes(DeleteVirtualBridgeDomainFromNodesInput input) { @@ -121,7 +121,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { input.getBridgeDomainNode().forEach(nodeId -> { futures.add(bridgeDomainManager.removeBridgeDomainFromVppNode(input.getBridgeDomainId(), nodeId)); }); - return Futures.transform(Futures.allAsList(futures), voidsToRpcResult()); + return Futures.transformAsync(Futures.allAsList(futures), voidsToRpcResult()); } public ListenableFuture> cloneVirtualBridgeDomainOnNodes(CloneVirtualBridgeDomainOnNodesInput input) { @@ -130,7 +130,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { ReadOnlyTransaction rTx = dataBroker.newReadOnlyTransaction(); InstanceIdentifier topologyIid = VppIidFactory.getTopologyIid(new TopologyKey(new TopologyId( input.getBridgeDomainId()))); - return Futures.transform(rTx.read(LogicalDatastoreType.CONFIGURATION, topologyIid), + return Futures.transformAsync(rTx.read(LogicalDatastoreType.CONFIGURATION, topologyIid), new AsyncFunction, RpcResult>() { @Override @@ -174,7 +174,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { input.getBridgeDomainId(), vlanId, nodeId)); }); } - return Futures.transform(Futures.allAsList(futures), voidsToRpcResult()); + return Futures.transformAsync(Futures.allAsList(futures), voidsToRpcResult()); } }); } @@ -211,7 +211,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { .withError(ErrorType.RPC, "Cannot find data broker for mount point " + vppNodeIid) .build()); } - return Futures.transform(interfaceManager.createInterfaceOnVpp(ifaceCommand, optDataBroker.get()), + return Futures.transformAsync(interfaceManager.createInterfaceOnVpp(ifaceCommand, optDataBroker.get()), voidToRpcResult()); } @@ -219,7 +219,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { LOG.info("Processing a remote call for removing interface {} from node {}", input.getVppInterfaceName(), input.getVppNodeId()); InstanceIdentifier vppNodeIid = VppIidFactory.getNetconfNodeIid(input.getVppNodeId()); - return Futures.transform(readInterface(vppNodeIid, input.getVppInterfaceName()), + return Futures.transformAsync(readInterface(vppNodeIid, input.getVppInterfaceName()), new AsyncFunction, RpcResult>() { @Override @@ -236,7 +236,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { Optional dataBroker = mountDataProvider.getDataBrokerForMountPoint(vppNodeIid); WriteTransaction wTx = dataBroker.get().newWriteOnlyTransaction(); wTx.delete(LogicalDatastoreType.CONFIGURATION, VppIidFactory.getInterfaceIID(iKey)); - return Futures.transform(wTx.submit(), voidToRpcResult()); + return Futures.transformAsync(wTx.submit(), voidToRpcResult()); } }); } @@ -245,7 +245,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { LOG.info("Processing a remote call for adding interface {} to bridge domain {}", input.getVppInterfaceName(), input.getBridgeDomainId()); InstanceIdentifier vppNodeIid = VppIidFactory.getNetconfNodeIid(input.getVppNodeId()); - return Futures.transform(readInterface(vppNodeIid, input.getVppInterfaceName()), + return Futures.transformAsync(readInterface(vppNodeIid, input.getVppInterfaceName()), new AsyncFunction, RpcResult>() { @Override @@ -260,7 +260,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { .build()); } Optional dataBroker = mountDataProvider.getDataBrokerForMountPoint(vppNodeIid); - return Futures.transform(interfaceManager.configureInterface(dataBroker.get(), iKey, + return Futures.transformAsync(interfaceManager.configureInterface(dataBroker.get(), iKey, input.getBridgeDomainId(), null), voidToRpcResult()); } }); @@ -269,7 +269,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { public ListenableFuture> delInterfaceFromBridgeDomain(DelInterfaceFromBridgeDomainInput input) { LOG.info("Processing a remote call for removing interface {} from bridge domain.", input.getVppInterfaceName()); InstanceIdentifier vppNodeIid = VppIidFactory.getNetconfNodeIid(input.getVppNodeId()); - return Futures.transform(readInterface(vppNodeIid, input.getVppInterfaceName()), + return Futures.transformAsync(readInterface(vppNodeIid, input.getVppInterfaceName()), new AsyncFunction, RpcResult>() { @Override @@ -284,7 +284,7 @@ public class VppRpcServiceImpl implements VppAdapterService, AutoCloseable { .build()); } Optional dataBroker = mountDataProvider.getDataBrokerForMountPoint(vppNodeIid); - return Futures.transform(interfaceManager.removeInterfaceFromBridgeDomain(dataBroker.get(), + return Futures.transformAsync(interfaceManager.removeInterfaceFromBridgeDomain(dataBroker.get(), optIface.get().getKey()), voidToRpcResult()); } }); diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/InterfaceManager.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/InterfaceManager.java index 80280f9c7..db24b57c5 100644 --- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/InterfaceManager.java +++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/InterfaceManager.java @@ -110,7 +110,7 @@ public class InterfaceManager implements AutoCloseable { final ListenableFuture partialOldPolicyExcludedFuture = updatePolicyExcludedEndpoints(oldVppEndpoint, false); policyExcludedFuture = - Futures.transform(partialOldPolicyExcludedFuture, (AsyncFunction) input -> + Futures.transformAsync(partialOldPolicyExcludedFuture, (AsyncFunction) input -> updatePolicyExcludedEndpoints(newVppEndpoint, true)); } break; @@ -236,7 +236,7 @@ public class InterfaceManager implements AutoCloseable { @Nonnull final VppEndpoint newVppEndpoint) { if(!oldVppEndpoint.equals(newVppEndpoint)) { LOG.debug("Updating vpp endpoint, old EP: {} new EP: {}", oldVppEndpoint, newVppEndpoint); - return Futures.transform(vppEndpointDeleted(oldVppEndpoint), + return Futures.transformAsync(vppEndpointDeleted(oldVppEndpoint), (AsyncFunction) input -> vppEndpointCreated(newVppEndpoint)); } LOG.debug("Update skipped, provided before/after vpp endpoints are equal"); diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/BridgeDomainManagerImpl.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/BridgeDomainManagerImpl.java index 7c2ed2d79..10c126ae0 100644 --- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/BridgeDomainManagerImpl.java +++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/BridgeDomainManagerImpl.java @@ -206,7 +206,7 @@ public class BridgeDomainManagerImpl implements BridgeDomainManager { CheckedFuture, ReadFailedException> futureTopology = rTx.read(LogicalDatastoreType.CONFIGURATION, bridgeDomainConfigIid); rTx.close(); - return Futures.transform(futureTopology, new AsyncFunction, Void>() { + return Futures.transformAsync(futureTopology, new AsyncFunction, Void>() { @Override public ListenableFuture apply(@Nonnull Optional optBridgeDomainConf) throws Exception { @@ -259,7 +259,7 @@ public class BridgeDomainManagerImpl implements BridgeDomainManager { final CheckedFuture, ReadFailedException> optTopology = rTx.read(LogicalDatastoreType.CONFIGURATION, topologyIid); rTx.close(); - return Futures.transform(optTopology, new AsyncFunction, Void>() { + return Futures.transformAsync(optTopology, new AsyncFunction, Void>() { @Override public ListenableFuture apply(@Nonnull final Optional optTopology) throws InterruptedException, ExecutionException { @@ -294,7 +294,7 @@ public class BridgeDomainManagerImpl implements BridgeDomainManager { topologyFuture.set(null); LOG.info("Bridge domain {} already exists", optTopology.get().getTopologyId()); } - return Futures.transform(topologyFuture, new AsyncFunction() { + return Futures.transformAsync(topologyFuture, new AsyncFunction() { @Override public ListenableFuture apply(@Nonnull Void topologyInput) throws Exception { // Bridge member diff --git a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpMapperReactorImpl.java b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpMapperReactorImpl.java index 17a9b4f4e..aee5271b4 100644 --- a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpMapperReactorImpl.java +++ b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpMapperReactorImpl.java @@ -110,7 +110,7 @@ public class SxpMapperReactorImpl implements SxpMapperReactor { CheckedFuture, ReadFailedException> existingEndpointFuture = findExistingEndPoint(addressEndpoint.getContextId(), addressEndpoint.getAddress()); - return Futures.transform(existingEndpointFuture, new AsyncFunction, RpcResult>() { + return Futures.transformAsync(existingEndpointFuture, new AsyncFunction, RpcResult>() { @Override public ListenableFuture> apply(final Optional input) throws Exception { final ListenableFuture> nextResult; diff --git a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/dao/EPPolicyTemplateDaoFacadeImpl.java b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/dao/EPPolicyTemplateDaoFacadeImpl.java index 72e7e87fc..6fdc0271e 100644 --- a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/dao/EPPolicyTemplateDaoFacadeImpl.java +++ b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/dao/EPPolicyTemplateDaoFacadeImpl.java @@ -69,7 +69,7 @@ public class EPPolicyTemplateDaoFacadeImpl implements EPPolicyTemplateDaoFacade final ListenableFuture> templateFu = epPolicyTemplateDao.read(key); // involve fallback if template is absent - return Futures.transform(templateFu, new AsyncFunction, Optional>() { + return Futures.transformAsync(templateFu, new AsyncFunction, Optional>() { @Override public ListenableFuture> apply( @Nonnull final Optional templateOpt) throws Exception { diff --git a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/EPForwardingTemplateListenerImpl.java b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/EPForwardingTemplateListenerImpl.java index fe4566bd4..4b14fae86 100644 --- a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/EPForwardingTemplateListenerImpl.java +++ b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/EPForwardingTemplateListenerImpl.java @@ -99,11 +99,11 @@ public class EPForwardingTemplateListenerImpl implements EPTemplateListener>> searchResult = - Futures.transform(sxpMasterDbItemRead, createReadAndPairTemplateToBindingFunction(epForwardingTemplate)); + Futures.transformAsync(sxpMasterDbItemRead, createReadAndPairTemplateToBindingFunction(epForwardingTemplate)); // invoke sxpMapperReactor.process for every valid combination of sxpMasterDBBinding, epPolicyTemplate, epForwardingTemplate final ListenableFuture> rpcResult = - Futures.transform(searchResult, createProcessAllFunction(epForwardingTemplate)); + Futures.transformAsync(searchResult, createProcessAllFunction(epForwardingTemplate)); Futures.addCallback(rpcResult, ANY_RPC_FUTURE_CALLBACK); } diff --git a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/EPPolicyTemplateListenerImpl.java b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/EPPolicyTemplateListenerImpl.java index 9b6ea2c47..31ad41b25 100644 --- a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/EPPolicyTemplateListenerImpl.java +++ b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/EPPolicyTemplateListenerImpl.java @@ -106,11 +106,11 @@ public class EPPolicyTemplateListenerImpl implements EPTemplateListener>> epForwardingTemplatesRead = - Futures.transform(sxpMasterDbItemsRead, createReadAndPairTemplateToBindingFunction(epPolicyTemplate)); + Futures.transformAsync(sxpMasterDbItemsRead, createReadAndPairTemplateToBindingFunction(epPolicyTemplate)); // invoke sxpMapperReactor.process for every valid combination of sxpMasterDBBinding, epPolicyTemplate, epForwardingTemplate final ListenableFuture>> rpcResult = - Futures.transform(epForwardingTemplatesRead, createProcessAllFunction(epPolicyTemplate)); + Futures.transformAsync(epForwardingTemplatesRead, createProcessAllFunction(epPolicyTemplate)); Futures.addCallback(rpcResult, RPC_RESULT_FUTURE_CALLBACK); } diff --git a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/MasterDatabaseBindingListenerImpl.java b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/MasterDatabaseBindingListenerImpl.java index 7588460aa..c7410288e 100644 --- a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/MasterDatabaseBindingListenerImpl.java +++ b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/listen/MasterDatabaseBindingListenerImpl.java @@ -120,7 +120,7 @@ public class MasterDatabaseBindingListenerImpl implements MasterDatabaseBindingL final ListenableFuture> compositeRead = EPTemplateUtil.compositeRead(epPolicyTemplateFuture, epForwardingTemplateFuture); - final ListenableFuture> rpcResult = Futures.transform(compositeRead, + final ListenableFuture> rpcResult = Futures.transformAsync(compositeRead, new AsyncFunction, RpcResult>() { @Override public ListenableFuture> apply(final EPTemplateUtil.OptionalMutablePair input) throws Exception { diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java index e4a5148f3..67e2cef3a 100644 --- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java @@ -78,7 +78,7 @@ public class GbpIseSgtHarvesterImpl implements GbpIseSgtHarvester { ListenableFuture processingResult = Futures.immediateCheckedFuture(null); for (SgtInfoProcessor processor : sgtInfoProcessors) { - processingResult = Futures.transform(processingResult, new AsyncFunction() { + processingResult = Futures.transformAsync(processingResult, new AsyncFunction() { @Override public ListenableFuture apply(final Void input) throws Exception { LOG.debug("entering stg-info processor {}", processor.getClass().getSimpleName()); -- 2.36.6