BUG-6650: ep-ip/sgt, prepare removal of deprecated sxp-mapper

Change-Id: I71b2bdc663653c5ccfc10cd9fbc092760ff4c4ee
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit 0a5a0040ac71d4ef087c7a3d174f7edc19f7b1d8)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 28b50eb0d2a10b1ca2f5e9a5592f5cf1d53d435a..c8e2a2a2ef890dbfa0f855322f82a77f4b9b78a2 100755 (executable)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -91,11 +91,6 @@
         <artifactId>groupbasedpolicy-ui-bundle</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>sxp-mapper</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sxp-ise-adapter</artifactId>
@@ -201,21 +196,21 @@
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>sxp-mapper</artifactId>
+        <artifactId>ios-xe-renderer</artifactId>
         <version>${project.version}</version>
         <type>xml</type>
         <classifier>config</classifier>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>ios-xe-renderer</artifactId>
+        <artifactId>sxp-ise-adapter</artifactId>
         <version>${project.version}</version>
         <type>xml</type>
         <classifier>config</classifier>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>sxp-ise-adapter</artifactId>
+        <artifactId>sxp-ep-provider</artifactId>
         <version>${project.version}</version>
         <type>xml</type>
         <classifier>config</classifier>

diff --git a/features/pom.xml b/features/pom.xml
index 626b07200178fff1068a67a0d6d05c0c85d497a7..5764aca54b8878993e82951e9aa5f8aeabae660c 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -301,7 +301,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>sxp-mapper</artifactId>
+      <artifactId>sxp-ep-provider</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
@@ -391,7 +391,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>sxp-mapper</artifactId>
+      <artifactId>sxp-ep-provider</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 0edb002dca23d2f81227424c4909f7c5565a725d..80f2e6bfe00662860cb471cd916c65335f7bfcc6 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -29,7 +29,7 @@
     <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
     <!-- Repos needed by IOvisor Renderer -->
     <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/${aaa.version}/xml/features</repository>
-    <!-- Repos needed by sxp-mapper -->
+    <!-- Repos needed by sxp-integration -->
     <repository>mvn:org.opendaylight.sxp/features/${sxp.version}/xml/features</repository>
     <!-- Repos needed by iosxe renderer -->
     <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${netconf.version}/xml/features</repository>
@@ -181,19 +181,6 @@
         <bundle>mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ui-bundle/{{VERSION}}</bundle>
     </feature>
 
-    <!--
-        SXP-MAPPER
-    -->
-    <feature name='odl-groupbasedpolicy-sxp-mapper' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: sxp-mapper'>
-        <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
-        <feature version="${sxp.version}">odl-sxp-core</feature>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}</bundle>
-        <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/sxp-mapper/{{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-mapper.xml">mvn:org.opendaylight.groupbasedpolicy/sxp-mapper/{{VERSION}}/xml/config</configfile>
-    </feature>
-
     <!--
          NE Location Provider
     -->
@@ -215,7 +202,6 @@
         <feature version="${sxp.version}">odl-sxp-core</feature>
         <feature version="${netconf.version}">odl-netconf-topology</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/sxp-mapper/{{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>
@@ -232,18 +218,20 @@
         <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'>
+        <!-- TODO: remove later - this is temporary "feature-forwarding" in order to keep integration feature test working -->
+        <feature version="${project.version}">odl-groupbasedpolicy-sxp-ep-provider</feature>
+    </feature>
 
     <!--
-       GBP-ISE ADAPTER
+       GBP-SXP integration : ise-adapter
    -->
-    <feature name='odl-groupbasedpolicy-ise-adapter' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: gbp-ise adapter'>
+    <feature name='odl-groupbasedpolicy-sxp-ise-adapter' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: sxp ise adapter'>
         <feature version="${project.version}">odl-groupbasedpolicy-sxp-ep-provider</feature>
-        <feature version="${sxp.version}">odl-sxp-core</feature>
-        <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-client/{{VERSION}}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-core/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/sxp-ise-adapter/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/sxp-ep-provider/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/16-groupbasedpolicy-ise-adapter.xml">mvn:org.opendaylight.groupbasedpolicy/sxp-ise-adapter/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/16-groupbasedpolicy-sxp-ise-adapter.xml">mvn:org.opendaylight.groupbasedpolicy/sxp-ise-adapter/{{VERSION}}/xml/config</configfile>
     </feature>
+
 </features>

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

diff --git a/renderers/ios-xe/pom.xml b/renderers/ios-xe/pom.xml
index 39fde0a4f9e0f2e357ecc63bcb128e9191a9d359..6044020632eb7796192982af7180af928ca6f55d 100755 (executable)
--- a/renderers/ios-xe/pom.xml
+++ b/renderers/ios-xe/pom.xml
@@ -76,7 +76,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>sxp-mapper</artifactId>
+            <artifactId>sxp-ep-provider</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>

diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/util/PolicyManagerUtil.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/util/PolicyManagerUtil.java
index 6f36408392824112fdbc2fb7aca29692c64b9222..2dcaa1b620affbbb5413c5cb7befa2a640deb139 100644 (file)
--- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/util/PolicyManagerUtil.java
+++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/util/PolicyManagerUtil.java
@@ -10,8 +10,8 @@ package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.util;
 
 import static org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager.PolicyManagerImpl.ActionCase.CHAIN;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.Futures;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -20,8 +20,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Futures;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.groupbasedpolicy.api.sf.ChainActionDefinition;
 import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager.PolicyConfigurationContext;
@@ -81,7 +81,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.resolved.policy.rev150828.has.actions.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.resolved.policy.rev150828.has.classifiers.Classifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.resolved.policy.rev150828.has.resolved.rules.ResolvedRule;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.AddressEndpointWithLocationAug;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.AddressEndpointWithLocationAug;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.Sgt;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;

diff --git a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImplTest.java b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImplTest.java
index 6b4f9a38def478fdd25410675a83c94166344270..77d2aec16c555d6b762b6f3db4c55e61a8516344 100644 (file)
--- a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImplTest.java
+++ b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImplTest.java
@@ -16,11 +16,11 @@ import static org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ren
 import static org.powermock.api.support.membermodification.MemberMatcher.method;
 import static org.powermock.api.support.membermodification.MemberModifier.stub;
 
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -83,8 +83,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.resolved.p
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.resolved.policy.rev150828.has.classifiers.ClassifierBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.resolved.policy.rev150828.has.resolved.rules.ResolvedRule;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.resolved.policy.rev150828.has.resolved.rules.ResolvedRuleBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.AddressEndpointWithLocationAug;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.mapper.model.rev160302.AddressEndpointWithLocationAugBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.AddressEndpointWithLocationAug;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.AddressEndpointWithLocationAugBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.Sgt;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;

diff --git a/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-model.yang b/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-model.yang
index 0a29aa4c41064af0081875ebbea9e5c6d69c8f02..0bb3a865e83bb0fd195d5ec7837c41ff45c8520e 100644 (file)
--- a/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-model.yang
+++ b/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-model.yang
@@ -96,4 +96,17 @@ module sxp-ep-provider-model {
             }
         }
     }
+
+    grouping sxp-sgt {
+        description "SGT leaf dedicated for endpoint-rpc, endpoint container and renderer configuration
+            (attach by augmentation)";
+        leaf sgt {
+            type sxp-database:sgt;
+        }
+    }
+
+    augment "renderer:renderers/renderer:renderer/renderer:renderer-policy/renderer:configuration/renderer:endpoints/renderer:address-endpoint-with-location" {
+        ext:augment-identifier "address-endpoint-with-location-aug";
+        uses sxp-sgt;
+    }
 }