From 332244914a773fa3ae798d7334c46ae28b9ff49c Mon Sep 17 00:00:00 2001 From: Michal Rehak Date: Wed, 17 Aug 2016 17:12:00 +0200 Subject: [PATCH] BUG-6650: ep-ip/sgt, rename groupbasedpolicy-ise-adapter to sxp-ise-adapter Change-Id: I30845d92798bb37f485ea87bfd3cd516d657c295 Signed-off-by: Michal Rehak (cherry picked from commit 152d62feaad519d59d544d7e53282bf6a5a9a4d3) --- artifacts/pom.xml | 4 +-- features/pom.xml | 8 +++-- features/src/main/features/features.xml | 5 +-- .../GpbIseAdapterProviderModule.java | 36 ------------------- sxp-integration/pom.xml | 2 +- .../pom.xml | 31 ++-------------- .../src/main/config/default-config.xml | 7 ++-- .../GbpIseAdapterProviderInstance.java | 4 +-- .../GpbSxpIseAdapterProviderModule.java | 36 +++++++++++++++++++ ...pbSxpIseAdapterProviderModuleFactory.java} | 8 ++--- .../impl/GbpIseAdapterProvider.java | 12 +++---- .../impl/GbpIseConfigListener.java | 8 ++--- .../impl/GbpIseConfigListenerImpl.java | 22 ++++++------ .../impl/GbpIseSgtHarvester.java | 6 ++-- .../impl/GbpIseSgtHarvesterImpl.java | 20 +++++------ .../sxp_ise_adapter}/impl/SgtInfo.java | 2 +- .../impl/SgtInfoProcessor.java | 2 +- .../impl/SgtToEPTemplateGeneratorImpl.java | 14 ++++---- .../impl/SgtToEpgGeneratorImpl.java | 2 +- .../impl/util/RestClientFactory.java | 4 +-- .../blueprint/gbp-ise-adapter.xml | 0 .../main/yang/gbp-sxp-ise-adapter-cfg.yang} | 16 ++++----- .../main/yang/gbp-sxp-ise-adapter-model.yang} | 23 ++++++++---- .../impl/GbpIseAdapterProviderTest.java | 7 ++-- .../impl/GbpIseConfigListenerImplTest.java | 12 +++---- .../impl/GbpIseSgtHarvesterImplTest.java | 16 ++++----- .../SgtToEPTemplateGeneratorImplTest.java | 14 ++++---- .../impl/SgtToEpgGeneratorImplTest.java | 2 +- .../impl/util/RestClientFactoryTest.java | 12 +++---- .../src/test/resources/log4j.xml | 0 .../sxp_ise_adapter}/impl/rawIse-allSgts.xml | 0 .../impl/rawIse-sgtDetail.xml | 0 32 files changed, 163 insertions(+), 172 deletions(-) delete mode 100644 sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java rename sxp-integration/{groupbasedpolicy-ise-adapter => sxp-ise-adapter}/pom.xml (75%) rename sxp-integration/{groupbasedpolicy-ise-adapter => sxp-ise-adapter}/src/main/config/default-config.xml (65%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter}/GbpIseAdapterProviderInstance.java (97%) create mode 100644 sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModule.java rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java => sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModuleFactory.java} (58%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/GbpIseAdapterProvider.java (85%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/GbpIseConfigListener.java (66%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/GbpIseConfigListenerImpl.java (86%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/GbpIseSgtHarvester.java (73%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/GbpIseSgtHarvesterImpl.java (90%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/SgtInfo.java (94%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/SgtInfoProcessor.java (93%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/SgtToEPTemplateGeneratorImpl.java (78%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/SgtToEpgGeneratorImpl.java (98%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/util/RestClientFactory.java (92%) rename sxp-integration/{groupbasedpolicy-ise-adapter => sxp-ise-adapter}/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml (100%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang => sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-cfg.yang} (75%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-model.yang => sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-model.yang} (82%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/GbpIseAdapterProviderTest.java (92%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/GbpIseConfigListenerImplTest.java (90%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/GbpIseSgtHarvesterImplTest.java (88%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/SgtToEPTemplateGeneratorImplTest.java (87%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/SgtToEpgGeneratorImplTest.java (98%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/util/RestClientFactoryTest.java (84%) rename sxp-integration/{groupbasedpolicy-ise-adapter => sxp-ise-adapter}/src/test/resources/log4j.xml (100%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/rawIse-allSgts.xml (100%) rename sxp-integration/{groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter => sxp-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/sxp_ise_adapter}/impl/rawIse-sgtDetail.xml (100%) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 3e66bcd5b..28b50eb0d 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -98,7 +98,7 @@ ${project.groupId} - groupbasedpolicy-ise-adapter + sxp-ise-adapter ${project.version} @@ -215,7 +215,7 @@ ${project.groupId} - groupbasedpolicy-ise-adapter + sxp-ise-adapter ${project.version} xml config diff --git a/features/pom.xml b/features/pom.xml index 9cd810470..626b07200 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -303,13 +303,17 @@ org.opendaylight.groupbasedpolicy sxp-mapper + + org.opendaylight.groupbasedpolicy + sxp-ep-provider + org.opendaylight.groupbasedpolicy ios-xe-renderer org.opendaylight.groupbasedpolicy - groupbasedpolicy-ise-adapter + sxp-ise-adapter @@ -399,7 +403,7 @@ org.opendaylight.groupbasedpolicy - groupbasedpolicy-ise-adapter + sxp-ise-adapter xml config diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml index 0d87284cd..7da79a30a 100755 --- a/features/src/main/features/features.xml +++ b/features/src/main/features/features.xml @@ -229,7 +229,8 @@ mvn:commons-net/commons-net/{{VERSION}} mvn:com.sun.jersey/jersey-client/{{VERSION}} mvn:com.sun.jersey/jersey-core/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ise-adapter/{{VERSION}} - mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ise-adapter/{{VERSION}}/xml/config + mvn:org.opendaylight.groupbasedpolicy/sxp-ise-adapter/{{VERSION}} + mvn:org.opendaylight.groupbasedpolicy/sxp-ep-provider/{{VERSION}} + mvn:org.opendaylight.groupbasedpolicy/sxp-ise-adapter/{{VERSION}}/xml/config diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java deleted file mode 100644 index 9aa51ebfe..000000000 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.sal.common.util.NoopAutoCloseable; - -/** -* gbp-ise-adapter impl module -*/ -@Deprecated -public class GpbIseAdapterProviderModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter.AbstractGpbIseAdapterProviderModule { - public GpbIseAdapterProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public GpbIseAdapterProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter.GpbIseAdapterProviderModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/sxp-integration/pom.xml b/sxp-integration/pom.xml index bbe34860f..78e963f51 100644 --- a/sxp-integration/pom.xml +++ b/sxp-integration/pom.xml @@ -25,7 +25,7 @@ sxp-ep-provider - groupbasedpolicy-ise-adapter + sxp-ise-adapter diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/pom.xml b/sxp-integration/sxp-ise-adapter/pom.xml similarity index 75% rename from sxp-integration/groupbasedpolicy-ise-adapter/pom.xml rename to sxp-integration/sxp-ise-adapter/pom.xml index dd477736a..50e00c342 100755 --- a/sxp-integration/groupbasedpolicy-ise-adapter/pom.xml +++ b/sxp-integration/sxp-ise-adapter/pom.xml @@ -13,40 +13,15 @@ .. - groupbasedpolicy-ise-adapter + sxp-ise-adapter bundle - sxp-integration_groupbasedpolicy-ise-adapter - - - 1.4.0-SNAPSHOT - - - - - - org.opendaylight.groupbasedpolicy - groupbasedpolicy-artifacts - ${project.version} - import - pom - - - org.opendaylight.sxp - sxp-api - ${sxp.version} - - - + sxp-integration_sxp-ise-adapter org.opendaylight.groupbasedpolicy - sxp-mapper - - - org.opendaylight.sxp - sxp-api + sxp-ep-provider diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/config/default-config.xml b/sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml similarity index 65% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/config/default-config.xml rename to sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml index cb913b3b5..8f49cd2a2 100755 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/config/default-config.xml +++ b/sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml @@ -14,8 +14,8 @@ - - gbp-ise-adapter:gbp-ise-adapter-impl + + gbp-sxp-ise-adapter:gbp-ise-adapter-impl gbp-ise-adapter @@ -24,8 +24,7 @@ - urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:gbp-ise-adapter?module=gbp-ise-adapter-cfg&revision=2016-06-30 - urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:gbp-ise-adapter:model?module=gbp-ise-adapter-model&revision=2016-06-30 + urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:gbp-sxp-ise-adapter:model?module=gbp-sxp-ise-adapter-model&revision=2016-06-30 diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GbpIseAdapterProviderInstance.java similarity index 97% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GbpIseAdapterProviderInstance.java index 5d49a09fc..44ca42c45 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GbpIseAdapterProviderInstance.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter; +package org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.gbp_sxp_ise_adapter; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; @@ -14,7 +14,7 @@ import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.controller.config.yang.config.groupbasedpolicy.GroupbasedpolicyInstance; 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; +import org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl.GbpIseAdapterProvider; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModule.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModule.java new file mode 100644 index 000000000..a0da8924c --- /dev/null +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModule.java @@ -0,0 +1,36 @@ +/* + * 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.sxp_integration.gbp_sxp_ise_adapter; + +import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; + +/** + * gbp-sxp-ise-adapter impl module + */ +@Deprecated +public class GpbSxpIseAdapterProviderModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.gbp_sxp_ise_adapter.AbstractGpbSxpIseAdapterProviderModule { + public GpbSxpIseAdapterProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { + super(identifier, dependencyResolver); + } + + public GpbSxpIseAdapterProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.gbp_sxp_ise_adapter.GpbSxpIseAdapterProviderModule oldModule, java.lang.AutoCloseable oldInstance) { + super(identifier, dependencyResolver, oldModule, oldInstance); + } + + @Override + public void customValidation() { + // add custom validation form module attributes here. + } + + @Override + public java.lang.AutoCloseable createInstance() { + return NoopAutoCloseable.INSTANCE; + } + +} diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModuleFactory.java similarity index 58% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModuleFactory.java index 5f102ad22..0e6af3b13 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModuleFactory.java @@ -9,14 +9,14 @@ /* * Generated file * -* Generated from: yang module name: gbp-ise-adapter-cfg yang module local name: gbp-ise-adapter-impl +* Generated from: yang module name: gbp-sxp-ise-adapter-cfg yang module local name: gbp-sxp-ise-adapter-impl * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Jun 30 17:44:55 CEST 2016 +* Generated at: Thu Aug 18 13:41:21 CEST 2016 * * Do not modify this file unless it is present under src/main directory */ -package org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter; +package org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.gbp_sxp_ise_adapter; @Deprecated -public class GpbIseAdapterProviderModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter.AbstractGpbIseAdapterProviderModuleFactory { +public class GpbSxpIseAdapterProviderModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.gbp_sxp_ise_adapter.AbstractGpbSxpIseAdapterProviderModuleFactory { } diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProvider.java similarity index 85% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProvider.java index 6314f801c..a7b9f06a8 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProvider.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -14,8 +14,8 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.GbpIseAdapter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.GbpSxpIseAdapter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; @@ -31,7 +31,7 @@ public class GbpIseAdapterProvider implements AutoCloseable, BindingAwareProvide private static final Logger LOG = LoggerFactory.getLogger(GbpIseAdapterProvider.class); private final DataBroker dataBroker; - private ListenerRegistration> registration; + private ListenerRegistration> registration; public GbpIseAdapterProvider(final DataBroker dataBroker, final BindingAwareBroker brokerDependency) { this.dataBroker = Preconditions.checkNotNull(dataBroker, "provided dataBroker must not be null"); @@ -58,9 +58,9 @@ public class GbpIseAdapterProvider implements AutoCloseable, BindingAwareProvide final GbpIseConfigListenerImpl gbpIseConfigListener = new GbpIseConfigListenerImpl(dataBroker, gbpIseSgtHarvester); // build data-tree path - final DataTreeIdentifier dataTreePath = new DataTreeIdentifier<>( + final DataTreeIdentifier dataTreePath = new DataTreeIdentifier<>( LogicalDatastoreType.CONFIGURATION, - InstanceIdentifier.create(GbpIseAdapter.class).child(IseHarvestConfig.class)); + InstanceIdentifier.create(GbpSxpIseAdapter.class).child(IseSourceConfig.class)); // register config listener registration = dataBroker.registerDataTreeChangeListener(dataTreePath, diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListener.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListener.java similarity index 66% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListener.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListener.java index 071df64da..983297b8c 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListener.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListener.java @@ -6,14 +6,14 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig; /** - * Purpose: dtcl for {@link IseHarvestConfig} + * Purpose: dtcl for {@link IseSourceConfig} */ -public interface GbpIseConfigListener extends ClusteredDataTreeChangeListener, AutoCloseable { +public interface GbpIseConfigListener extends ClusteredDataTreeChangeListener, AutoCloseable { // nobody } diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImpl.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImpl.java similarity index 86% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImpl.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImpl.java index ef02bbaea..69c1f8d37 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImpl.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImpl.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; @@ -29,10 +29,10 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.GbpIseAdapter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestConfig; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestStatus; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestStatusBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.GbpSxpIseAdapter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseHarvestStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseHarvestStatusBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,12 +66,12 @@ public class GbpIseConfigListenerImpl implements GbpIseConfigListener { } @Override - public void onDataTreeChanged(@Nonnull final Collection> collection) { - for (DataTreeModification modification : collection) { - final IseHarvestConfig iseHarvestConfig = modification.getRootNode().getDataAfter(); - if (iseHarvestConfig != null) { + public void onDataTreeChanged(@Nonnull final Collection> collection) { + for (DataTreeModification modification : collection) { + final IseSourceConfig iseSourceConfig = modification.getRootNode().getDataAfter(); + if (iseSourceConfig != null) { pool.submit(() -> { - final ListenableFuture harvestResult = gbpIseSgtHarvester.harvest(iseHarvestConfig); + final ListenableFuture harvestResult = gbpIseSgtHarvester.harvest(iseSourceConfig); Futures.addCallback(harvestResult, new FutureCallback() { @Override public void onSuccess(@Nullable final Integer result) { @@ -98,7 +98,7 @@ public class GbpIseConfigListenerImpl implements GbpIseConfigListener { private CheckedFuture storeOutcome(final boolean succeeded, final int counter, final String reason) { final WriteTransaction wTx = dataBroker.newWriteOnlyTransaction(); - final InstanceIdentifier harvestStatusPath = InstanceIdentifier.create(GbpIseAdapter.class) + final InstanceIdentifier harvestStatusPath = InstanceIdentifier.create(GbpSxpIseAdapter.class) .child(IseHarvestStatus.class); final IseHarvestStatus harvestStatus = new IseHarvestStatusBuilder() .setReason(reason) diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvester.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvester.java similarity index 73% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvester.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvester.java index d551e7ae2..029e6acad 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvester.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvester.java @@ -6,11 +6,11 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import com.google.common.util.concurrent.ListenableFuture; import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig; /** * Purpose: read sgts and naming from ISE via rest-API and have apropriate templates generated and stored @@ -21,5 +21,5 @@ public interface GbpIseSgtHarvester { * @param configuration user given * @return amount of successfully written items */ - ListenableFuture harvest(@Nonnull IseHarvestConfig configuration); + ListenableFuture harvest(@Nonnull IseSourceConfig configuration); } diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java similarity index 90% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java index bff6d7ed2..1eb2f3791 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import com.google.common.base.Function; import com.google.common.util.concurrent.AsyncFunction; @@ -28,10 +28,10 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl.util.RestClientFactory; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestConfig; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.ise.harvest.config.ConnectionConfig; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.ise.harvest.config.connection.config.Header; +import org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl.util.RestClientFactory; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.ise.source.config.ConnectionConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.ise.source.config.connection.config.Header; import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.Sgt; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +48,7 @@ public class GbpIseSgtHarvesterImpl implements GbpIseSgtHarvester { public static final String PATH_ERS_CONFIG_SGT = "/ers/config/sgt"; public static final String EXPRESSION_SGT_ALL_LINK_HREFS = "/ns3:searchResult/ns3:resources/ns5:resource/link/@href"; - public static final String EXPRESSION_SGT_DETAIL = "./ns4:sgt"; + public static final String EXPRESSION_SGT_DETAIL = "./ns4:sgt"; public static final String EXPRESSION_SGT_NAME_ATTR = "./@name"; public static final String EXPRESSION_SGT_VALUE = "./value/text()"; @@ -62,7 +62,7 @@ public class GbpIseSgtHarvesterImpl implements GbpIseSgtHarvester { } @Override - public ListenableFuture harvest(@Nonnull final IseHarvestConfig configuration) { + public ListenableFuture harvest(@Nonnull final IseSourceConfig configuration) { final ConnectionConfig connectionConfig = configuration.getConnectionConfig(); ListenableFuture result; try { @@ -135,10 +135,10 @@ public class GbpIseSgtHarvesterImpl implements GbpIseSgtHarvester { final String rawSgtDetail = deliverResponse(requestBuilder); LOG.trace("rawSgtDetail: {}", rawSgtDetail); - final Node sgtNode = (Node) xpath.evaluate(EXPRESSION_SGT_DETAIL, new InputSource(new StringReader(rawSgtDetail)), + final Node sgtNode = (Node) xpath.evaluate(EXPRESSION_SGT_DETAIL, new InputSource(new StringReader(rawSgtDetail)), XPathConstants.NODE); - final Node sgtName = (Node) xpath.evaluate(EXPRESSION_SGT_NAME_ATTR, sgtNode, XPathConstants.NODE); - final Node sgtValue = (Node) xpath.evaluate(EXPRESSION_SGT_VALUE, sgtNode, XPathConstants.NODE); + final Node sgtName = (Node) xpath.evaluate(EXPRESSION_SGT_NAME_ATTR, sgtNode, XPathConstants.NODE); + final Node sgtValue = (Node) xpath.evaluate(EXPRESSION_SGT_VALUE, sgtNode, XPathConstants.NODE); LOG.debug("sgt value [{}]: {} -> {}", i, sgtValue, sgtName); // store replies into list of SgtInfo diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfo.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtInfo.java similarity index 94% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfo.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtInfo.java index 015e282e9..5315a9449 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfo.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtInfo.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfoProcessor.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtInfoProcessor.java similarity index 93% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfoProcessor.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtInfoProcessor.java index e28151525..078d46254 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfoProcessor.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtInfoProcessor.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import com.google.common.util.concurrent.CheckedFuture; import java.util.List; diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImpl.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEPTemplateGeneratorImpl.java similarity index 78% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImpl.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEPTemplateGeneratorImpl.java index c5521e387..eb9864dab 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImpl.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEPTemplateGeneratorImpl.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import com.google.common.util.concurrent.CheckedFuture; import java.util.Collections; @@ -17,17 +17,17 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.EndpointGroupId; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.TenantId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.SxpMapper; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.sxp.mapper.EndpointPolicyTemplateBySgt; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.sxp.mapper.EndpointPolicyTemplateBySgtBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.sxp.mapper.EndpointPolicyTemplateBySgtKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.ep.provider.model.rev160302.SxpEpMapper; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgt; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgtBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgtKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.Sgt; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Purpose: process given sgt+name - create {@link EndpointPolicyTemplateBySgt} and write it to sxp-mapper templates + * Purpose: process given sgt+name - create {@link org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgt} and write it to sxp-mapper templates */ public class SgtToEPTemplateGeneratorImpl implements SgtInfoProcessor { @@ -53,7 +53,7 @@ public class SgtToEPTemplateGeneratorImpl implements SgtInfoProcessor { final EndpointGroupId epgId = new EndpointGroupId(sgtInfo.getName()); final InstanceIdentifier epPolicyTemplatePath = InstanceIdentifier - .create(SxpMapper.class) + .create(SxpEpMapper.class) .child(EndpointPolicyTemplateBySgt.class, new EndpointPolicyTemplateBySgtKey(sgt)); final EndpointPolicyTemplateBySgt epPolicyTemplate = new EndpointPolicyTemplateBySgtBuilder() diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImpl.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEpgGeneratorImpl.java similarity index 98% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImpl.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEpgGeneratorImpl.java index 36281370f..df1866c54 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImpl.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEpgGeneratorImpl.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import com.google.common.util.concurrent.CheckedFuture; import java.util.List; diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactory.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/util/RestClientFactory.java similarity index 92% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactory.java rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/util/RestClientFactory.java index 26cc3040e..5cd992417 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactory.java +++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/util/RestClientFactory.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl.util; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl.util; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.config.ClientConfig; @@ -18,7 +18,7 @@ import java.security.NoSuchAlgorithmException; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import org.apache.commons.net.util.TrustManagerUtils; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.ise.harvest.config.ConnectionConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.ise.source.config.ConnectionConfig; /** * Purpose: setup ise-ready jersey {@link Client} diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml b/sxp-integration/sxp-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml similarity index 100% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml rename to sxp-integration/sxp-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang b/sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-cfg.yang similarity index 75% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang rename to sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-cfg.yang index 81451105e..188e7eb64 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang +++ b/sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-cfg.yang @@ -6,10 +6,10 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -module gbp-ise-adapter-cfg { +module gbp-sxp-ise-adapter-cfg { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:gbp-ise-adapter"; - prefix "gpb-ise-adapter-cfg"; + namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:gbp-sxp-ise-adapter"; + prefix "gpb-sxp-ise-adapter-cfg"; import config { prefix config; revision-date 2013-04-05; } import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } @@ -23,18 +23,18 @@ module gbp-ise-adapter-cfg { "Initial revision."; } - identity gbp-ise-adapter-impl { + identity gbp-sxp-ise-adapter-impl { description - "gbp-ise-adapter impl module"; + "gbp-sxp-ise-adapter impl module"; base "config:module-type"; - config:java-name-prefix GpbIseAdapterProvider; + config:java-name-prefix GpbSxp-IseAdapterProvider; } // Augments the 'configuration' choice node under modules/module. augment "/config:modules/config:module/config:configuration" { - case gbp-ise-adapter-impl { - when "/config:modules/config:module/config:type = 'gbp-ise-adapter-impl'"; + case gbp-sxp-ise-adapter-impl { + when "/config:modules/config:module/config:type = 'gbp-sxp-ise-adapter-impl'"; } } } diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-model.yang b/sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-model.yang similarity index 82% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-model.yang rename to sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-model.yang index 105731f7c..a1838d82f 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-model.yang +++ b/sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-model.yang @@ -6,28 +6,29 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -module gbp-ise-adapter-model { +module gbp-sxp-ise-adapter-model { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:gbp-ise-adapter:model"; - prefix "gbp-ise-adapter-model"; + namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:gbp-sxp-ise-adapter:model"; + prefix "gbp-sxp-ise-adapter-model"; import gbp-common { prefix gbp-common; revision-date 2014-04-21; } + import sxp-database { prefix sxp-database; revision-date 2016-03-08; } import ietf-inet-types { prefix inet; revision-date 2013-07-15; } import ietf-yang-types {prefix yang; revision-date "2013-07-15";} description "This module contains the YANG definitions for - gbp-ise-adapter implementation."; + gbp-sxp-ise-adapter implementation."; revision "2016-06-30" { description "Initial revision."; } - container gbp-ise-adapter { + container gbp-sxp-ise-adapter { description "root point for ise connection info and sgt harvest status"; - container ise-harvest-config { + container ise-source-config { description "connection + credentials for ise-rest-api connection and target tennant"; config true; @@ -38,6 +39,16 @@ module gbp-ise-adapter-model { "tenant for all extracted sgt"; } + leaf sgt-range-min { + description "minimal sgt used by this tenant"; + type sxp-database:sgt; + } + + leaf sgt-range-max { + description "maximal sgt used by this tenant"; + type sxp-database:sgt; + } + container connection-config { description "rest connection configuration part"; diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProviderTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProviderTest.java similarity index 92% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProviderTest.java rename to sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProviderTest.java index 0b24fe5f8..a7febc9b6 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProviderTest.java +++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProviderTest.java @@ -5,7 +5,8 @@ * 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.groupbasedpolicy.gbp_ise_adapter.impl; + +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import static org.powermock.api.mockito.PowerMockito.verifyNew; import static org.powermock.api.mockito.PowerMockito.whenNew; @@ -19,7 +20,7 @@ import org.mockito.Mockito; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -59,7 +60,7 @@ public class GbpIseAdapterProviderTest { @Test public void testOnSessionInitiated() throws Exception { Mockito.when(dataBroker.registerDataTreeChangeListener( - Matchers.>any(), + Matchers.>any(), Matchers.any())).thenReturn(registration); // prepare expectation for objects in onSessionInitiated (powerMock requirement for later checking) diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImplTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImplTest.java similarity index 90% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImplTest.java rename to sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImplTest.java index 105c3cb62..9e0072be4 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImplTest.java +++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImplTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import com.google.common.util.concurrent.Futures; import java.util.Collections; @@ -23,8 +23,8 @@ import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestConfig; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseHarvestStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** @@ -38,13 +38,13 @@ public class GbpIseConfigListenerImplTest { @Mock private GbpIseSgtHarvester harvester; @Mock - private DataTreeModification treeModification; + private DataTreeModification treeModification; @Mock - private DataObjectModification dataModification; + private DataObjectModification dataModification; @Mock private WriteTransaction wTx; @Mock - private IseHarvestConfig config; + private IseSourceConfig config; private GbpIseConfigListenerImpl listener; diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java similarity index 88% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java rename to sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java index 694a0af7f..94f960c99 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java +++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import static org.powermock.api.support.membermodification.MemberMatcher.method; import static org.powermock.api.support.membermodification.MemberModifier.stub; @@ -31,13 +31,13 @@ import org.mockito.InOrder; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; -import org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl.util.RestClientFactory; +import org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl.util.RestClientFactory; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.TenantId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestConfig; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.IseHarvestConfigBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.ise.harvest.config.ConnectionConfigBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.ise.harvest.config.connection.config.HeaderBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfigBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.ise.source.config.ConnectionConfigBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.ise.source.config.connection.config.HeaderBuilder; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.slf4j.Logger; @@ -68,7 +68,7 @@ public class GbpIseSgtHarvesterImplTest { @Mock private ClientResponse response; - private IseHarvestConfig config; + private IseSourceConfig config; private GbpIseSgtHarvesterImpl harvester; @@ -93,7 +93,7 @@ public class GbpIseSgtHarvesterImplTest { @Before public void setUp() throws Exception { - config = new IseHarvestConfigBuilder() + config = new IseSourceConfigBuilder() .setTenant(TENANT_ID) .setConnectionConfig(new ConnectionConfigBuilder() .setConnectionTimeout(10) diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImplTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEPTemplateGeneratorImplTest.java similarity index 87% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImplTest.java rename to sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEPTemplateGeneratorImplTest.java index 6f6f0bbea..fbde6d4c7 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImplTest.java +++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEPTemplateGeneratorImplTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import com.google.common.collect.Lists; import com.google.common.util.concurrent.CheckedFuture; @@ -26,10 +26,10 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.EndpointGroupId; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.TenantId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.SxpMapper; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.sxp.mapper.EndpointPolicyTemplateBySgt; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.sxp.mapper.EndpointPolicyTemplateBySgtBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.sxp.mapper.EndpointPolicyTemplateBySgtKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.ep.provider.model.rev160302.SxpEpMapper; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgt; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgtBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgtKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.Sgt; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; @@ -71,7 +71,7 @@ public class SgtToEPTemplateGeneratorImplTest { outcome.get(10, TimeUnit.SECONDS); final KeyedInstanceIdentifier epTemplatePath1 = - InstanceIdentifier.create(SxpMapper.class) + InstanceIdentifier.create(SxpEpMapper.class) .child(EndpointPolicyTemplateBySgt.class, new EndpointPolicyTemplateBySgtKey(SGT_1)); final EndpointPolicyTemplateBySgt epTemplate1 = new EndpointPolicyTemplateBySgtBuilder() .setSgt(SGT_1) @@ -80,7 +80,7 @@ public class SgtToEPTemplateGeneratorImplTest { .build(); final KeyedInstanceIdentifier epTemplatePath2 = - InstanceIdentifier.create(SxpMapper.class) + InstanceIdentifier.create(SxpEpMapper.class) .child(EndpointPolicyTemplateBySgt.class, new EndpointPolicyTemplateBySgtKey(SGT_2)); final EndpointPolicyTemplateBySgt epTemplate2 = new EndpointPolicyTemplateBySgtBuilder() .setSgt(SGT_2) diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImplTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEpgGeneratorImplTest.java similarity index 98% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImplTest.java rename to sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEpgGeneratorImplTest.java index 415e35ffb..b2463cdcf 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImplTest.java +++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/SgtToEpgGeneratorImplTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl; +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl; import com.google.common.collect.Lists; import com.google.common.util.concurrent.CheckedFuture; diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactoryTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/util/RestClientFactoryTest.java similarity index 84% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactoryTest.java rename to sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/util/RestClientFactoryTest.java index 0e78dc597..0e1f9dbb7 100644 --- a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactoryTest.java +++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/util/RestClientFactoryTest.java @@ -5,20 +5,20 @@ * 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.groupbasedpolicy.gbp_ise_adapter.impl.util; + +package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl.util; import com.sun.jersey.api.client.Client; import com.sun.jersey.client.urlconnection.HTTPSProperties; +import java.util.Map; +import javax.net.ssl.SSLSession; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.ise.harvest.config.ConnectionConfig; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.ise.adapter.model.rev160630.gbp.ise.adapter.ise.harvest.config.ConnectionConfigBuilder; - -import javax.net.ssl.SSLSession; -import java.util.Map; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.ise.source.config.ConnectionConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.gbp.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.ise.source.config.ConnectionConfigBuilder; /** * Purpose: cover {@link RestClientFactory} diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/log4j.xml b/sxp-integration/sxp-ise-adapter/src/test/resources/log4j.xml similarity index 100% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/log4j.xml rename to sxp-integration/sxp-ise-adapter/src/test/resources/log4j.xml diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-allSgts.xml b/sxp-integration/sxp-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/rawIse-allSgts.xml similarity index 100% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-allSgts.xml rename to sxp-integration/sxp-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/rawIse-allSgts.xml diff --git a/sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-sgtDetail.xml b/sxp-integration/sxp-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/rawIse-sgtDetail.xml similarity index 100% rename from sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-sgtDetail.xml rename to sxp-integration/sxp-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/rawIse-sgtDetail.xml -- 2.36.6