diff options
Diffstat (limited to 'src/main/java/org/onap/a1pesimulator/service')
4 files changed, 22 insertions, 21 deletions
diff --git a/src/main/java/org/onap/a1pesimulator/service/cell/RanCellStateService.java b/src/main/java/org/onap/a1pesimulator/service/cell/RanCellStateService.java index d69629e..274c6d1 100644 --- a/src/main/java/org/onap/a1pesimulator/service/cell/RanCellStateService.java +++ b/src/main/java/org/onap/a1pesimulator/service/cell/RanCellStateService.java @@ -105,13 +105,7 @@ public class RanCellStateService { } private Optional<CellDetails> getCell(String identifier) { - CellDetails cell = null; - try { - cell = cellsHolder.getCellById(identifier); - } catch (RuntimeException e) { - log.info("Exception was thrown: ", e); - } - + CellDetails cell = cellsHolder.getCellById(identifier); if (cell == null) { return Optional.empty(); } diff --git a/src/main/java/org/onap/a1pesimulator/service/cell/RanCellsHolder.java b/src/main/java/org/onap/a1pesimulator/service/cell/RanCellsHolder.java index 86fa32c..5cc04b2 100644 --- a/src/main/java/org/onap/a1pesimulator/service/cell/RanCellsHolder.java +++ b/src/main/java/org/onap/a1pesimulator/service/cell/RanCellsHolder.java @@ -24,15 +24,18 @@ import java.util.TreeMap; import java.util.function.BinaryOperator; import java.util.function.Predicate; import java.util.stream.Collectors; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; + import org.onap.a1pesimulator.data.cell.CellDetails; import org.onap.a1pesimulator.data.cell.CellList.Cell; import org.onap.a1pesimulator.data.cell.CellList.CellData; +import org.onap.a1pesimulator.exception.CellNotFoundException; import org.onap.a1pesimulator.util.TopologyReader; import org.springframework.stereotype.Service; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + @Service public class RanCellsHolder { @@ -52,7 +55,7 @@ public class RanCellsHolder { public CellDetails getCellById(String id) { if (!cellDetailsById.containsKey(id)) { - throw new RuntimeException(MessageFormat.format("Cell not found: {0}", id)); + throw new CellNotFoundException(MessageFormat.format("Cell not found: {0}", id)); } return cellDetailsById.get(id); } diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/FtpServerService.java b/src/main/java/org/onap/a1pesimulator/service/fileready/FtpServerService.java index a4145d5..f5627d1 100644 --- a/src/main/java/org/onap/a1pesimulator/service/fileready/FtpServerService.java +++ b/src/main/java/org/onap/a1pesimulator/service/fileready/FtpServerService.java @@ -13,6 +13,7 @@ import java.util.zip.GZIPOutputStream; import org.onap.a1pesimulator.data.fileready.FileData; import org.onap.a1pesimulator.exception.NotUploadedToFtpException; +import org.onap.a1pesimulator.util.VnfConfigReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -37,15 +38,9 @@ public class FtpServerService { @Value("${xml.pm.location}") private String xmlPmLocation; - @Value("${ftp.server.url}") - private String ftpServerUrl; - @Value("${ftp.server.protocol}") private String ftpServerProtocol; - @Value("${ftp.server.port}") - private String ftpServerPort; - @Value("${ftp.server.filepath}") private String ftpServerFilepath; @@ -55,6 +50,12 @@ public class FtpServerService { @Value("${ftp.server.password}") private String ftpServerPassword; + private VnfConfigReader vnfConfigReader; + + public FtpServerService(VnfConfigReader vnfConfigReader) { + this.vnfConfigReader = vnfConfigReader; + } + public Mono<FileData> uploadFileToFtp(FileData fileData) { return Mono.just(fileData) .flatMap(this::tryToCompressFile) @@ -146,7 +147,7 @@ public class FtpServerService { SSHClient client = new SSHClient(); try { client.addHostKeyVerifier(new PromiscuousVerifier()); - client.connect(ftpServerUrl, Integer.parseInt(ftpServerPort)); + client.connect(vnfConfigReader.getVnfConfig().getFtpHost(), Integer.parseInt(vnfConfigReader.getVnfConfig().getFtpPort())); client.authPassword(ftpServerUsername, ftpServerPassword); return client; } catch (IOException e) { @@ -180,7 +181,8 @@ public class FtpServerService { * @return for example: "sftp://foo:pass@106.120.119.170:2222/upload/" */ public String getFtpPath() { - return ftpServerProtocol + "://" + ftpServerUsername + ":" + ftpServerPassword + "@" + ftpServerUrl + ":" + ftpServerPort + "/" + ftpServerFilepath + return ftpServerProtocol + "://" + ftpServerUsername + ":" + ftpServerPassword + "@" + vnfConfigReader.getVnfConfig().getFtpHost() + ":" + + vnfConfigReader.getVnfConfig().getFtpPort() + "/" + ftpServerFilepath + "/"; } diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java b/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java index 131f792..c647811 100644 --- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java +++ b/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java @@ -99,8 +99,10 @@ public class RanVesHolder { * Sends the last report after specific cell was stopped */ private void sendLastReport(String cellId) { - log.trace("Send last report after stop for cell: {}", cellId); - ranFileReadyHolder.createPMBulkFileAndSendFileReadyMessageForCellId(cellId); + if (nonNull(threadSendReportFunction)) { + log.trace("Send last report after stop for cell: {}", cellId); + ranFileReadyHolder.createPMBulkFileAndSendFileReadyMessageForCellId(cellId); + } } Map<String, RanPeriodicEvent> getPeriodicEventsCache() { |