Fix ll graceful-restart-config

Wrong configuration has been introducer by
I0bf449c7dc1e08e4c68fcba5673f54de3a4fe0dd
breaking all integration test.
Fix typos and aling names under models

JIRA:BGPCEP-495
Change-Id: I49b46db181705fb05e31a7f8b3ba6b99de86735f
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/config-example/src/main/resources/initial/protocols-config.xml b/bgp/config-example/src/main/resources/initial/protocols-config.xml
index b01821c167cf06583815d79dd63859be01a8886d..3694cbf9db703a1d22140c62cb92a0d41c50c704 100644 (file)
--- a/bgp/config-example/src/main/resources/initial/protocols-config.xml
+++ b/bgp/config-example/src/main/resources/initial/protocols-config.xml
@@ -145,7 +145,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -158,7 +158,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -171,7 +171,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -184,7 +184,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -197,7 +197,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -210,7 +210,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -223,7 +223,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -236,7 +236,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -249,7 +249,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -262,7 +262,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -275,7 +275,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -288,7 +288,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -301,7 +301,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -314,7 +314,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -327,7 +327,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -340,7 +340,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -353,7 +353,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -391,7 +391,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -404,7 +404,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -417,7 +417,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -430,7 +430,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -443,7 +443,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -456,7 +456,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -469,7 +469,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -482,7 +482,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -495,7 +495,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -508,7 +508,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -521,7 +521,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -534,7 +534,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -547,7 +547,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -560,7 +560,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -573,7 +573,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -586,7 +586,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>
@@ -599,7 +599,7 @@
                                     <enabled>true</enabled>
                                     <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
                                         <config>
-                                            <long-live-stale-time>180</long-live-stale-time>
+                                            <long-lived-stale-time>180</long-lived-stale-time>
                                         </config>
                                     </ll-graceful-restart>
                                 </config>

diff --git a/bgp/parser-api/src/main/yang/bgp-multiprotocol.yang b/bgp/parser-api/src/main/yang/bgp-multiprotocol.yang
index da4e59d4ee4412e118a4644b7209c8ee1a414395..ae03a5cdd968e38feecebdfdecc58089e0b36bd4 100644 (file)
--- a/bgp/parser-api/src/main/yang/bgp-multiprotocol.yang
+++ b/bgp/parser-api/src/main/yang/bgp-multiprotocol.yang
@@ -132,7 +132,7 @@ module bgp-multiprotocol {
                     }
                     mandatory true;
                 }
-                leaf long-live-stale-time {
+                leaf long-lived-stale-time {
                     type uint32 {
                         range 0..16777215;
                     }

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/LlGracefulCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/LlGracefulCapabilityHandler.java
index fb32858b744c850557b6cbf1ec4f03ec9a2789d1..d86aa26ce9bd302993c998e68f5ed6b8fe34e78f 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/LlGracefulCapabilityHandler.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/LlGracefulCapabilityHandler.java
@@ -84,7 +84,7 @@ public final class LlGracefulCapabilityHandler implements CapabilityParser, Capa
                     .setAfi(afi)
                     .setSafi(safi)
                     .setAfiFlags(new Tables.AfiFlags(Boolean.valueOf(afiFlags == AFI_FLAG_FORWARDING_STATE)))
-                    .setLongLiveStaleTime(Long.valueOf(staleTime))
+                    .setLongLivedStaleTime(Long.valueOf(staleTime))
                     .build();
             tables.add(table);
         }
@@ -129,7 +129,7 @@ public final class LlGracefulCapabilityHandler implements CapabilityParser, Capa
             } else {
                 buffer.writeZero(1);
             }
-            final Long staleTime = table.getLongLiveStaleTime();
+            final Long staleTime = table.getLongLivedStaleTime();
             final int timeval = staleTime != null ? staleTime.intValue() : 0;
             checkArgument(timeval >= 0 && timeval <= MAX_STALE_TIME, "Restart time is %s", staleTime);
             buffer.writeMedium(timeval);

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java
index dfc6b9a041b3a259d0d4d157c459188007f1ec1f..b0567e040703e5c427c7cc42fe5184ee73b1c4f4 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java
@@ -62,13 +62,13 @@ public class LlGracefulCapabilityHandlerTest {
                                 .setAfi(Ipv4AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
                                 .setAfiFlags(new Tables.AfiFlags(false))
-                                .setLongLiveStaleTime(10L)
+                                .setLongLivedStaleTime(10L)
                                 .build(),
                         new TablesBuilder()
                                 .setAfi(Ipv6AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
                                 .setAfiFlags(new Tables.AfiFlags(true))
-                                .setLongLiveStaleTime(160L)
+                                .setLongLivedStaleTime(160L)
                                 .build())
                 ).build();
 
@@ -89,7 +89,7 @@ public class LlGracefulCapabilityHandlerTest {
                                 .setAfi(AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
                                 .setAfiFlags(new Tables.AfiFlags(false))
-                                .setLongLiveStaleTime(10L)
+                                .setLongLivedStaleTime(10L)
                                 .build())).build();
 
         final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,
@@ -105,7 +105,7 @@ public class LlGracefulCapabilityHandlerTest {
                         .setAfi(Ipv4AddressFamily.class)
                         .setSafi(SubsequentAddressFamily.class)
                         .setAfiFlags(new Tables.AfiFlags(false))
-                        .setLongLiveStaleTime(10L)
+                        .setLongLivedStaleTime(10L)
                         .build())).build();
 
         final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,
