From d09872decbadb6356b8b4298f3c619127dda59bb Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Mon, 31 Dec 2018 20:58:53 +0100 Subject: [PATCH] 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 --- .../resources/initial/protocols-config.xml | 68 +++++++++---------- .../src/main/yang/bgp-multiprotocol.yang | 2 +- .../open/LlGracefulCapabilityHandler.java | 4 +- .../impl/LlGracefulCapabilityHandlerTest.java | 12 ++-- .../protocol/bgp/rib/impl/BGPPeer.java | 2 +- .../rib/impl/config/GracefulRestartUtil.java | 2 +- .../impl/config/GracefulRestartUtilTest.java | 2 +- ...long-lived-graceful-restart-capability.rst | 2 +- 8 files changed, 47 insertions(+), 47 deletions(-) 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 b01821c167..3694cbf9db 100644 --- 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 @@ true - 180 + 180 @@ -158,7 +158,7 @@ true - 180 + 180 @@ -171,7 +171,7 @@ true - 180 + 180 @@ -184,7 +184,7 @@ true - 180 + 180 @@ -197,7 +197,7 @@ true - 180 + 180 @@ -210,7 +210,7 @@ true - 180 + 180 @@ -223,7 +223,7 @@ true - 180 + 180 @@ -236,7 +236,7 @@ true - 180 + 180 @@ -249,7 +249,7 @@ true - 180 + 180 @@ -262,7 +262,7 @@ true - 180 + 180 @@ -275,7 +275,7 @@ true - 180 + 180 @@ -288,7 +288,7 @@ true - 180 + 180 @@ -301,7 +301,7 @@ true - 180 + 180 @@ -314,7 +314,7 @@ true - 180 + 180 @@ -327,7 +327,7 @@ true - 180 + 180 @@ -340,7 +340,7 @@ true - 180 + 180 @@ -353,7 +353,7 @@ true - 180 + 180 @@ -391,7 +391,7 @@ true - 180 + 180 @@ -404,7 +404,7 @@ true - 180 + 180 @@ -417,7 +417,7 @@ true - 180 + 180 @@ -430,7 +430,7 @@ true - 180 + 180 @@ -443,7 +443,7 @@ true - 180 + 180 @@ -456,7 +456,7 @@ true - 180 + 180 @@ -469,7 +469,7 @@ true - 180 + 180 @@ -482,7 +482,7 @@ true - 180 + 180 @@ -495,7 +495,7 @@ true - 180 + 180 @@ -508,7 +508,7 @@ true - 180 + 180 @@ -521,7 +521,7 @@ true - 180 + 180 @@ -534,7 +534,7 @@ true - 180 + 180 @@ -547,7 +547,7 @@ true - 180 + 180 @@ -560,7 +560,7 @@ true - 180 + 180 @@ -573,7 +573,7 @@ true - 180 + 180 @@ -586,7 +586,7 @@ true - 180 + 180 @@ -599,7 +599,7 @@ true - 180 + 180 diff --git a/bgp/parser-api/src/main/yang/bgp-multiprotocol.yang b/bgp/parser-api/src/main/yang/bgp-multiprotocol.yang index da4e59d4ee..ae03a5cdd9 100644 --- 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 fb32858b74..d86aa26ce9 100644 --- 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 dfc6b9a041..b0567e0407 100644 --- 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 609c507755..44fdae3396 100644 --- 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 53040a378e..ccac885ebf 100644 --- 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 26636a8129..e9e081b053 100644 --- 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 e2555a65b6..01f748afb7 100644 --- 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 true - 180 + 180 -- 2.36.6