BUG-6650: ep-ip/sgt, move groupbasedpolicy-ise-adapter into sxp-integration

Change-Id: I22a996dda40f5fa6d843e72b9fa045d6ea1cb29f
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit 68133ec166f262b2642472dd3f69a5ef58d9159b)

diff --git a/pom.xml b/pom.xml
index 4966133f22a1cc81f7dfba32257fe782b6c82f93..611928493097212e962233f4c5074f9d87fd17e5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,6 @@
     <module>distribution-karaf</module>
     <module>features</module>
     <module>sxp-mapper</module>
-    <module>groupbasedpolicy-ise-adapter</module>
     <module>sxp-integration</module>
   </modules>
 

diff --git a/groupbasedpolicy-ise-adapter/pom.xml b/sxp-integration/groupbasedpolicy-ise-adapter/pom.xml
similarity index 91%
rename from groupbasedpolicy-ise-adapter/pom.xml
rename to sxp-integration/groupbasedpolicy-ise-adapter/pom.xml
index 7ec00970ae05826340e27fc426c97189c67f144d..dd477736ad41a06fc648a57952860f60c91be673 100755 (executable)
--- a/groupbasedpolicy-ise-adapter/pom.xml
+++ b/sxp-integration/groupbasedpolicy-ise-adapter/pom.xml
@@ -7,17 +7,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <relativePath/>
+        <groupId>org.opendaylight.groupbasedpolicy</groupId>
+        <artifactId>sxp-integration</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
     <artifactId>groupbasedpolicy-ise-adapter</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>groupbasedpolicy-ise-adapter</name>
+    <name>sxp-integration_groupbasedpolicy-ise-adapter</name>
 
     <properties>
         <sxp.version>1.4.0-SNAPSHOT</sxp.version>
@@ -32,7 +30,7 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-             <dependency>
+            <dependency>
                 <groupId>org.opendaylight.sxp</groupId>
                 <artifactId>sxp-api</artifactId>
                 <version>${sxp.version}</version>

diff --git a/groupbasedpolicy-ise-adapter/src/main/config/default-config.xml b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/config/default-config.xml
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/config/default-config.xml
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/config/default-config.xml

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java

diff --git a/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
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListener.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListener.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListener.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListener.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImpl.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImpl.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImpl.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImpl.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvester.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvester.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvester.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvester.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImpl.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfo.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfo.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfo.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfo.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfoProcessor.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfoProcessor.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfoProcessor.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtInfoProcessor.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImpl.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImpl.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImpl.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImpl.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImpl.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImpl.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImpl.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImpl.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactory.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactory.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactory.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactory.java

diff --git a/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml

diff --git a/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-cfg.yang

diff --git a/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-model.yang b/sxp-integration/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-model.yang
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-model.yang
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/main/yang/gbp-ise-adapter-model.yang

diff --git a/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProviderTest.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProviderTest.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProviderTest.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProviderTest.java

diff --git a/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImplTest.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImplTest.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImplTest.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseConfigListenerImplTest.java

diff --git a/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseSgtHarvesterImplTest.java

diff --git a/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImplTest.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImplTest.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImplTest.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEPTemplateGeneratorImplTest.java

diff --git a/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImplTest.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImplTest.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImplTest.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/SgtToEpgGeneratorImplTest.java

diff --git a/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactoryTest.java b/sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactoryTest.java
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactoryTest.java
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/test/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/util/RestClientFactoryTest.java

diff --git a/groupbasedpolicy-ise-adapter/src/test/resources/log4j.xml b/sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/log4j.xml
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/test/resources/log4j.xml
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/log4j.xml

diff --git a/groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-allSgts.xml b/sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-allSgts.xml
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-allSgts.xml
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-allSgts.xml

diff --git a/groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-sgtDetail.xml b/sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-sgtDetail.xml
similarity index 100%
rename from groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-sgtDetail.xml
rename to sxp-integration/groupbasedpolicy-ise-adapter/src/test/resources/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/rawIse-sgtDetail.xml

diff --git a/sxp-integration/pom.xml b/sxp-integration/pom.xml
index a3180a698300394d17996b712073d245a3854059..bbe34860f86e74bca19d41df702dc868d6bcc1dd 100644 (file)
--- a/sxp-integration/pom.xml
+++ b/sxp-integration/pom.xml
@@ -25,6 +25,7 @@
 
     <modules>
         <module>sxp-ep-provider</module>
+        <module>groupbasedpolicy-ise-adapter</module>
         <!--<module>ep-sgt-mapper</module>-->
     </modules>