BUG-6650: ep-ip/sgt, update/rename models and yangs for sxp-ise-adapter

Change-Id: I5aada429bf02b56d729b2745c4370f59047c59e5
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 80f2e6bfe00662860cb471cd916c65335f7bfcc6..eb688922331beb058e6162459dfe8408626bf02a 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -203,7 +203,6 @@
         <feature version="${netconf.version}">odl-netconf-topology</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ios-xe-renderer/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/15-l2-l3-domain-extension.xml">mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}/xml/config</configfile>
         <configfile finalname="${config.configfile.directory}/15-groupbasedpolicy-ios-xe-renderer.xml">mvn:org.opendaylight.groupbasedpolicy/ios-xe-renderer/{{VERSION}}/xml/config</configfile>
     </feature>
 
@@ -215,7 +214,6 @@
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/sxp-ep-provider/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/15-l2-l3-domain-extension.xml">mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}/xml/config</configfile>
         <configfile finalname="${config.configfile.directory}/15-groupbasedpolicy-sxp-ep-provider.xml">mvn:org.opendaylight.groupbasedpolicy/sxp-ep-provider/{{VERSION}}/xml/config</configfile>
     </feature>
     <feature name='odl-groupbasedpolicy-sxp-mapper' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: sxp-mapper'>

diff --git a/sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml b/sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml
index 8f49cd2a26b84f2f9ad6187771c7cf9a54474d91..cb0fe16323f2c00e349828153bf1ef621b60c552 100755 (executable)
--- a/sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml
+++ b/sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml
@@ -14,8 +14,8 @@
         <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
             <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
                 <module>
-                    <type xmlns:gbp-sxp-ise-adapter="urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:gbp-sxp-ise-adapter">
-                        gbp-sxp-ise-adapter:gbp-ise-adapter-impl
+                    <type xmlns:sxp-ise-adapter="urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ise-adapter">
+                        sxp-ise-adapter:sxp-ise-adapter-impl
                     </type>
                     <name>gbp-ise-adapter</name>
                 </module>
@@ -24,7 +24,8 @@
     </configuration>
 
     <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:gbp-sxp-ise-adapter:model?module=gbp-sxp-ise-adapter-model&amp;revision=2016-06-30</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ise-adapter?module=sxp-ise-adapter-cfg&amp;revision=2016-06-30</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ise-adapter:model?module=sxp-ise-adapter-model&amp;revision=2016-06-30</capability>
     </required-capabilities>
 
 </snapshot>

diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GbpIseAdapterProviderInstance.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderInstance.java
similarity index 94%
rename from sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GbpIseAdapterProviderInstance.java
rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderInstance.java
index a9858764d57ea90f8bd9092dc39fbdcc08551f5f..520320f3541deedf9518bae610a925f324620700 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GbpIseAdapterProviderInstance.java
+++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderInstance.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.sxp_integration.gbp_sxp_ise_adapter;
+package org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Futures;
@@ -23,12 +23,13 @@ import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class GbpIseAdapterProviderInstance implements ClusterSingletonService, AutoCloseable {
+public class SxpIseAdapterProviderInstance implements ClusterSingletonService, AutoCloseable {
 
-    private static final Logger LOG = LoggerFactory.getLogger(GbpIseAdapterProviderInstance.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SxpIseAdapterProviderInstance.class);
 
     private static final ServiceGroupIdentifier IDENTIFIER =
             ServiceGroupIdentifier.create(GroupbasedpolicyInstance.GBP_SERVICE_GROUP_IDENTIFIER);
+
     private final DataBroker dataBroker;
     private final BindingAwareBroker bindingAwareBroker;
     private final ClusterSingletonServiceProvider clusterSingletonService;
@@ -36,7 +37,7 @@ public class GbpIseAdapterProviderInstance implements ClusterSingletonService, A
     private ClusterSingletonServiceRegistration singletonServiceRegistration;
     private GbpIseAdapterProvider iseAdapterProvider;
 
-    public GbpIseAdapterProviderInstance(final DataBroker dataBroker,
+    public SxpIseAdapterProviderInstance(final DataBroker dataBroker,
                                          final BindingAwareBroker bindingAwareBroker,
                                          final ClusterSingletonServiceProvider clusterSingletonService,
                                          final SxpEpProviderProvider sxpEpProvider) {

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/sxp_ise_adapter/SxpIseAdapterProviderModule.java
similarity index 52%
rename from sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModule.java
rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModule.java
index a0da8924c34dcbc6ccbf89c81ee9fb529c2ea4fa..6e6308470eb584dda26006982e7db202977838a8 100644 (file)
--- 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/sxp_ise_adapter/SxpIseAdapterProviderModule.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.sxp_integration.gbp_sxp_ise_adapter;
+package org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter;
 
 import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
 
@@ -14,12 +14,12 @@ 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) {
+public class SxpIseAdapterProviderModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter.AbstractSxpIseAdapterProviderModule {
+    public SxpIseAdapterProviderModule(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) {
+    public SxpIseAdapterProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter.SxpIseAdapterProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 

diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModuleFactory.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModuleFactory.java
similarity index 58%
rename from sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModuleFactory.java
rename to sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModuleFactory.java
index 0e6af3b13e2d8cc73799c163a4bb4df7b6bc3266..b8a6c8ff0ca80a307783d04bd8d3731848c77a13 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/gbp_sxp_ise_adapter/GpbSxpIseAdapterProviderModuleFactory.java
+++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModuleFactory.java
@@ -9,14 +9,15 @@
 /*
 * Generated file
 *
-* Generated from: yang module name: gbp-sxp-ise-adapter-cfg yang module local name: gbp-sxp-ise-adapter-impl
+* Generated from: yang module name: sxp-ise-adapter-cfg yang module local name: sxp-ise-adapter-impl
 * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu Aug 18 13:41:21 CEST 2016
+* Generated at: Thu Aug 25 11:10:48 CEST 2016
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.gbp_sxp_ise_adapter;
+package org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter;
+
 @Deprecated
-public class GpbSxpIseAdapterProviderModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.gbp_sxp_ise_adapter.AbstractGpbSxpIseAdapterProviderModuleFactory {
+public class SxpIseAdapterProviderModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter.AbstractSxpIseAdapterProviderModuleFactory {
 
 }

diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderFacade.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderFacade.java
index bde86400e14f07d0f4132f007048ef0aff100622..df408f37d715a1a74516747764aa876f2f54a8e1 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderFacade.java
+++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderFacade.java
@@ -9,7 +9,7 @@
 package org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl;
 
 import org.opendaylight.groupbasedpolicy.sxp.ep.provider.api.EPPolicyTemplateProvider;
-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.sxp.integration.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig;
 
 /**
  * Purpose: wrap {@link EPPolicyTemplateProvider} and {@link IseSourceConfig} injection

diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderIseImpl.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderIseImpl.java
index de64878684191608ad842fe48c3a849cdd38de6c..1f8c5be4167a6007f6c24f388019f364bf981f4f 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderIseImpl.java
+++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderIseImpl.java
@@ -21,8 +21,8 @@ import org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl.util.IseReplyUtil;
 import org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl.util.RestClientFactory;
 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.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.sxp.integration.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.sxp.integration.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.sxp.integration.sxp.ep.provider.model.rev160302.TemplateGenerated;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.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.integration.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgtBuilder;

diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProvider.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProvider.java
index 4dfa7a5be83140e9fcb61fb579a20d8646957e3c..93f6ddb8dc82db691546b4d8b573d086139c55d9 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProvider.java
+++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProvider.java
@@ -16,8 +16,8 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.groupbasedpolicy.sxp.ep.provider.api.EPPolicyTemplateProvider;
 import org.opendaylight.groupbasedpolicy.sxp.ep.provider.spi.SxpEpProviderProvider;
-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.sxp.integration.sxp.ise.adapter.model.rev160630.GbpSxpIseAdapter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;

diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListener.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListener.java
index 983297b8c416bda8d766985c7d80cf1dcce09c68..d8bf64ee0435969bdd8194df9a3cadc6c7b46a69 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListener.java
+++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListener.java
@@ -9,7 +9,7 @@
 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.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.sxp.integration.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig;
 
 /**
  * Purpose: dtcl for {@link IseSourceConfig}

diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImpl.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImpl.java
index d75bd9599f98d96e6aa2a1b9abfbccf7770e03c8..bcb2c7c9a0fb955fe6cddca9fe8775d98d5ec2b3 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImpl.java
+++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImpl.java
@@ -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.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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ise.adapter.model.rev160630.GbpSxpIseAdapter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.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.sxp.integration.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.sxp.integration.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;

diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvester.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvester.java
index 029e6acad02e125bb5eb358494a83e7254796873..a1db1b89ded5a87d92dd9309d07c623612405e21 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvester.java
+++ b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvester.java
@@ -10,7 +10,7 @@ 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.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.sxp.integration.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

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 bcdec2d09b11d77be7ed09ac4d0bd9d5a55a7898..41cba2975a48503b5eaa56b1de5b7778b01501ff 100644 (file)
--- 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
@@ -24,9 +24,9 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl.util.IseReplyUtil;
 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.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.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.sxp.integration.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.sxp.integration.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;

diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_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
index d9107eab19842557e9cbba3e9850b06b3dbdf26d..0fb898c38ad92579c0a7a3b75a5d96b843e2321f 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/sxp_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
@@ -20,8 +20,8 @@ import java.util.List;
 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.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.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.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.sxp.integration.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.ise.source.config.connection.config.Header;
 
 /**
  * Purpose: setup ise-ready jersey {@link Client}

diff --git a/sxp-integration/sxp-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
index b094619db9418bf2e2f26a127ce58ab385b480d5..0d73503db51b3680806a132f528a8237f6840f17 100644 (file)
--- a/sxp-integration/sxp-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
@@ -15,7 +15,7 @@
     <reference id="broker" interface="org.opendaylight.controller.sal.binding.api.BindingAwareBroker"/>
     <reference id="clusterSingletonService" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
     <reference id="sxpEpProvider" interface="org.opendaylight.groupbasedpolicy.sxp.ep.provider.spi.SxpEpProviderProvider"/>
-    <bean id="gbpIseAdapter" class="org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter.GbpIseAdapterProviderInstance"
+    <bean id="gbpIseAdapter" class="org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter.SxpIseAdapterProviderInstance"
         init-method="initialize" destroy-method="close">
         <argument ref="dataBroker"/>
         <argument ref="broker"/>

diff --git a/sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-cfg.yang b/sxp-integration/sxp-ise-adapter/src/main/yang/sxp-ise-adapter-cfg.yang
similarity index 80%
rename from sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-cfg.yang
rename to sxp-integration/sxp-ise-adapter/src/main/yang/sxp-ise-adapter-cfg.yang
index de8d67d3962aa5d179ad3a76da8a3259ece81ce0..1dd319d8df5ba025cabbb387f1c695ed0876981e 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-cfg.yang
+++ b/sxp-integration/sxp-ise-adapter/src/main/yang/sxp-ise-adapter-cfg.yang
@@ -6,9 +6,9 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-module gbp-sxp-ise-adapter-cfg {
+module sxp-ise-adapter-cfg {
     yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:gbp-sxp-ise-adapter";
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ise-adapter";
     prefix "gpb-sxp-ise-adapter-cfg";
 
     import config { prefix config; revision-date 2013-04-05; }
@@ -24,18 +24,18 @@ module gbp-sxp-ise-adapter-cfg {
             "Initial revision.";
     }
 
-    identity gbp-sxp-ise-adapter-impl {
+    identity sxp-ise-adapter-impl {
         description
             "gbp-sxp-ise-adapter impl module";
 
         base "config:module-type";
-        config:java-name-prefix GpbSxp-IseAdapterProvider;
+        config:java-name-prefix Sxp-IseAdapterProvider;
     }
 
     // Augments the 'configuration' choice node under modules/module.
     augment "/config:modules/config:module/config:configuration" {
         case gbp-sxp-ise-adapter-impl {
-            when "/config:modules/config:module/config:type = 'gbp-sxp-ise-adapter-impl'";
+            when "/config:modules/config:module/config:type = 'sxp-ise-adapter-impl'";
         }
     }
 }

diff --git a/sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-model.yang b/sxp-integration/sxp-ise-adapter/src/main/yang/sxp-ise-adapter-model.yang
similarity index 97%
rename from sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-model.yang
rename to sxp-integration/sxp-ise-adapter/src/main/yang/sxp-ise-adapter-model.yang
index a1838d82f884e7396bafac697286bfc213443750..777a5cacf7bc2c6005e7565ae609b1d6f68f10c1 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/main/yang/gbp-sxp-ise-adapter-model.yang
+++ b/sxp-integration/sxp-ise-adapter/src/main/yang/sxp-ise-adapter-model.yang
@@ -6,9 +6,9 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-module gbp-sxp-ise-adapter-model {
+module sxp-ise-adapter-model {
     yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:gbp-sxp-ise-adapter:model";
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ise-adapter:model";
     prefix "gbp-sxp-ise-adapter-model";
 
     import gbp-common { prefix gbp-common; revision-date 2014-04-21; }

diff --git a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderInstanceTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderInstanceTest.java
new file mode 100644 (file)
index 0000000..73c3508
--- /dev/null
+++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderInstanceTest.java
@@ -0,0 +1,121 @@
+/*
+ * 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.sxp_ise_adapter;
+
+import static org.powermock.api.mockito.PowerMockito.verifyNew;
+import static org.powermock.api.mockito.PowerMockito.whenNew;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
+import org.opendaylight.groupbasedpolicy.sxp.ep.provider.spi.SxpEpProviderProvider;
+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;
+import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+/**
+ * Test for {@link SxpIseAdapterProviderInstance}.
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({SxpIseAdapterProviderInstance.class})
+public class SxpIseAdapterProviderInstanceTest {
+
+    @Mock
+    private DataBroker dataBroker;
+    @Mock
+    private BindingAwareBroker bindingAwareBroker;
+    @Mock
+    private ClusterSingletonServiceProvider clusterSingletonService;
+    @Mock
+    private SxpEpProviderProvider sxpEpProvider;
+    @Mock
+    private GbpIseAdapterProvider gbpIseAdapterProvider;
+    @Mock
+    private ClusterSingletonServiceRegistration clusterSingletonRegistration;
+
+    private SxpIseAdapterProviderInstance instance;
+
+    @Before
+    public void setUp() throws Exception {
+        Mockito.when(clusterSingletonService.registerClusterSingletonService(Matchers.<ClusterSingletonService>any()))
+                .thenReturn(clusterSingletonRegistration);
+        whenNew(GbpIseAdapterProvider.class).withArguments(dataBroker, bindingAwareBroker, sxpEpProvider).thenReturn(gbpIseAdapterProvider);
+
+        instance = new SxpIseAdapterProviderInstance(dataBroker, bindingAwareBroker, clusterSingletonService, sxpEpProvider);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        Mockito.verifyNoMoreInteractions(dataBroker, bindingAwareBroker, clusterSingletonService, sxpEpProvider,
+                gbpIseAdapterProvider, clusterSingletonRegistration);
+    }
+
+    @Test
+    public void testInitialize() throws Exception {
+        instance.initialize();
+        Mockito.verify(clusterSingletonService).registerClusterSingletonService(instance);
+    }
+
+    @Test
+    public void testInstantiateServiceInstance() throws Exception {
+        instance.instantiateServiceInstance();
+
+        verifyNew(GbpIseAdapterProvider.class).withArguments(dataBroker, bindingAwareBroker, sxpEpProvider);
+    }
+
+    @Test
+    public void testCloseServiceInstance() throws Exception {
+        instance.instantiateServiceInstance();
+        final ListenableFuture<Void> future = instance.closeServiceInstance();
+
+        Mockito.verify(gbpIseAdapterProvider).close();
+        Assert.assertTrue(future.isDone());
+        Assert.assertNull(future.get());
+    }
+
+    @Test
+    public void testCloseServiceInstance_null() throws Exception {
+        final ListenableFuture<Void> future = instance.closeServiceInstance();
+
+        Assert.assertTrue(future.isDone());
+        Assert.assertNull(future.get());
+    }
+
+    @Test
+    public void testClose() throws Exception {
+        instance.initialize();
+        Mockito.verify(clusterSingletonService).registerClusterSingletonService(instance);
+
+        instance.close();
+        Mockito.verify(clusterSingletonRegistration).close();
+    }
+
+    @Test
+    public void testClose_null() throws Exception {
+        instance.close();
+    }
+
+    @Test
+    public void testGetIdentifier() throws Exception {
+        final ServiceGroupIdentifier identifier = instance.getIdentifier();
+        Assert.assertEquals("gbp-service-group-identifier", identifier.getValue());
+    }
+}
\ No newline at end of file

diff --git a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderIseImplTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderIseImplTest.java
index 4d605b00e2aba390d4d3829b845f6613de2300f3..f31b21cfa72b3e56f54d96597f8893458efec9eb 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderIseImplTest.java
+++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/EPPolicyTemplateProviderIseImplTest.java
@@ -29,11 +29,11 @@ import org.opendaylight.groupbasedpolicy.sxp_ise_adapter.impl.util.IseReplyUtil;
 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.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.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;
-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.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.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.sxp.integration.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.sxp.integration.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.sxp.integration.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.sxp.integration.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.ise.source.config.connection.config.HeaderBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.TemplateGenerated;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgt;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.Sgt;

diff --git a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProviderTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProviderTest.java
index c4c79d24825e91da67a1dabd842168f794284947..0c118afc6b6199ff3373972d04e271bfc76fd18e 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProviderTest.java
+++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseAdapterProviderTest.java
@@ -22,7 +22,7 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.groupbasedpolicy.sxp.ep.provider.api.EPPolicyTemplateProviderRegistry;
 import org.opendaylight.groupbasedpolicy.sxp.ep.provider.spi.SxpEpProviderProvider;
-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.sxp.integration.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;

diff --git a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImplTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImplTest.java
index 444f011cc59e26b810e9df337dbdf5d5be4c7ba5..1bb6a95ee44feb9e4025f810c8470b44c3a8e76e 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImplTest.java
+++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseConfigListenerImplTest.java
@@ -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.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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.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.sxp.integration.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.IseSourceConfig;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**

diff --git a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java
index 94f960c996f1e73ebf1db9351c1f100a8b55041c..fc593688582db8cb0b062eb511015502028f8b03 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java
+++ b/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java
@@ -34,10 +34,10 @@ import org.mockito.Mockito;
 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.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.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.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.sxp.integration.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.sxp.integration.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.sxp.integration.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;

diff --git a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_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
index 0e1f9dbb7a8ee01c85b20ca883c806d553c6ff0a..8b5e59d34fe11b39d9525bbc697ab88657095e0c 100644 (file)
--- a/sxp-integration/sxp-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/sxp_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
@@ -17,8 +17,8 @@ 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.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;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.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.sxp.integration.sxp.ise.adapter.model.rev160630.gbp.sxp.ise.adapter.ise.source.config.ConnectionConfigBuilder;
 
 /**
  * Purpose: cover {@link RestClientFactory}