From 4b50bdd791fdfcb62ec24317ab6b9a907b3a1b9d Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Fri, 3 May 2019 14:28:39 +0000 Subject: Pass typefileserver as parameter in mass-pnf-sim Change-Id: I1168a5f10cce9b7d17324504a57d90dd9ee7790d Issue-ID: DCAEGEN2-1434 Signed-off-by: RehanRaza --- .../main/java/org/onap/pnfsimulator/PnfSimConfig.java | 16 +++++++--------- .../onap/pnfsimulator/simulator/SimulatorFactory.java | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator') diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/PnfSimConfig.java b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/PnfSimConfig.java index 89f59a391..3dd4aba1c 100644 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/PnfSimConfig.java +++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/PnfSimConfig.java @@ -5,14 +5,14 @@ public class PnfSimConfig { private String urlftps; private String urlsftp; private String ippnfsim; - private String defaultfileserver; + private String typefileserver; - public String getDefaultfileserver() { - return defaultfileserver; + public String getTypefileserver() { + return typefileserver; } - public void setDefaultfileserver(String defaultfileserver) { - this.defaultfileserver = defaultfileserver; + public void setTypefileserver(String typefileserver) { + this.typefileserver = typefileserver; } @@ -50,10 +50,8 @@ public class PnfSimConfig { @Override public String toString() { - return "PnfSimConfig [vesip=" + urlves + ", urlftps=" + urlftps + ", ippnfsim=" + ippnfsim + ", urlsftp=" - + urlsftp + "]"; + return "PnfSimConfig [vesip=" + urlves + ", urlftps=" + urlftps + ", urlsftp=" + urlsftp + ", ippnfsim=" + + ippnfsim + ", typefileserver=" + typefileserver + "]"; } - - } 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 21717d863..851e6ad1d 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 @@ -36,9 +36,9 @@ public class SimulatorFactory { PnfSimConfig configuration = ConfigurationProvider.getConfigInstance(); String xnfUrl = null; - if (configuration.getDefaultfileserver().equals("sftp")) { + if (configuration.getTypefileserver().equals("sftp")) { xnfUrl = configuration.getUrlsftp() + "/"; - } else if (configuration.getDefaultfileserver().equals("ftps")) { + } else if (configuration.getTypefileserver().equals("ftps")) { xnfUrl = configuration.getUrlftps() + "/"; } -- cgit 1.2.3-korg