aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/demo.sh54
-rw-r--r--docker/robot_vm_init.sh19
-rw-r--r--robot/assets/templates/web/index.html.template2
-rw-r--r--robot/resources/asdc_interface.robot13
-rw-r--r--robot/resources/demo_preload.robot2
-rw-r--r--robot/resources/msb_interface.robot2
-rw-r--r--robot/resources/so_interface.robot (renamed from robot/resources/mso_interface.robot)28
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot2
-rw-r--r--robot/resources/vid/create_service_instance.robot2
-rw-r--r--robot/resources/vid/create_vid_vnf.robot2
-rw-r--r--robot/testsuites/health-check.robot4
-rw-r--r--robot/testsuites/update_onap_page.robot2
-rw-r--r--version.properties2
13 files changed, 36 insertions, 98 deletions
diff --git a/docker/demo.sh b/docker/demo.sh
deleted file mode 100644
index 98dc123f..00000000
--- a/docker/demo.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# Set the defaults
-if [ $# -eq 0 ];then
- echo "Usage: demo.sh init"
- echo " demo.sh preload <vnf_name> <module_name>"
- echo " demo.sh appc <module_name>"
- exit
-fi
-##
-## if more than 1 tag is supplied, the must be provided with -i or -e
-##
-while [ $# -gt 0 ]
-do
- key="$1"
-
- case $key in
- init)
- TAG="InitDemo"
- shift
- ;;
- preload)
- TAG="PreloadDemo"
- shift
- if [ $# -ne 2 ];then
- echo "Usage: demo.sh preload <vnf_name> <module_name>"
- exit
- fi
- VARIABLES="$VARIABLES -v VNF_NAME:$1"
- shift
- VARIABLES="$VARIABLES -v MODULE_NAME:$1"
- shift
- ;;
- appc)
- TAG="APPCMountPointDemo"
- shift
- if [ $# -ne 1 ];then
- echo "Usage: demo.sh appc <module_name>"
- exit
- fi
- VARIABLES="$VARIABLES -v MODULE_NAME:$1"
- shift
- ;;
- *)
- echo "Usage: demo.sh init"
- echo " demo.sh preload <vnf_name> <module_name>"
- echo " demo.sh appc <module_name>"
- exit
- esac
-done
-
-ETEHOME=/var/opt/OpenECOMP_ETE
-VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/robot_properties_ete.py -V /share/config/robot_preload_parameters.py"
-docker exec openecompete_container ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/demo/${TAG} -i ${TAG} 2> ${TAG}.out \ No newline at end of file
diff --git a/docker/robot_vm_init.sh b/docker/robot_vm_init.sh
deleted file mode 100644
index 582a3f2e..00000000
--- a/docker/robot_vm_init.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-NEXUS_REPO=$(cat /opt/config/nexus_repo.txt)
-
-#
-# Deploy latest robot configuration
-#
-wget --user=$NEXUS_USERNAME --password=$NEXUS_PASSWD --no-check-certificate -O /opt/eteshare/config/robot_properties_ete.py $NEXUS_REPO/org.openecomp.boot/robot_properties_ete.py
-wget --user=$NEXUS_USERNAME --password=$NEXUS_PASSWD --no-check-certificate -O /opt/eteshare/config/robot_preload_parameters.py $NEXUS_REPO/org.openecomp.boot/robot_preload_parameters.py
-wget --user=$NEXUS_USERNAME --password=$NEXUS_PASSWD --no-check-certificate -O /opt/eteshare/config/vm_config2robot.sh $NEXUS_REPO/org.openecomp.boot/vm_config2robot.sh
-/bin/bash /opt/eteshare/config/vm_config2robot.sh
-
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/openecompete
-docker rm -f openecompete_container
-docker run -d --name openecompete_container -v /opt/eteshare:/share -p 88:88 $NEXUS_DOCKER_REPO/openecompete
diff --git a/robot/assets/templates/web/index.html.template b/robot/assets/templates/web/index.html.template
index b9bdd8c4..cf75f28e 100644
--- a/robot/assets/templates/web/index.html.template
+++ b/robot/assets/templates/web/index.html.template
@@ -97,7 +97,7 @@ GLOBAL_INJECTED_PORTAL_IP_ADDR = "${portal}"
GLOBAL_INJECTED_SDC_IP_ADDR = "${sdc}"
GLOBAL_INJECTED_SDNC_IP_ADDR = "${sdnc}"
GLOBAL_INJECTED_VID_IP_ADDR = "${vid}"
-GLOBAL_INJECTED_OPENO_IP_ADDR = "${openo}"
+GLOBAL_INJECTED_MSB_IP_ADDR = "${openo}"
GLOBAL_INJECTED_CLAMP_IP_ADDR = "${clamp}"
GLOBAL_INJECTED_VM_FLAVOR = "${GLOBAL_INJECTED_VM_FLAVOR}"
GLOBAL_INJECTED_VM_IMAGE_NAME = "${GLOBAL_INJECTED_VM_IMAGE_NAME}"
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 0297802f..382821e9 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -103,7 +103,7 @@ Setup ASDC Catalog Resource
Package ASDC Software Product ${software_product_id} ${software_product_version_id}
${software_product_resp}= Get ASDC Software Product ${software_product_id} ${software_product_version_id}
${catalog_resource_id}= Add ASDC Catalog Resource ${license_agreement_id} ${software_product_resp['name']} ${license_model_resp['vendorName']} ${software_product_id}
- ${catalog_resource_id}= Certify ASDC Catalog Resource ${catalog_resource_id} ${ASDC_DESIGNER_USER_ID}
+ ${catalog_resource_id}= Certify ASDC Catalog Resource ${catalog_resource_id} ${ASDC_DESIGNER_USER_ID}
[Return] ${catalog_resource_id}
Add ASDC License Model
[Documentation] Creates an asdc license model and returns its id
@@ -403,20 +403,11 @@ Check Catalog Service Distributed
${det_resp}= Get Catalog Service Distribution Details ${dist_resp['distributionStatusOfServiceList'][0]['distributionID']}
@{ITEMS}= Copy List ${det_resp['distributionStatusList']}
Should Not Be Empty ${ITEMS}
- ${AAI_DEPLOY} Set Variable FALSE
- ${SDNC_DEPLOY} Set Variable FALSE
- ${SO_DEPLOY} Set Variable FALSE
${SO_COMPLETE} Set Variable FALSE
:FOR ${ELEMENT} IN @{ITEMS}
\ Log ${ELEMENT['omfComponentID']}
\ Log ${ELEMENT['status']}
- \ ${SDNC_DEPLOY} Set Variable If (('sdnc-docker' in '${ELEMENT['omfComponentID']}') and ('${ELEMENT['status']}' == 'DEPLOY_OK')) or ('${SDNC_DEPLOY}' == 'TRUE') TRUE
- \ ${SO_DEPLOY} Set Variable If (('mso-docker' in '${ELEMENT['omfComponentID']}') and ('${ELEMENT['status']}' == 'DEPLOY_OK')) or ('${SO_DEPLOY}' == 'TRUE') TRUE
- \ ${AAI_DEPLOY} Set Variable If (('aai-ml' in '${ELEMENT['omfComponentID']}') and ('${ELEMENT['status']}' == 'DEPLOY_OK')) or ('${AAI_DEPLOY}'=='TRUE') TRUE
- \ ${SO_COMPLETE} Set Variable If (('mso-docker' in '${ELEMENT['omfComponentID']}') and ('${ELEMENT['status']}' == 'DISTRIBUTION_COMPLETE_OK')) or ('${SO_COMPLETE}'=='TRUE') TRUE
- Should Be True ( '${SDNC_DEPLOY}'=='TRUE') SDNC Test
- Should Be True ( '${SO_DEPLOY}'=='TRUE') SO Test
- Should Be True ( '${AAI_DEPLOY}'=='TRUE') AAI Test
+ \ ${SO_COMPLETE} Set Variable If (('${ELEMENT['status']}' == 'DISTRIBUTION_COMPLETE_OK')) or ('${SO_COMPLETE}'=='TRUE') TRUE
Should Be True ( '${SO_COMPLETE}'=='TRUE') SO Test
Get Catalog Service Distribution Details
[Documentation] gets an asdc catalog Service distrbution details
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index bab21be1..f87cc366 100644
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -4,7 +4,7 @@ Documentation This test template encapsulates the VNF Orchestration use case.
Resource test_templates/model_test_template.robot
Resource test_templates/vnf_orchestration_test_template.robot
Resource asdc_interface.robot
-Resource mso_interface.robot
+Resource so_interface.robot
Resource vid/vid_interface.robot
Resource policy_interface.robot
diff --git a/robot/resources/msb_interface.robot b/robot/resources/msb_interface.robot
index 53b67da6..81224efe 100644
--- a/robot/resources/msb_interface.robot
+++ b/robot/resources/msb_interface.robot
@@ -6,7 +6,7 @@ Resource global_properties.robot
*** Variables ***
${MSB_HEALTH_CHECK_PATH} /iui/microservices/default.html
-${MSB_ENDPOINT} ${GLOBAL_MSB_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OPENO_IP_ADDR}:${GLOBAL_MSB_SERVER_PORT}
+${MSB_ENDPOINT} ${GLOBAL_MSB_SERVER_PROTOCOL}://${GLOBAL_INJECTED_MSB_IP_ADDR}:${GLOBAL_MSB_SERVER_PORT}
*** Keywords ***
diff --git a/robot/resources/mso_interface.robot b/robot/resources/so_interface.robot
index bded5282..70faf3bf 100644
--- a/robot/resources/mso_interface.robot
+++ b/robot/resources/so_interface.robot
@@ -7,16 +7,36 @@ Library Collections
Resource global_properties.robot
Resource ../resources/json_templater.robot
*** Variables ***
-${MSO_HEALTH_CHECK_PATH} /ecomp/mso/infra/globalhealthcheck
+${MSO_HEALTH_CHECK_PATH} /manage/health
${MSO_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_SERVER_PORT}
+${SO_APIHAND_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_APIHAND_SERVER_PORT}
+${SO_ASDCHAND_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO__ASDCHAND_SERVER_PORT}
+${SO_BPMN_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_BPMN_SERVER_PORT}
+${SO_CATDB_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO__CATDB_SERVER_PORT}
+${SO_OPENSTACK_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_OPENSTACK_SERVER_PORT}
+${SO_REQDB_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_REQDB_SERVER_PORT}
+${SO_SDNC_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_SDNC_SERVER_PORT}
+${SO_VFC_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_VFC_SERVER_PORT}
*** Keywords ***
-Run MSO Health Check
+Run SO Global Health Check
+ Run SO Container Health Check API_HANDLER ${SO_APIHAND_ENDPOINT}
+ Run SO Container Health Check ASDC_HANDLER ${SO_ASDCHAND_ENDPOINT}
+ Run SO Container Health Check BPMN_INFRA ${SO_BPMN_ENDPOINT}
+ Run SO Container Health Check CATALOG_DB ${SO_CATDB_ENDPOINT}
+ Run SO Container Health Check OPENSTACK_INFRA ${SO_OPENSTACK_ENDPOINT}
+ Run SO Container Health Check REQUEST_DB ${SO_REQDB_ENDPOINT}
+ Run SO Container Health Check SDNC_INFRA ${SO_SDNC_ENDPOINT}
+ Run SO Container Health Check VFC_INFRA ${SO_VFC_ENDPOINT}
+
+
+Run SO Container Health Check
[Documentation] Runs an MSO global health check
+ [Arguments] ${so_endpoint_label} ${so_endpoint}
${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD}
- ${session}= Create Session mso ${MSO_ENDPOINT}
+ ${session}= Create Session mso ${so_endpoint}
${uuid}= Generate UUID
- ${headers}= Create Dictionary Accept=text/html Content-Type=text/html X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID}
+ ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID}
${resp}= Get Request mso ${MSO_HEALTH_CHECK_PATH} headers=${headers}
Should Be Equal As Strings ${resp.status_code} 200
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index bca5c5af..53d56962 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -42,7 +42,7 @@ ${SERVICE_INSTANCE_ID}
*** Keywords ***
Orchestrate VNF Template
[Documentation] Use openECOMP to Orchestrate a service.
- [Arguments] ${customer_name} ${service} ${product_family} ${tenant} ${delete_flag}='DELETE'
+ [Arguments] ${customer_name} ${service} ${product_family} ${tenant} ${delete_flag}=DELETE
Orchestrate VNF ${customer_name} ${service} ${product_family} ${tenant}
Run Keyword If '${delete_flag}' == 'DELETE' Delete VNF
diff --git a/robot/resources/vid/create_service_instance.robot b/robot/resources/vid/create_service_instance.robot
index d57abc4b..76597260 100644
--- a/robot/resources/vid/create_service_instance.robot
+++ b/robot/resources/vid/create_service_instance.robot
@@ -8,7 +8,7 @@ Library UUID
Library String
Library DateTime
-Resource ../mso_interface.robot
+Resource ../so_interface.robot
Resource vid_interface.robot
*** Keywords ***
diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot
index a7cc8e1f..5997b07e 100644
--- a/robot/resources/vid/create_vid_vnf.robot
+++ b/robot/resources/vid/create_vid_vnf.robot
@@ -7,7 +7,7 @@ Library String
Library DateTime
Library RequestsLibrary
-Resource ../mso_interface.robot
+Resource ../so_interface.robot
Resource vid_interface.robot
*** Keywords ***
diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index bad08850..14ae4e58 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -9,7 +9,7 @@ Resource ../resources/sdngc_interface.robot
Resource ../resources/aai/aai_interface.robot
Resource ../resources/vid/vid_interface.robot
Resource ../resources/policy_interface.robot
-Resource ../resources/mso_interface.robot
+Resource ../resources/so_interface.robot
Resource ../resources/asdc_interface.robot
Resource ../resources/appc_interface.robot
Resource ../resources/portal_interface.robot
@@ -122,7 +122,7 @@ Basic SDNC Health Check
Basic SO Health Check
[Tags] health core
- Run MSO Health Check
+ Run SO Global Health Check
Basic UseCaseUI API Health Check
[Tags] health api
diff --git a/robot/testsuites/update_onap_page.robot b/robot/testsuites/update_onap_page.robot
index 9f99d6f5..f8019397 100644
--- a/robot/testsuites/update_onap_page.robot
+++ b/robot/testsuites/update_onap_page.robot
@@ -39,7 +39,7 @@ Update ONAP Page
Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_PORTAL_IP_ADDR}=portal
Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SDC_IP_ADDR}=sdc
Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SDNC_IP_ADDR}=sdnc
- Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_OPENO_IP_ADDR}=openo
+ Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_MSB_IP_ADDR}=openo
Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_CLAMP_IP_ADDR}=clamp
Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_VID_IP_ADDR}=vid
Set To Dictionary ${oam_ip_map} 10.0.4.105=dcae_cdap
diff --git a/version.properties b/version.properties
index e971e823..e3f46495 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=1
minor=3
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}