diff options
author | TamasBakai <tamas.bakai@est.tech> | 2019-03-26 09:20:16 +0000 |
---|---|---|
committer | TamasBakai <tamas.bakai@est.tech> | 2019-03-26 09:20:16 +0000 |
commit | bab325bf8248fd9033c828981b22942c2098b48a (patch) | |
tree | 7e91a663290b7ff87fb6d8d7eb722ba63c9e17d7 /test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java | |
parent | c25ab4f11ff8944142229ba92d514f2ae58ec966 (diff) |
Mass-pnf-sim URL handling improvements
Change-Id: Ic10551cb0cd1f875ad6a1cec3d73e1cfcb35d00e
Issue-ID: DCAEGEN2-1225
Signed-off-by: TamasBakai <tamas.bakai@est.tech>
Diffstat (limited to 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java')
-rw-r--r-- | test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java index cb58e3c7a..54af2b9a0 100644 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java +++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java @@ -53,18 +53,26 @@ public class SimulatorFactory { Optional<JSONObject> pnfRegistrationParams, Optional<JSONObject> notificationParams) throws ProcessingException, IOException, ValidationException { PnfSimConfig configuration = ConfigurationProvider.getConfigInstance(); - String xnfUrl = "sftp://onap:pano@" + configuration.getIpsftp() + "/"; - String vesUrl = configuration.getVesip() + "/eventListener/v7"; + + String xnfUrl = null; + + if (configuration.getDefaultfileserver().equals("sftp")) { + xnfUrl = configuration.getUrlsftp() + "/"; + } else if (configuration.getDefaultfileserver().equals("ftps")) { + xnfUrl = configuration.getUrlftps() + "/"; + } + + String urlVes = configuration.getUrlves(); Duration duration = Duration.ofSeconds(parseInt(simulatorParams.getString(TEST_DURATION))); Duration interval = Duration.ofSeconds(parseInt(simulatorParams.getString(MESSAGE_INTERVAL))); List<String> fileList = FileProvider.getFiles(); - JSONObject messageBody = messageProvider - .createMessage(commonEventHeaderParams, pnfRegistrationParams, notificationParams, fileList, xnfUrl); + JSONObject messageBody = messageProvider.createMessage(commonEventHeaderParams, pnfRegistrationParams, + notificationParams, fileList, xnfUrl); validator.validate(messageBody.toString(), DEFAULT_OUTPUT_SCHEMA_PATH); - return Simulator.builder().withVesUrl(vesUrl).withDuration(duration).withInterval(interval) + return Simulator.builder().withVesUrl(urlVes).withDuration(duration).withInterval(interval) .withMessageBody(messageBody).build(); } |