@@ -121,7 +121,7 @@ public class LlGracefulCapabilityHandlerTest {
                                 .setAfi(Ipv4AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
                                 .setAfiFlags(new Tables.AfiFlags(false))
-                                .setLongLiveStaleTime(-1L)
+                                .setLongLivedStaleTime(-1L)
                                 .build())).build();
 
         final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,
@@ -138,7 +138,7 @@ public class LlGracefulCapabilityHandlerTest {
                         .setAfi(Ipv4AddressFamily.class)
                         .setSafi(UnicastSubsequentAddressFamily.class)
                         .setAfiFlags(new Tables.AfiFlags(false))
-                        .setLongLiveStaleTime(16777216L)
+                        .setLongLivedStaleTime(16777216L)
                         .build())).build();
 
         final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
index 609c507755e1a2d8008a1055bf27a92a69a3d1e8..44fdae3396ef504c1c1d8e88687b5e2f85b1ddf8 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
@@ -432,7 +432,7 @@ public class BGPPeer extends AbstractPeer implements BGPSessionListener {
             for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp
                     .capabilities.ll.graceful.restart.capability.Tables table : advertisedLLTables) {
                 llTablesReceived.put(new TablesKey(table.getAfi(), table.getSafi()),
-                    table.getLongLiveStaleTime().intValue());
+                    table.getLongLivedStaleTime().intValue());
             }
         } else {
             llTablesReceived = Collections.emptyMap();

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtil.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtil.java
index 53040a378edb086da931d6066f171facd3295286..ccac885ebf055fefcfe956a3244a69a73e252e0c 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtil.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtil.java
@@ -76,7 +76,7 @@ public final class GracefulRestartUtil {
                         .setAfi(dto.getTableKey().getAfi())
                         .setSafi(dto.getTableKey().getSafi())
                         .setAfiFlags(new AfiFlags(dto.isForwarding()))
-                        .setLongLiveStaleTime((long) dto.getStaleTime())
+                        .setLongLivedStaleTime((long) dto.getStaleTime())
                         .build())
                 .collect(Collectors.toList());
         return new CParametersBuilder().addAugmentation(CParameters1.class,

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtilTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtilTest.java
index 26636a8129f50e0e52c323ddb3d153c7bd49d32f..e9e081b05338a42154fb969bb3dc536b96cf8d0d 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtilTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtilTest.java
@@ -174,7 +174,7 @@ public class GracefulRestartUtilTest {
                 .capabilities.ll.graceful.restart.capability.Tables> tables = llGracefulCapability.getTables();
         assertNotNull(tables);
         assertEquals(2, tables.size());
-        assertEquals(STALE_TIME, tables.get(0).getLongLiveStaleTime().intValue());
+        assertEquals(STALE_TIME, tables.get(0).getLongLivedStaleTime().intValue());
         tables.forEach(table -> {
             assertTrue(isSameKey(IPV4_KEY, table.key()) && table.getAfiFlags().isForwardingState()
                 || isSameKey(IPV6_KEY, table.key()) && !table.getAfiFlags().isForwardingState());

diff --git a/docs/bgp/bgp-user-guide-long-lived-graceful-restart-capability.rst b/docs/bgp/bgp-user-guide-long-lived-graceful-restart-capability.rst
index e2555a65b6da103627f11f08b342979446587470..01f748afb7f0846957d8e2d19a05c5e6ebd7565a 100644 (file)
--- a/docs/bgp/bgp-user-guide-long-lived-graceful-restart-capability.rst
+++ b/docs/bgp/bgp-user-guide-long-lived-graceful-restart-capability.rst
@@ -35,7 +35,7 @@ or
          <enable>true</enable>
          <ll-graceful-restart xmlns="urn:opendaylight:params:xml:ns:yang:bgp:ll-graceful-restart">
              <config>
-                 <long-live-stale-time>180</long-live-stale-time>
+                 <long-lived-stale-time>180</long-lived-stale-time>
              </config>
          </ll-graceful-restart>
        </config>