diff options
Diffstat (limited to 'test')
6 files changed, 10 insertions, 136 deletions
diff --git a/test/csit/scripts/vid/start_vid_containers.sh b/test/csit/scripts/vid/start_vid_containers.sh index d7f6e38ca..a6a8a6b7a 100644 --- a/test/csit/scripts/vid/start_vid_containers.sh +++ b/test/csit/scripts/vid/start_vid_containers.sh @@ -25,18 +25,18 @@ echo "This is ${WORKSPACE}/test/csit/scripts/vid/start_vid_containers.sh" -RELEASE=vid:1.1-STAGING-latest +RELEASE=vid:latest CONFIG_PATH=${WORKSPACE}/data/clone/vid/lf_config export IP=`ifconfig eth0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'` -export PREFIX='nexus3.onap.org:10001/openecomp' +export PREFIX='nexus3.onap.org:10001/onap' #start Maria-DB docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v ${CONFIG_PATH}/vid-my.cnf:/etc/mysql/my.cnf -v ${CONFIG_PATH}/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql -v /var/lib/mysql -d mariadb:10 #start VID server -docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/openecomp/${RELEASE} +docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/${RELEASE} # WAIT 5 minutes maximum and test every 5 seconds if VID up using HealthCheck API diff --git a/test/csit/tests/sdc/nightly/test1.robot b/test/csit/tests/sdc/nightly/test1.robot index 6d4dc242d..3705d8f5b 100644 --- a/test/csit/tests/sdc/nightly/test1.robot +++ b/test/csit/tests/sdc/nightly/test1.robot @@ -7,9 +7,9 @@ Library json *** Test Cases *** Get Requests health check ok [Tags] get - CreateSession sdc-be http://localhost:8080 + CreateSession sdc-be http://localhost:8181 ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request sdc-be /sdc2/rest/healthCheck headers=&{headers} + ${resp}= Get Request sdc-be /sdc1/rest/healthCheck headers=&{headers} Should Be Equal As Strings ${resp.status_code} 200 @{ITEMS}= Copy List ${resp.json()['componentsInfo']} : FOR ${ELEMENT} IN @{ITEMS} diff --git a/test/csit/tests/sdc/sanity/test1.robot b/test/csit/tests/sdc/sanity/test1.robot index 6d4dc242d..3705d8f5b 100644 --- a/test/csit/tests/sdc/sanity/test1.robot +++ b/test/csit/tests/sdc/sanity/test1.robot @@ -7,9 +7,9 @@ Library json *** Test Cases *** Get Requests health check ok [Tags] get - CreateSession sdc-be http://localhost:8080 + CreateSession sdc-be http://localhost:8181 ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request sdc-be /sdc2/rest/healthCheck headers=&{headers} + ${resp}= Get Request sdc-be /sdc1/rest/healthCheck headers=&{headers} Should Be Equal As Strings ${resp.status_code} 200 @{ITEMS}= Copy List ${resp.json()['componentsInfo']} : FOR ${ELEMENT} IN @{ITEMS} diff --git a/test/csit/tests/sdc/uiSanity/test1.robot b/test/csit/tests/sdc/uiSanity/test1.robot index 6d4dc242d..3705d8f5b 100644 --- a/test/csit/tests/sdc/uiSanity/test1.robot +++ b/test/csit/tests/sdc/uiSanity/test1.robot @@ -7,9 +7,9 @@ Library json *** Test Cases *** Get Requests health check ok [Tags] get - CreateSession sdc-be http://localhost:8080 + CreateSession sdc-be http://localhost:8181 ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request sdc-be /sdc2/rest/healthCheck headers=&{headers} + ${resp}= Get Request sdc-be /sdc1/rest/healthCheck headers=&{headers} Should Be Equal As Strings ${resp.status_code} 200 @{ITEMS}= Copy List ${resp.json()['componentsInfo']} : FOR ${ELEMENT} IN @{ITEMS} diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml index 0136a276c..442d3fcaa 100644 --- a/test/mocks/pnfsimulator/pom.xml +++ b/test/mocks/pnfsimulator/pom.xml @@ -114,12 +114,6 @@ <dependency> <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>${junit.jupiter.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> <version>5.1.1</version> <scope>test</scope> @@ -321,6 +315,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> + <version>0.8.1</version> <configuration> <excludes> <exclude>org/onap/pnfsimulator/Main.class</exclude> 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 deleted file mode 100644 index 3c8459473..000000000 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ParamsValidator.java +++ /dev/null @@ -1,121 +0,0 @@ -/*- - * ============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; -import static org.onap.pnfsimulator.message.MessageConstants.PNF_OAM_IPV4_ADDRESS; -import static org.onap.pnfsimulator.message.MessageConstants.PNF_OAM_IPV6_ADDRESS; -import static org.onap.pnfsimulator.message.MessageConstants.PNF_SERIAL_NUMBER; -import static org.onap.pnfsimulator.message.MessageConstants.PNF_VENDOR_NAME; -import static org.onap.pnfsimulator.message.MessageConstants.TEST_DURATION; -import static org.onap.pnfsimulator.message.MessageConstants.VES_SERVER_URL; - -import com.google.common.collect.ImmutableMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.function.BiPredicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import org.apache.commons.lang3.StringUtils; -import org.json.JSONObject; - - -public class ParamsValidator { - - private final static String MISSING_PARAMS_MESSAGE = "Following mandatory params are missing:\n"; - - private final Map<String, BiPredicate<String, JSONObject>> simulatorParamsValidators = ImmutableMap - .<String, BiPredicate<String, JSONObject>>builder() - .put(VES_SERVER_URL, this::isDefined) - .put(TEST_DURATION, this::isNumeric) - .put(MESSAGE_INTERVAL, this::isNumeric) - .build(); - - private final Map<String, BiPredicate<String, JSONObject>> messageParamsValidators = ImmutableMap - .<String, BiPredicate<String, JSONObject>>builder() - .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 simulatorParams; - private JSONObject messageParams; - - private ParamsValidator(JSONObject simulatorParams, JSONObject messageParams) { - this.simulatorParams = simulatorParams; - this.messageParams = messageParams; - } - - public static ParamsValidator forParams(JSONObject simulatorParams, JSONObject messageParams) { - return new ParamsValidator(simulatorParams, messageParams); - } - - public void validate() throws ValidationException { - - Stream<String> missingSimulatorParams = simulatorParamsValidators - .entrySet() - .stream() - .filter(entry -> !entry.getValue().test(entry.getKey(), simulatorParams)) - .map(Entry::getKey); - - Stream<String> missingMessageParams = messageParamsValidators - .entrySet() - .stream() - .filter(entry -> !entry.getValue().test(entry.getKey(), messageParams)) - .map(Entry::getKey); - - List<String> missingParams = Stream - .concat(missingMessageParams, missingSimulatorParams) - .collect(Collectors.toList()); - - resolveMissingIP(missingParams); - - if (!missingParams.isEmpty()) { - throw new ValidationException(constructMessage(missingParams)); - } - } - - private String constructMessage(List<String> missingParams) { - - return MISSING_PARAMS_MESSAGE + missingParams - .stream() - .collect(Collectors.joining("\n")); - } - - private boolean isNumeric(String param, JSONObject container) { - return isDefined(param, container) && StringUtils.isNumeric(container.getString(param)); - } - - private boolean isDefined(String param, JSONObject container) { - - return container.has(param) && !container.getString(param).isEmpty(); - } - - 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); - missingParams.remove(PNF_OAM_IPV6_ADDRESS); - } - } -} |