diff options
Diffstat (limited to 'test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator')
10 files changed, 62 insertions, 101 deletions
diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/Main.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/Main.java index 8efdfe08d..37f1b21c9 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/Main.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/Main.java @@ -35,7 +35,7 @@ public class Main { private static Logger logger = LogManager.getLogger(Main.class); private static SimulatorFactory simulatorFactory = - new SimulatorFactory(MessageProvider.getInstance(), ParamsValidator.getInstance()); + new SimulatorFactory(MessageProvider.getInstance()); public static void main(String[] args) { @@ -51,7 +51,7 @@ public class Main { } catch (ParseException e) { logger.error("Invalid cli params", e); } catch (ValidationException e){ - logger.error("Missing some mandatory params:", e); + logger.error(e); } } } diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParams.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParams.java index 4c662ab5f..2ca0b5e7b 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParams.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParams.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParamsProvider.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParamsProvider.java index 5c4d219a0..ab705e907 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParamsProvider.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParamsProvider.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java index 194e8960a..5805a88c7 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ @@ -17,11 +17,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - + package org.onap.pnfsimulator.message; public final class MessageConstants { + public static final String EVENT = "event"; public static final String DOMAIN = "domain"; public static final String EVENT_ID = "eventId"; public static final String EVENT_TYPE = "eventType"; diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java index 95f9dfc55..94f5fc167 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ @@ -35,13 +35,12 @@ import static org.onap.pnfsimulator.message.MessageConstants.PRIORITY; import static org.onap.pnfsimulator.message.MessageConstants.SEQUENCE; import static org.onap.pnfsimulator.message.MessageConstants.START_EPOCH_MICROSEC; import static org.onap.pnfsimulator.message.MessageConstants.VERSION; +import static org.onap.pnfsimulator.message.MessageConstants.EVENT; import java.util.Map; import java.util.UUID; import com.google.common.base.Preconditions; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.json.JSONObject; public class MessageProvider { @@ -72,8 +71,11 @@ public class MessageProvider { } }); - root.put(COMMON_EVENT_HEADER, commonEventHeader); - root.put(OTHER_FIELDS, otherFields); + JSONObject event = new JSONObject(); + event.put(COMMON_EVENT_HEADER, commonEventHeader); + event.put(OTHER_FIELDS, otherFields); + + root.put(EVENT, event); return root; } @@ -91,6 +93,7 @@ public class MessageProvider { commonEventHeader.put(START_EPOCH_MICROSEC, timestamp); commonEventHeader.put(INTERNAL_HEADER_FIELDS, new JSONObject()); commonEventHeader.put(VERSION, 3); + commonEventHeader.put("functionalRole", "test_rola"); return commonEventHeader; } diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java index d9559ecb2..ff2ca862a 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ @@ -48,7 +48,7 @@ public class Simulator { Instant endTime = Instant.now().plus(duration); while (runningTimeNotExceeded(endTime)) { try { - logger.info("MESSAGE TO BE SENT:\n{}", messageBody.toString(4)); + logger.info(()-> "MESSAGE TO BE SENT:\n" + messageBody.toString(4)); clientProvider.sendMsg(messageBody.toString()); Thread.sleep(interval.toMillis()); } catch (InterruptedException e) { diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java index 9f3d48ab3..e3a003831 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ @@ -37,19 +37,17 @@ import org.onap.pnfsimulator.simulator.validation.ValidationException; public class SimulatorFactory { private MessageProvider messageProvider; - private ParamsValidator paramsValidator; - public SimulatorFactory(MessageProvider messageProvider, ParamsValidator paramsValidator) { + public SimulatorFactory(MessageProvider messageProvider) { this.messageProvider = messageProvider; - this.paramsValidator = paramsValidator; } public Simulator create(String vesServerUrl, String configFilePath) throws IOException, ValidationException { String configJson = FileUtils.readFileToString(new File(configFilePath), StandardCharsets.UTF_8); JSONObject configObject = new JSONObject(configJson); + ParamsValidator.forObject(configObject).validate(); - paramsValidator.validate(configObject); Duration duration = Duration.ofSeconds(parseJsonField(configObject, TEST_DURATION)); Duration interval = Duration.ofSeconds(parseJsonField(configObject, MESSAGE_INTERVAL)); JSONObject messageBody = messageProvider.createMessage(configObject); diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientProvider.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientProvider.java index 7ff506923..54d2c9fbb 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientProvider.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientProvider.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ParamsValidator.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ParamsValidator.java index 57408660a..6cdb781f1 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ParamsValidator.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ParamsValidator.java @@ -1,23 +1,3 @@ -/*- - * ============LICENSE_START======================================================= - * org.onap.integration - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - package org.onap.pnfsimulator.simulator.validation; import static org.onap.pnfsimulator.message.MessageConstants.MESSAGE_INTERVAL; @@ -28,71 +8,70 @@ import static org.onap.pnfsimulator.message.MessageConstants.PNF_VENDOR_NAME; import static org.onap.pnfsimulator.message.MessageConstants.TEST_DURATION; import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; import java.util.List; -import java.util.function.BiPredicate; +import java.util.Map; +import java.util.Map.Entry; +import java.util.function.Predicate; +import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; public class ParamsValidator { - private final static String MISSING_PARAMS_ERROR = "Some mandatory params are missing"; - private static ParamsValidator instance; - + private final static String MISSING_PARAMS_MESSAGE = "Following mandatory params are missing:\n"; + private final Map<String, Predicate<String>> validators = ImmutableMap + .<String, Predicate<String>>builder() + .put(TEST_DURATION, this::isNumeric) + .put(MESSAGE_INTERVAL, this::isNumeric) + .put(PNF_SERIAL_NUMBER, this::isDefined) + .put(PNF_VENDOR_NAME, this::isDefined) + .put(PNF_OAM_IPV4_ADDRESS, this::isDefined) + .put(PNF_OAM_IPV6_ADDRESS, this::isDefined) + .build(); + + private JSONObject subject; + + private ParamsValidator(JSONObject paramsObject) { + subject = paramsObject; + } - public static ParamsValidator getInstance() { - if (instance == null) { - instance = new ParamsValidator(); - } - return instance; + public static ParamsValidator forObject(JSONObject configObject) { + return new ParamsValidator(configObject); } - public void validate(JSONObject params) throws ValidationException { - ImmutableMap<String, BiPredicate<JSONObject, String>> paramValidators = ImmutableMap - .<String, BiPredicate<JSONObject, String>>builder() - .put(TEST_DURATION, this::isNotNumeric) - .put(MESSAGE_INTERVAL, this::isNotNumeric) - .put(PNF_SERIAL_NUMBER, this::nullOrEmpty) - .put(PNF_VENDOR_NAME, this::nullOrEmpty) - .put(PNF_OAM_IPV4_ADDRESS, this::nullOrEmpty) - .put(PNF_OAM_IPV6_ADDRESS, this::nullOrEmpty) - .build(); - - List<String> missingParams = new ArrayList<>(); - - paramValidators.forEach((param, validator) -> { - if (validator.test(params, param)) { - missingParams.add(param); - } - }); - - clearIPError(missingParams); + public void validate() throws ValidationException { + + List<String> missingParams = validators + .entrySet() + .stream() + .filter(entry -> !entry.getValue().test(entry.getKey())) + .map(Entry::getKey) + .collect(Collectors.toList()); + + resolveMissingIP(missingParams); + if (!missingParams.isEmpty()) { throw new ValidationException(constructMessage(missingParams)); } } private String constructMessage(List<String> missingParams) { - StringBuilder msg = new StringBuilder(MISSING_PARAMS_ERROR); - - missingParams.forEach(param -> { - msg.append('\n'); - msg.append(param); - }); - return msg.toString(); + return MISSING_PARAMS_MESSAGE + missingParams + .stream() + .collect(Collectors.joining("\n")); } - private boolean isNotNumeric(JSONObject params, String param) { - return nullOrEmpty(params, param) || !StringUtils.isNumeric(params.getString(param)); + private boolean isNumeric(String param) { + return isDefined(param) && StringUtils.isNumeric(subject.getString(param)); } - private boolean nullOrEmpty(JSONObject params, String param) { - return !params.has(param) || params.getString(param).isEmpty(); + private boolean isDefined(String param) { + return subject.has(param) && !subject.getString(param).isEmpty(); } - private void clearIPError(List<String> missingParams) { + private void resolveMissingIP(List<String> missingParams) { // if only one IP is missing clear the error if (!(missingParams.contains(PNF_OAM_IPV4_ADDRESS) && missingParams.contains(PNF_OAM_IPV6_ADDRESS))) { missingParams.remove(PNF_OAM_IPV4_ADDRESS); diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java index 086997f85..9855a784e 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java @@ -1,23 +1,3 @@ -/*- - * ============LICENSE_START======================================================= - * org.onap.integration - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - package org.onap.pnfsimulator.simulator.validation; public class ValidationException extends Exception { |