From a6e74a0e1050d82ccf7869234635d40f9901d000 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Wed, 29 Apr 2015 16:39:45 +0200 Subject: [PATCH] Modify multiple physical address atributes in stress-client payload. Change-Id: Ic719c519eb0735d00014e51851dd958db5098ff0 Signed-off-by: Tomas Cere Signed-off-by: Maros Marsalek --- .../test/tool/client/stress/StressClient.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/client/stress/StressClient.java b/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/client/stress/StressClient.java index 0e87604cc5..206e82a6cf 100644 --- a/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/client/stress/StressClient.java +++ b/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/client/stress/StressClient.java @@ -86,6 +86,7 @@ public final class StressClient { private static final String MSG_ID_PLACEHOLDER_REGEX = "\\{MSG_ID\\}"; private static final String PHYS_ADDR_PLACEHOLDER_REGEX = "\\{PHYS_ADDR\\}"; + private static long idCounter = 0; public static void main(final String[] args) { final Parameters params = parseArgs(args, Parameters.getParser()); @@ -191,8 +192,11 @@ public final class StressClient { // Insert message id where needed String specificEditContent = editContentString.replaceAll(MSG_ID_PLACEHOLDER_REGEX, Integer.toString(id)); - specificEditContent = - specificEditContent.replaceAll(PHYS_ADDR_PLACEHOLDER_REGEX, getMac(id)); + while (specificEditContent.contains("{PHYS_ADDR}")) { + specificEditContent = + specificEditContent.replaceFirst(PHYS_ADDR_PLACEHOLDER_REGEX, getMac(idCounter)); + idCounter++; + } editContentElement = XmlUtil.readXmlToElement(specificEditContent); final Node config = ((Element) msg.getDocumentElement().getElementsByTagName("edit-config").item(0)). @@ -223,8 +227,8 @@ public final class StressClient { return netconfClientDispatcher; } - private static String getMac(final int i) { - final String hex = Integer.toHexString(i); + private static String getMac(final long i) { + final String hex = Long.toHexString(i); final Iterable macGroups = Splitter.fixedLength(2).split(hex); final int additional = 6 - Iterables.size(macGroups); -- 2.36.6