Add special handling for BGP RouteDistinguisher

Add special case code in MdsalHelper for BGP RouteDistinguisher class -
a custom class implemented by OpenDaylight that does NOT follow
the pattern of data object classes generated from Yang models
by Yangtools

Change-Id: I2ac78b4c86109cea17fb05a5f6b6a0c9b98a7d72
Issue-ID: CCSDK-2307
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index fa228f8..18d9caa 100755 (executable)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -17,7 +17,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>parent</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
        </parent>
 
        <dependencyManagement>

diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml
index d32dd56..fb29692 100755 (executable)
--- a/dblib/installer/pom.xml
+++ b/dblib/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/dblib/pom.xml b/dblib/pom.xml
index 200b515..6d0558d 100755 (executable)
--- a/dblib/pom.xml
+++ b/dblib/pom.xml
@@ -5,7 +5,7 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml
index b823b4d..72809d7 100755 (executable)
--- a/dblib/provider/pom.xml
+++ b/dblib/provider/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/features/ccsdk-dblib/pom.xml b/features/ccsdk-dblib/pom.xml
index 8c18e1a..ca02255 100644 (file)
--- a/features/ccsdk-dblib/pom.xml
+++ b/features/ccsdk-dblib/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/features/ccsdk-filters/pom.xml b/features/ccsdk-filters/pom.xml
index 4869a9a..1b1f1cf 100644 (file)
--- a/features/ccsdk-filters/pom.xml
+++ b/features/ccsdk-filters/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/features/ccsdk-sli-core-all/pom.xml b/features/ccsdk-sli-core-all/pom.xml
index 424eead..8e60b7c 100644 (file)
--- a/features/ccsdk-sli-core-all/pom.xml
+++ b/features/ccsdk-sli-core-all/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/features/ccsdk-sli/pom.xml b/features/ccsdk-sli/pom.xml
index 5ba96dc..80c1e3d 100644 (file)
--- a/features/ccsdk-sli/pom.xml
+++ b/features/ccsdk-sli/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/features/ccsdk-sliPluginUtils/pom.xml b/features/ccsdk-sliPluginUtils/pom.xml
index b69baaa..40f6e92 100644 (file)
--- a/features/ccsdk-sliPluginUtils/pom.xml
+++ b/features/ccsdk-sliPluginUtils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/features/ccsdk-sliapi/pom.xml b/features/ccsdk-sliapi/pom.xml
index 0d2ec8a..b5a4ea4 100644 (file)
--- a/features/ccsdk-sliapi/pom.xml
+++ b/features/ccsdk-sliapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/features/ccsdk-slicore-utils/pom.xml b/features/ccsdk-slicore-utils/pom.xml
index f09bf53..4ee03b6 100644 (file)
--- a/features/ccsdk-slicore-utils/pom.xml
+++ b/features/ccsdk-slicore-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-sli-core/pom.xml b/features/features-sli-core/pom.xml
index bca56be..94c2d02 100644 (file)
--- a/features/features-sli-core/pom.xml
+++ b/features/features-sli-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index ea571c7..d17d13f 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 8778687..78cfc0d 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml
index 441b68f..d11bcda 100755 (executable)
--- a/filters/installer/pom.xml
+++ b/filters/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/filters/pom.xml b/filters/pom.xml
index 6db7541..b0ad663 100644 (file)
--- a/filters/pom.xml
+++ b/filters/pom.xml
@@ -5,7 +5,7 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index da0e261..ac3f9d6 100755 (executable)
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index b47fa8a..19ddfd3 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index 9ae8ae3..e469919 100755 (executable)
--- a/sli/common/pom.xml
+++ b/sli/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index 409c550..a872580 100755 (executable)
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/sli/model/pom.xml b/sli/model/pom.xml
index 9fa0be7..e873124 100755 (executable)
--- a/sli/model/pom.xml
+++ b/sli/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/sli/pom.xml b/sli/pom.xml
index d23abaa..5caab4a 100755 (executable)
--- a/sli/pom.xml
+++ b/sli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/sli/provider-base/pom.xml b/sli/provider-base/pom.xml
index 26d05cb..d461a12 100644 (file)
--- a/sli/provider-base/pom.xml
+++ b/sli/provider-base/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
index d9bc16e..1d59926 100755 (executable)
--- a/sli/provider/pom.xml
+++ b/sli/provider/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
@@ -69,14 +69,23 @@
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>sal-binding-api</artifactId>
+                       <scope>provided</scope>
                </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
-        </dependency>       
+                       <scope>provided</scope>
+        </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.bgpcep</groupId>
+                       <artifactId>bgp-concepts</artifactId>
+                       <version>0.11.1</version>
+                       <scope>provided</scope>
+               </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
+                       <scope>provided</scope>
         </dependency>
                <!-- Testing Dependencies -->
                <dependency>

diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java
index 122c886..d3ab6c3 100755 (executable)
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java
@@ -43,6 +43,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisher;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisherBuilder;
 import org.opendaylight.yangtools.yang.binding.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -678,7 +680,19 @@ public class MdsalHelper {
                                                 + "(" + paramValue + ")", e);
                                     }
                                 }
-                            } else {
+                            } else if ("RouteDistinguisher".equals(simpleName)) {
+                                if ((paramValue != null) && (paramValue.length() > 0)) {
+                                    try {
+                                        RouteDistinguisher routeDistinguisher = RouteDistinguisherBuilder.getDefaultInstance(paramValue);
+                                        m.invoke(toObj, routeDistinguisher);
+                                        foundValue = true;
+                                    } catch (Exception e) {
+                                        LOG.error("Caught exception calling " + toClass.getName() + "." + m.getName()
+                                                + "(" + paramValue + ")", e);
+                                    }
+                                }
+                            }
+                            else {
                                 // setter expects a yang-generated class. Need
                                 // to
                                 // create a builder to set it.

diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml
index e7503cd..f4e0afd 100755 (executable)
--- a/sliPluginUtils/installer/pom.xml
+++ b/sliPluginUtils/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml
index 38c448d..f79980b 100755 (executable)
--- a/sliPluginUtils/pom.xml
+++ b/sliPluginUtils/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml
index 0bbdc5c..fad3a35 100755 (executable)
--- a/sliPluginUtils/provider/pom.xml
+++ b/sliPluginUtils/provider/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index 975c63f..f052a45 100755 (executable)
--- a/sliapi/installer/pom.xml
+++ b/sliapi/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml
index 28aac05..24c33b7 100755 (executable)
--- a/sliapi/model/pom.xml
+++ b/sliapi/model/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/sliapi/pom.xml b/sliapi/pom.xml
index eed7a94..2d57fce 100755 (executable)
--- a/sliapi/pom.xml
+++ b/sliapi/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index 2ce3d7e..d5b7a18 100755 (executable)
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/sliapi/springboot/pom.xml b/sliapi/springboot/pom.xml
index e81362e..1c074a5 100644 (file)
--- a/sliapi/springboot/pom.xml
+++ b/sliapi/springboot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml
index 5212329..8455656 100755 (executable)
--- a/utils/installer/pom.xml
+++ b/utils/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.2</version>
+               <version>1.5.3-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/utils/pom.xml b/utils/pom.xml
index 628d508..632f428 100755 (executable)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -5,7 +5,7 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml
index 9c1b7c1..f631e9e 100644 (file)
--- a/utils/provider/pom.xml
+++ b/utils/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3-SNAPSHOT</version>
         <relativePath/>
     </parent>