From ffe5abf688b12c715bdfdc920f327d822cc862d1 Mon Sep 17 00:00:00 2001 From: DR695H Date: Thu, 20 Jun 2019 16:58:49 -0400 Subject: move appc assets out of templates Issue-ID: TEST-158 Change-Id: I688d02eaec893cafc58c7eae24cf653f7f085c02 Signed-off-by: DR695H --- ...oadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml | 31 +++++++++++++++ ...n_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json | 46 ++++++++++++++++++++++ ...LoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml | 9 +++++ ...oadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml | 31 --------------- ...n_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json | 46 ---------------------- ...LoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml | 9 ----- robot/resources/appc_interface.robot | 6 +-- robot/resources/so/direct_instantiate.robot | 2 +- robot/testsuites/demo.robot | 1 - robot/testsuites/oof/oof-cmso.robot | 2 +- robot/testsuites/oof/oof-has.robot | 2 +- robot/testsuites/oof/oof-osdf.robot | 2 +- runEteTag.sh | 2 +- runTags.sh | 2 +- 14 files changed, 95 insertions(+), 96 deletions(-) create mode 100644 robot/assets/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml create mode 100644 robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json create mode 100644 robot/assets/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml delete mode 100644 robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml delete mode 100644 robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json delete mode 100644 robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml diff --git a/robot/assets/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml b/robot/assets/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml new file mode 100644 index 00000000..8b308dcb --- /dev/null +++ b/robot/assets/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml @@ -0,0 +1,31 @@ +--- +kind: "Property Definition" +version: V1 +vnf-parameter-list: +- name: ip-addr + type: null + description: null + required: "true" + default: null + source: Manual + rule-type: null + request-keys: null + response-keys: null +- name: oam-ip-addr + type: null + description: null + required: "true" + default: null + source: Manual + rule-type: null + request-keys: null + response-keys: null +- name: enabled + type: null + description: null + required: "true" + default: null + source: Manual + rule-type: null + request-keys: null + response-keys: null diff --git a/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json b/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json new file mode 100644 index 00000000..137cb7a6 --- /dev/null +++ b/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json @@ -0,0 +1,46 @@ +{ + "reference_data": [ + { + "action": "ConfigScaleOut", + "action-level": "vnf", + "scope": { + "vnf-type": "vLoadBalancer/vLoadBalancer-test 0", + "vnfc-type": "" + }, + "template": "Y", + "vm": [], + "device-protocol": "NETCONF-XML", + "user-name": "admin", + "port-number": "2831", + "artifact-list": [ + { + "artifact-name": "template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml", + "artifact-type": "config_template" + }, + { + "artifact-name": "pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml", + "artifact-type": "parameter_definitions" + } + ], + "template-id-list": [ + "vLB" + ], + "template-id": "vLB", + "scopeType": "vnf-type" + }, + { + "action": "AllAction", + "action-level": "vnf", + "scope": { + "vnf-type": "vLoadBalancer/vLoadBalancer-test 0", + "vnfc-type": "" + }, + "artifact-list": [ + { + "artifact-name": "reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json", + "artifact-type": "reference_template" + } + ] + } + ] +} \ No newline at end of file diff --git a/robot/assets/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml b/robot/assets/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml new file mode 100644 index 00000000..61d24976 --- /dev/null +++ b/robot/assets/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml @@ -0,0 +1,9 @@ + + + + ${ip-addr} + ${oam-ip-addr} + ${enabled} + + + \ No newline at end of file diff --git a/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml b/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml deleted file mode 100644 index 8b308dcb..00000000 --- a/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -kind: "Property Definition" -version: V1 -vnf-parameter-list: -- name: ip-addr - type: null - description: null - required: "true" - default: null - source: Manual - rule-type: null - request-keys: null - response-keys: null -- name: oam-ip-addr - type: null - description: null - required: "true" - default: null - source: Manual - rule-type: null - request-keys: null - response-keys: null -- name: enabled - type: null - description: null - required: "true" - default: null - source: Manual - rule-type: null - request-keys: null - response-keys: null diff --git a/robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json b/robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json deleted file mode 100644 index 137cb7a6..00000000 --- a/robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "reference_data": [ - { - "action": "ConfigScaleOut", - "action-level": "vnf", - "scope": { - "vnf-type": "vLoadBalancer/vLoadBalancer-test 0", - "vnfc-type": "" - }, - "template": "Y", - "vm": [], - "device-protocol": "NETCONF-XML", - "user-name": "admin", - "port-number": "2831", - "artifact-list": [ - { - "artifact-name": "template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml", - "artifact-type": "config_template" - }, - { - "artifact-name": "pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml", - "artifact-type": "parameter_definitions" - } - ], - "template-id-list": [ - "vLB" - ], - "template-id": "vLB", - "scopeType": "vnf-type" - }, - { - "action": "AllAction", - "action-level": "vnf", - "scope": { - "vnf-type": "vLoadBalancer/vLoadBalancer-test 0", - "vnfc-type": "" - }, - "artifact-list": [ - { - "artifact-name": "reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json", - "artifact-type": "reference_template" - } - ] - } - ] -} \ No newline at end of file diff --git a/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml b/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml deleted file mode 100644 index 61d24976..00000000 --- a/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - ${ip-addr} - ${oam-ip-addr} - ${enabled} - - - \ No newline at end of file diff --git a/robot/resources/appc_interface.robot b/robot/resources/appc_interface.robot index 7aed6e1c..94898f0e 100644 --- a/robot/resources/appc_interface.robot +++ b/robot/resources/appc_interface.robot @@ -12,9 +12,9 @@ ${APPC_HEALTHCHECK_OPERATION_PATH} /operations/SLI-API:healthcheck ${APPC_CREATE_MOUNTPOINT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/ ${APPC_MOUNT_XML} appc/vnf_mount.jinja ${APPC_ENDPOINT} ${GLOBAL_APPC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_APPC_IP_ADDR}:${GLOBAL_APPC_SERVER_PORT} -${APPC_CDT_Config_Scaleout} ${EXECDIR}/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml -${APPC_CDT_Config_Scaleout_PD} ${EXECDIR}/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml -${APPC_CDT_Config_Scaleout_REF} ${EXECDIR}/robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json +${APPC_CDT_Config_Scaleout} ${EXECDIR}/robot/assets/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml +${APPC_CDT_Config_Scaleout_PD} ${EXECDIR}/robot/assets/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml +${APPC_CDT_Config_Scaleout_REF} ${EXECDIR}/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json ${APPC_CDT_Config_Scaleout_REF_name} reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json ${APPC_CDT_ENDPOINT} ${GLOBAL_APPC_CDT_SERVER_PROTOCOL}://${GLOBAL_INJECTED_APPC_CDT_IP_ADDR}:${GLOBAL_APPC_CDT_SERVER_PORT} ${APPC_CDT_LOGIN_URL} ${APPC_CDT_ENDPOINT}/index.html diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot index 72a92df0..5bbac10a 100644 --- a/robot/resources/so/direct_instantiate.robot +++ b/robot/resources/so/direct_instantiate.robot @@ -13,7 +13,7 @@ Instantiate Service Direct To SO [Documentation] Creates an entire service from a CSAR [Arguments] ${service} ${csar_file} ${vnf_template_file} # Example: ${csar_file}= Set Variable /tmp/csar/service-Vfw20190413133734-csar.csar - # Example: ${vnf_template_file}= Set Variable /var/opt/ONAP/testsuite/eteutils/vcpeutils/preload_templates/template.vfw_vfmodule.json + # Example: ${vnf_template_file}= Set Variable /var/opt/ONAP/testsuite/vcpeutils/preload_templates/template.vfw_vfmodule.json ${name_suffix}= Get Current Date exclude_millis=True ${name_suffix}= Evaluate '${name_suffix}'.replace(' ','') ${name_suffix}= Evaluate '${name_suffix}'.replace(':','') diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot index 412c9cd1..8a11ab88 100644 --- a/robot/testsuites/demo.robot +++ b/robot/testsuites/demo.robot @@ -75,7 +75,6 @@ Preload APPC CDT GUI [Tags] APPCCDTPreloadDemo Setup Browser Preload APPC CDT GUI -# Preload APPC CDT GUI demo reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json ${EXECDIR}/robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json ${EXECDIR}/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml ${EXECDIR}/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml Distribute vFWNG CDS Model [Documentation] Distribute vFWNG for CDS diff --git a/robot/testsuites/oof/oof-cmso.robot b/robot/testsuites/oof/oof-cmso.robot index 98cf63aa..e7d2aaee 100644 --- a/robot/testsuites/oof/oof-cmso.robot +++ b/robot/testsuites/oof/oof-cmso.robot @@ -2,7 +2,7 @@ Documentation Testing OOF-CMSO ... ... Testing OOF-CMSO Future Schedule ETE -Resource ../resources/oof_interface.robot +Resource ../../resources/oof_interface.robot *** Test Cases *** Basic OOF-CMSO CSIT diff --git a/robot/testsuites/oof/oof-has.robot b/robot/testsuites/oof/oof-has.robot index f0dd0475..64e52d95 100644 --- a/robot/testsuites/oof/oof-has.robot +++ b/robot/testsuites/oof/oof-has.robot @@ -2,7 +2,7 @@ Documentation Testing OOF-HAS ... ... Testing OOF-HAS SEND PLANS -Resource ../resources/oof_interface.robot +Resource ../../resources/oof_interface.robot *** Test Cases *** Basic OOF-HAS CSIT diff --git a/robot/testsuites/oof/oof-osdf.robot b/robot/testsuites/oof/oof-osdf.robot index 72e04c0f..4bcccc0f 100644 --- a/robot/testsuites/oof/oof-osdf.robot +++ b/robot/testsuites/oof/oof-osdf.robot @@ -2,7 +2,7 @@ Documentation Testing OOF-HAS ... ... Testing OOF-HAS SEND PLANS -Resource ../resources/oof_interface.robot +Resource ../../resources/oof_interface.robot *** Test Cases *** Basic OOF-OSDF CSIT for Homing diff --git a/runEteTag.sh b/runEteTag.sh index 7cbe03fc..7d4b0ec8 100755 --- a/runEteTag.sh +++ b/runEteTag.sh @@ -72,7 +72,7 @@ OUTPUT_FOLDER=/share/logs/${SOAKSUBFOLDER}runEteTag_$TEST_NUMBER mkdir -p $OUTPUT_FOLDER INSTALL_DIR="/var/opt/ONAP" -ROBOT_LIBS=./robot/library:./robot/library/eteutils:./robot/library/heatbridge +ROBOT_LIBS=./robot/library:./robot/library/ONAPLibrary:./robot/library/heatbridge VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py" VARIABLES="-v GLOBAL_BUILD_NUMBER:$TEST_NUMBER" LISTENERS= diff --git a/runTags.sh b/runTags.sh index 300731bf..5381c872 100755 --- a/runTags.sh +++ b/runTags.sh @@ -83,7 +83,7 @@ export DISPLAY=${DISPLAY} # Execute tests echo -e "Executing robot tests at log level ${LOG_LEVEL}" -ROBOT_LIBS=./robot/library:./robot/library/eteutils:./robot/library/vcpeutils:./robot/library/heatbridge +ROBOT_LIBS=./robot/library:./robot/library/ONAPLibrary:./robot/library/vcpeutils:./robot/library/heatbridge cd /var/opt/${INSTALL_NAME} python -m robot.run -L ${LOG_LEVEL} -d ${OUTPUT_FOLDER} ${VARIABLEFILES} ${VARIABLES} ${LISTENERS} -P ${ROBOT_LIBS} ${ROBOT_TAGS} /var/opt/${INSTALL_NAME}/robot/testsuites/ -- cgit 1.2.3-korg