summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--robot/resources/holmes_interface.robot28
-rw-r--r--robot/resources/openstack/keystone_interface.robot2
-rw-r--r--robot/resources/portal-sdk/portalDef.robot2
-rw-r--r--robot/testsuites/health-check.robot94
-rw-r--r--robot/testsuites/portalApp.robot1
-rwxr-xr-xrunTags.sh3
6 files changed, 85 insertions, 45 deletions
diff --git a/robot/resources/holmes_interface.robot b/robot/resources/holmes_interface.robot
new file mode 100644
index 00000000..6d30aa04
--- /dev/null
+++ b/robot/resources/holmes_interface.robot
@@ -0,0 +1,28 @@
+*** Settings ***
+Library RequestsLibrary
+Resource global_properties.robot
+
+*** Variables ***
+${MSB_ENDPOINT} ${GLOBAL_MSB_SERVER_PROTOCOL}://${GLOBAL_INJECTED_MSB_IP_ADDR}:${GLOBAL_MSB_SERVER_PORT}
+${HOLMES_RULE_HEALTH_CHECK} /api/holmes-rule-mgmt/v1/healthcheck
+${HOLMES_ENGINE_HEALTH_CHECK} /api/holmes-engine-mgmt/v1/healthcheck
+
+*** Keywords ***
+Run Holmes Rule Mgmt Healthcheck
+ [Documentation] Run Holmes Rule Management Health Check
+ ${resp}= Run Holmes Get Request ${HOLMES_RULE_HEALTH_CHECK}
+ Should Be Equal As Integers ${resp.status_code} 200
+
+Run Holmes Engine Mgmt Healthcheck
+ [Documentation] Run Holmes Engine Management Health Check
+ ${resp}= Run Holmes Get Request ${HOLMES_ENGINE_HEALTH_CHECK}
+ Should Be Equal As Integers ${resp.status_code} 200
+
+Run Holmes Get Request
+ [Arguments] ${data_path}
+ [Documentation] Runs Holmes Get request
+ ${session}= Create Session holmes ${MSB_ENDPOINT}
+ ${resp}= Get Request holmes ${data_path}
+ Should Be Equal As Integers ${resp.status_code} 200
+ Log Received response from server ${resp.text}
+ [Return] ${resp}
diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot
index f3e017ce..fa37733c 100644
--- a/robot/resources/openstack/keystone_interface.robot
+++ b/robot/resources/openstack/keystone_interface.robot
@@ -104,7 +104,7 @@ Set Openstack Credentials
Get Openstack Credentials
[Documentation] Returns the Decripted Password and openstack username using same api_key.txt as SO
- ${DECRYPTED_OPENSTACK_PASSWORD}= Run echo -n ${GLOBAL_INJECTED_OPENSTACK_API_KEY} | xxd -r -p | openssl enc -aes-128-ecb -d -nopad -nosalt -K aa3871669d893c7fb8abbcda31b88b4f | tr -d '\x08'
+ ${DECRYPTED_OPENSTACK_PASSWORD}= Run echo -n ${GLOBAL_INJECTED_OPENSTACK_API_KEY} | xxd -r -p | openssl enc -aes-128-ecb -d -nosalt -K aa3871669d893c7fb8abbcda31b88b4f | tr -d '\x08'
[Return] ${GLOBAL_INJECTED_OPENSTACK_USERNAME} ${DECRYPTED_OPENSTACK_PASSWORD}
diff --git a/robot/resources/portal-sdk/portalDef.robot b/robot/resources/portal-sdk/portalDef.robot
index b0ee9c9c..0fb9e771 100644
--- a/robot/resources/portal-sdk/portalDef.robot
+++ b/robot/resources/portal-sdk/portalDef.robot
@@ -42,7 +42,7 @@ ${GLOBAL_SELENIUM_BROWSER} chrome
${GLOBAL_SELENIUM_BROWSER_CAPABILITIES} Create Dictionary
${GLOBAL_SELENIUM_DELAY} 0
${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} 10
-${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} 120
+${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} 180
${GLOBAL_OPENSTACK_HEAT_SERVICE_TYPE} orchestration
${GLOBAL_OPENSTACK_CINDER_SERVICE_TYPE} volume
${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE} compute
diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index d2dcb990..3d653064 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -1,9 +1,8 @@
*** Settings ***
-Test Timeout 10 second
-Documentation Testing ecomp components are available via calls.
+Documentation Testing ecomp components are available via calls.
...
-... Testing ecomp components are available via calls.
-
+... Testing ecomp components are available via calls.
+Test Timeout 10 second
Resource ../resources/dcae_interface.robot
Resource ../resources/sdngc_interface.robot
Resource ../resources/aai/aai_interface.robot
@@ -27,6 +26,7 @@ Resource ../resources/oof_interface.robot
Resource ../resources/sms_interface.robot
Resource ../resources/dr_interface.robot
Resource ../resources/pomba_interface.robot
+Resource ../resources/holmes_interface.robot
*** Test Cases ***
Basic A&AI Health Check
@@ -58,7 +58,7 @@ Basic DCAE Health Check
Run DCAE Health Check
Basic DMAAP Data Router Health Check
- [Tags] health core datarouter
+ [Tags] health core datarouter
Run DR Health Check
Basic DMAAP Message Router Health Check
@@ -78,7 +78,7 @@ Basic Log Kibana Health Check
Run Log Kibana Health Check
Basic Log Logstash Health Check
- [Tags] health small oom
+ [Tags] health small oom
Run Log Logstash Health Check
Basic Microservice Bus Health Check
@@ -86,24 +86,24 @@ Basic Microservice Bus Health Check
Run MSB Health Check
Basic Multicloud API Health Check
- [Tags] health multicloud small
- Run MSB Get Request /api/multicloud/v0/swagger.json
+ [Tags] health multicloud small
+ Run MSB Get Request /api/multicloud/v0/swagger.json
Basic Multicloud-ocata API Health Check
[Tags] health multicloud small
- Run MSB Get Request /api/multicloud-ocata/v0/swagger.json
+ Run MSB Get Request /api/multicloud-ocata/v0/swagger.json
Basic Multicloud-pike API Health Check
[Tags] health multicloud small
- Run MSB Get Request /api/multicloud-pike/v0/swagger.json
+ Run MSB Get Request /api/multicloud-pike/v0/swagger.json
Basic Multicloud-titanium_cloud API Health Check
[Tags] health multicloud small
- Run MSB Get Request /api/multicloud-titaniumcloud/v1/swagger.json
+ Run MSB Get Request /api/multicloud-titaniumcloud/v1/swagger.json
Basic Multicloud-vio API Health Check
- [Tags] health multicloud small
- Run MSB Get Request /api/multicloud-vio/v0/swagger.json
+ [Tags] health multicloud small
+ Run MSB Get Request /api/multicloud-vio/v0/swagger.json
Basic OOF-Homing Health Check
[Tags] health medium
@@ -146,72 +146,72 @@ Basic SO Health Check
Run SO Global Health Check
Basic UseCaseUI API Health Check
- [Tags] health api medium
- Run MSB Get Request /iui/usecaseui/
+ [Tags] health api medium
+ Run MSB Get Request /iui/usecaseui/
Basic VFC catalog API Health Check
[Tags] health api
- Run MSB Get Request /api/catalog/v1/swagger.json
+ Run MSB Get Request /api/catalog/v1/swagger.json
Basic VFC emsdriver API Health Check
[Tags] health 3rdparty
- Run MSB Get Request /api/emsdriver/v1/swagger.json
+ Run MSB Get Request /api/emsdriver/v1/swagger.json
Basic VFC gvnfmdriver API Health Check
[Tags] health 3rdparty
- Run MSB Get Request /api/gvnfmdriver/v1/swagger.json
+ Run MSB Get Request /api/gvnfmdriver/v1/swagger.json
Basic VFC huaweivnfmdriver API Health Check
[Tags] health 3rdparty
- Run MSB Get Request /api/huaweivnfmdriver/v1/swagger.json
+ Run MSB Get Request /api/huaweivnfmdriver/v1/swagger.json
Basic VFC jujuvnfmdriver API Health Check
[Tags] health 3rdparty
- Run MSB Get Request /api/jujuvnfmdriver/v1/swagger.json
+ Run MSB Get Request /api/jujuvnfmdriver/v1/swagger.json
Basic VFC multivimproxy API Health Check
[Tags] health 3rdparty
- Run MSB Get Request /api/multivimproxy/v1/swagger.json
+ Run MSB Get Request /api/multivimproxy/v1/swagger.json
Basic VFC nokiavnfmdriver API Health Check
- [Tags] health 3rdparty
- Run MSB Get Request /api/nokiavnfmdriver/v1/swagger.json
+ [Tags] health 3rdparty
+ Run MSB Get Request /api/nokiavnfmdriver/v1/swagger.json
Basic VFC nokiav2driver API Health Check
- [Tags] health 3rdparty
- Run MSB Get Request /api/NokiaSVNFM/v1/swagger.json
+ [Tags] health 3rdparty
+ Run MSB Get Request /api/NokiaSVNFM/v1/swagger.json
Basic VFC nslcm API Health Check
- [Tags] health api
- Run MSB Get Request /api/nslcm/v1/swagger.json
+ [Tags] health api
+ Run MSB Get Request /api/nslcm/v1/swagger.json
Basic VFC resmgr API Health Check
- [Tags] health api
- Run MSB Get Request /api/resmgr/v1/swagger.json
+ [Tags] health api
+ Run MSB Get Request /api/resmgr/v1/swagger.json
Basic VFC vnflcm API Health Check
- [Tags] health api
- Run MSB Get Request /api/vnflcm/v1/swagger.json
+ [Tags] health api
+ Run MSB Get Request /api/vnflcm/v1/swagger.json
Basic VFC vnfmgr API Health Check
- [Tags] health api
- Run MSB Get Request /api/vnfmgr/v1/swagger.json
+ [Tags] health api
+ Run MSB Get Request /api/vnfmgr/v1/swagger.json
Basic VFC vnfres API Health Check
- [Tags] health api
- Run MSB Get Request /api/vnfres/v1/swagger.json
+ [Tags] health api
+ Run MSB Get Request /api/vnfres/v1/swagger.json
Basic VFC workflow API Health Check
- [Tags] health api
- Run MSB Get Request /api/workflow/v1/swagger.json
+ [Tags] health api
+ Run MSB Get Request /api/workflow/v1/swagger.json
Basic VFC ztesdncdriver API Health Check
- [Tags] health 3rdparty
- Run MSB Get Request /api/ztesdncdriver/v1/swagger.json
+ [Tags] health 3rdparty
+ Run MSB Get Request /api/ztesdncdriver/v1/swagger.json
Basic VFC ztevnfmdriver API Health Check
- [Tags] health 3rdparty
- Run MSB Get Request /api/ztevnfmdriver/v1/swagger.json
+ [Tags] health 3rdparty
+ Run MSB Get Request /api/ztevnfmdriver/v1/swagger.json
Basic VID Health Check
[Tags] health small
@@ -223,7 +223,7 @@ Basic VNFSDK Health Check
Health Distribution Test
[Tags] healthdist
- [Timeout] 600
+ [Timeout] 600
Model Distribution For Directory vFW
Portal Login Tests
@@ -232,5 +232,13 @@ Portal Login Tests
Portal Application Access Tests
[Tags] healthportalapp
- [Timeout] 180
+ [Timeout] 180
Run Portal Application Access Tests
+
+Basic Holmes Rule Management API Health Check
+ [Tags] health small
+ Run Holmes Rule Mgmt Health Check
+
+Basic Holmes Engine Management API Health Check
+ [Tags] health small
+ Run Holmes Engine Mgmt Health Check
diff --git a/robot/testsuites/portalApp.robot b/robot/testsuites/portalApp.robot
index 971f48c2..b8855ec6 100644
--- a/robot/testsuites/portalApp.robot
+++ b/robot/testsuites/portalApp.robot
@@ -8,6 +8,7 @@ Resource ../resources/portal-sdk/portalSdkDef.robot
Login into Portal URL
[TAGS] portal
+ Close All Browsers
Portal admin Login To Portal GUI
Portal Change REST URL Of X-DemoApp
diff --git a/runTags.sh b/runTags.sh
index 57215d17..6f34c6a1 100755
--- a/runTags.sh
+++ b/runTags.sh
@@ -101,4 +101,7 @@ do
fi
done
+# Blindly clean up all outstanding chrome processes
+pkill chrome
+
exit $RET_CODE