diff options
author | Ittay Stern <ittay.stern@att.com> | 2019-02-18 13:05:06 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-02-18 13:05:06 +0000 |
commit | 36baada47134d2e6915baad5627d14d26e4c35ef (patch) | |
tree | f9175c70a9be28ddfc589dcfabc66ab00b9554b4 /vid-ext-services-simulator | |
parent | 2cfbe3407713a48fb81783ae2a560c5fe6face5e (diff) | |
parent | e3f8c6d9b3ff4b9c9b82c795a791ea9b5a014c98 (diff) |
Merge "Introduced mocked SO workflows in VID FE"
Diffstat (limited to 'vid-ext-services-simulator')
2 files changed, 23 insertions, 6 deletions
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java index b67c98ee9..3c193cdb9 100644 --- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java @@ -6,8 +6,6 @@ import org.mockserver.integration.ClientAndServer; import org.mockserver.matchers.Times; import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpResponse; -import static org.mockserver.model.HttpRequest.request; -import static org.mockserver.model.HttpResponse.response; import org.mockserver.model.JsonBody; import org.onap.simulator.errorHandling.VidSimulatorException; @@ -35,8 +33,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; import java.util.stream.Collectors; import static org.mockserver.integration.ClientAndServer.startClientAndServer; @@ -54,7 +50,6 @@ public class SimulatorController { private Boolean enablePresetRegistration; private volatile boolean isInitialized = false; - Logger logger = LoggerFactory.getLogger(SimulatorController.class); @PostConstruct @@ -181,7 +176,6 @@ public class SimulatorController { } } - @RequestMapping(value = {"/**"}) public String redirectToMockServer(HttpServletRequest request, HttpServletResponse response) { //Currently, the easiest logic is redirecting diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/workflows.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/workflows.json new file mode 100644 index 000000000..f79651be4 --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/workflows.json @@ -0,0 +1,23 @@ +{ + "simulatorRequest": { + "method": "GET", + "path": "/so/workflows" + } , + "simulatorResponse": { + "responseCode": 200, + "body": { + "workflows": + [{ + "id": 1, + "name": "workflow 1" + },{ + "id": 2, + "name": "workflow 2" + },{ + "id": 3, + "name": "workflow 3" + } + ] + } + } +}
\ No newline at end of file |