diff options
author | Dan Timoney <dtimoney@att.com> | 2020-04-09 13:56:45 -0400 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2020-04-13 14:37:06 -0400 |
commit | d5471900d0d05edb94225fc6895fafada649c869 (patch) | |
tree | 3f5b32bf5017292a57f4a265daee8753b3b239eb /sli | |
parent | 6fdb7812d8acb2b13daff5b80d541c162fff6ae7 (diff) |
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>
Diffstat (limited to 'sli')
-rwxr-xr-x | sli/common/pom.xml | 2 | ||||
-rwxr-xr-x | sli/installer/pom.xml | 2 | ||||
-rwxr-xr-x | sli/model/pom.xml | 2 | ||||
-rwxr-xr-x | sli/pom.xml | 2 | ||||
-rw-r--r-- | sli/provider-base/pom.xml | 2 | ||||
-rwxr-xr-x | sli/provider/pom.xml | 13 | ||||
-rwxr-xr-x | sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java | 16 |
7 files changed, 31 insertions, 8 deletions
diff --git a/sli/common/pom.xml b/sli/common/pom.xml index 9ae8ae3f..e469919d 100755 --- 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 409c5503..a8725800 100755 --- 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 9fa0be70..e873124d 100755 --- 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 d23abaa6..5caab4a0 100755 --- 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 26d05cb7..d461a123 100644 --- 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 d9bc16e1..1d599266 100755 --- 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 122c8862..d3ab6c33 100755 --- 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. |