From 7088e80deb3384c84cefca8f92e92722b1f19fe9 Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Fri, 2 Dec 2016 09:37:22 +0100 Subject: HONEYCOMB-307 - Prevent re-mapping of already mapped names Prevent invoking addName while initializing data for names that are already in mappings Change-Id: I56063fb28cfb215bbdb1ed745aaa44544ffa77a0 Signed-off-by: Jan Srnicek --- .../io/fd/hc2vpp/routing/write/RoutingProtocolCustomizer.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'routing/routing-impl/src/main/java/io') diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizer.java index 220f07690..69b8e509e 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizer.java @@ -61,9 +61,12 @@ public class RoutingProtocolCustomizer // while using ip_add_del_table routingProtocolContext.addName(tableId, newProtocolName, mappingContext); } else { - throw new IllegalStateException(String.format( - "An attempt to assign protocol %s to table id %s. Table id already assigned to protocol %s", - newProtocolName, tableId, routingProtocolContext.getName(tableId, mappingContext))); + // prevent to fail while restoring data(trying to remap already mapped name) + if (!newProtocolName.equals(routingProtocolContext.getName(tableId, mappingContext))) { + throw new IllegalStateException(String.format( + "An attempt to assign protocol %s to table id %s. Table id already assigned to protocol %s", + newProtocolName, tableId, routingProtocolContext.getName(tableId, mappingContext))); + } } } } -- cgit 1.2.3-korg