Set PMSI tunnel attribute transitive.

PMSI tunnel attribute is an optional transitive BGP attribute, as per
https://tools.ietf.org/html/rfc6514#section-5.

Before is was set as a optional non-transitive. Due this flag it
cannot be sent successfully update message with PMSI tunnel attribute
to an Arista device.

JIRA: BGPCEP-877
Change-Id: I50669645e1eb19f14eb14b8f5a5c0217d8983a26
Signed-off-by: PeterSuna <peter.suna@pantheon.tech>

diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandler.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandler.java
index b671a5d3ff5f45019451f26e41b2b60c622bc24f..9db67eff16cb4abfa07be331acdaaf47292d8a49 100644 (file)
--- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandler.java
+++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandler.java
@@ -97,7 +97,8 @@ public final class PMSITunnelAttributeHandler implements AttributeParser, Attrib
         body.writeByte(tunnelType);
         serializeMpls(pmsiTunnelAttribute.getMplsLabel(), body);
         body.writeBytes(tunnelBuffer);
-        AttributeUtil.formatAttribute(AttributeUtil.OPTIONAL, getType(), body, byteAggregator);
+        AttributeUtil.formatAttribute(AttributeUtil.OPTIONAL | AttributeUtil.TRANSITIVE, getType(), body,
+                byteAggregator);
     }
 
     public Class<? extends DataObject> getClazz() {

diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandlerTestUtil.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandlerTestUtil.java
index 4ae94ea46fbffeb74c0de311585f1e48c6d2d4ad..82c44ae51bf91be7204cc27f39352ed6043960d9 100644 (file)
--- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandlerTestUtil.java
+++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandlerTestUtil.java
@@ -46,7 +46,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * No tunnel information present
      */
     static final byte[] NO_TUNNEL_INFORMATION_PRESENT_EXPECTED = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x05,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x05,
         (byte) 0x01, (byte) 0x00, (byte) 0x05, (byte) 0xdc, (byte) 0x10
     };
     /**
@@ -55,7 +55,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * mLDP P2MP LSP
      */
     static final byte[] RSVP_TE_P2MP_LSP_LSP_EXPECTED = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x11,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x11,
         (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x00, (byte) 0x00, (byte) 0x0d, (byte) 0x82,
         (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x0f,
@@ -67,7 +67,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * mLDP P2MP LSP
      */
     static final byte[] M_LDP_P2MP_LSP_EXPECTED_IPV4 = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x35,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x35,
         (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x06, (byte) 0x00, (byte) 0x01, (byte) 0x04,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
@@ -92,7 +92,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * mLDP P2MP LSP
      */
     static final byte[] M_LDP_P2MP_LSP_EXPECTED_WRONG_FAMILY = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x20,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x20,
         (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x06, (byte) 0x00, (byte) 0xfc, (byte) 0x04,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
@@ -108,7 +108,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * mLDP P2MP LSP L2VPN
      */
     static final byte[] M_LDP_P2MP_LSP_EXPECTED_L2VPN = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x35,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x35,
         (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x06, (byte) 0x00, (byte) 0x01, (byte) 0x04,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
@@ -133,7 +133,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * mLDP P2MP LSP IPV4
      */
     static final byte[] M_LDP_P2MP_LSP_EXPECTED_IPV4_2 = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x3b,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x3b,
         (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x06, (byte) 0x00, (byte) 0x01, (byte) 0x04,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
@@ -160,7 +160,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * mLDP P2MP LSP IPV6
      */
     static final byte[] M_LDP_P2MP_LSP_EXPECTED_IPV6 = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x41,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x41,
         (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x06, (byte) 0x00, (byte) 0x02, (byte) 0x10,
         (byte) 0x20, (byte) 0x01, (byte) 0x00, (byte) 0x00,
@@ -188,7 +188,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PIM-SSM Tree
      */
     static final byte[] PIM_SSM_TREE_EXPECTED = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x0d,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x0d,
         (byte) 0x01, (byte) 0x03, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
         (byte) 0x17, (byte) 0x01, (byte) 0x01, (byte) 0x01
@@ -199,7 +199,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PIM-SM Tree
      */
     static final byte[] PIM_SM_TREE_EXPECTED = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x0d,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x0d,
         (byte) 0x01, (byte) 0x04, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
         (byte) 0x17, (byte) 0x01, (byte) 0x01, (byte) 0x01
@@ -210,7 +210,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * BIDIR-PIM Tree
      */
     static final byte[] BIDIR_PIM_EXPECTED = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x0d,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x0d,
         (byte) 0x01, (byte) 0x05, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
         (byte) 0x17, (byte) 0x01, (byte) 0x01, (byte) 0x01
@@ -221,7 +221,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * Ingress Replication
      */
     static final byte[] INGRESS_REPLICATION_EXPECTED = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x09,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x09,
         (byte) 0x01, (byte) 0x06, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01
     };
@@ -231,7 +231,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * mLDP MP2MP LSP
      */
     static final byte[] M_LDP_MP_2_MP_LSP_EXPECTED = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x16,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x16,
         (byte) 0x01, (byte) 0x07, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x01, (byte) 0x00, (byte) 0x0e, // Opaque Type - Length
         (byte) 0x07, (byte) 0x00, (byte) 0x0B, //Value
@@ -246,7 +246,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * mLDP MP2MP LSP
      */
     static final byte[] M_LDP_MP_2_MP_LSP_WRONG = {
-        (byte) 0x80, (byte) 0x16, (byte) 0x0b,
+        (byte) 0xc0, (byte) 0x16, (byte) 0x0b,
         (byte) 0x01, (byte) 0x07, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0xfc, (byte) 0x00, (byte) 0x03, // Opaque Type - Length
         (byte) 0xb5, (byte) 0xeb, (byte) 0x2d,  //Value