From 94a4b28106871d54d8b159acb75e926609ab7db1 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Tue, 12 Nov 2019 09:05:39 +0200 Subject: AAF tests presets should redirect to simulator by it's config Issue-ID: VID-701 Change-Id: Ie1d0c78ec15e127fc782978175df4f608587a94a Signed-off-by: Ittay Stern --- .../presets/aaf/AAFGetUrlServicePreset.java | 25 ++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'vid-automation/src/main/java/org/onap') diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aaf/AAFGetUrlServicePreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aaf/AAFGetUrlServicePreset.java index b3376e61a..c3914660e 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aaf/AAFGetUrlServicePreset.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aaf/AAFGetUrlServicePreset.java @@ -2,6 +2,7 @@ package org.onap.simulator.presetGenerator.presets.aaf; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; import org.springframework.http.HttpMethod; +import vid.automation.test.services.SimulatorApi; public class AAFGetUrlServicePreset extends BasePreset { @Override @@ -11,7 +12,11 @@ public class AAFGetUrlServicePreset extends BasePreset { @Override public String getReqPath() { - return "/locate/com.att.aaf.service:2.0"; + return "/locate/" + regexAafServerName() + ":2.0"; + } + + private String regexAafServerName() { + return "([a-z-]+\\.)*[a-z-]+"; } @Override @@ -21,6 +26,22 @@ public class AAFGetUrlServicePreset extends BasePreset { @Override public Object getResponseBody() { - return "{\"endpoint\":[{\"name\":\"com.att.aaf.service\",\"major\": 2,\"minor\": 0,\"patch\": 19,\"pkg\": 21,\"latitude\": 38.627346,\"longitude\": -90.19377,\"protocol\": \"http\",\"subprotocol\": [],\"hostname\": \"127.0.0.1\",\"port\": 1080}]}"; + return "" + + "{" + + " \"endpoint\": [{" + + " \"name\": \"aaf-service\"," + + " \"major\": 2," + + " \"minor\": 0," + + " \"patch\": 19," + + " \"pkg\": 21," + + " \"latitude\": 38.627346," + + " \"longitude\": -90.19377," + + " \"protocol\": \"http\"," + + " \"subprotocol\": []," + + " \"port\": " + SimulatorApi.getSimulatedResponsesPort() + "," + + " \"hostname\": \"" + SimulatorApi.getSimulatorHost() + "\"" + + " }" + + " ]" + + "}"; } } -- cgit 1.2.3-korg