X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fepa_05-epa_underlay_passthrough.robot;h=df72e28cddc3789c03aaa3a3d99592d78d3e1781;hb=61bbf92c1b2a4563f1636f053a4846b669161714;hp=ddd4f82d3354f6b6668dba2fa0627cbecb4ad993;hpb=576487e73575ad72071aa5680b8d17b2d8ff8027;p=osm%2Ftests.git diff --git a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot index ddd4f82..df72e28 100644 --- a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot +++ b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot @@ -11,7 +11,7 @@ # limitations under the License. *** Settings *** -Documentation [EPA-05] EPA underlay PASSTHROUGH. +Documentation [EPA-05] EPA underlay PASSTHROUGH. Library OperatingSystem Library String @@ -25,8 +25,6 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Resource %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot -Variables %{ROBOT_DEVOPS_FOLDER}/resources/epa_05-epa_underlay_passthrough.py - Force Tags epa_05 cluster_epa Suite Teardown Run Keyword And Ignore Error Suite Cleanup @@ -45,88 +43,86 @@ ${datanet_subnet} 192.168.110.0/24 ${datanet_ip1} 192.168.110.11 ${datanet_ip2} 192.168.110.22 -${vnf_member_index_1} 1 -${vnf_member_index_2} 2 +${vnf_member_index_1} vnf1 +${vnf_member_index_2} vnf2 ${username} ubuntu ${password} osm4u -${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} , {name: datanet, ip-profile: {ip-version: ipv4, subnet-address: "${datanet_subnet}"}, vnfd-connection-point-ref: [ {member-vnf-index-ref: "1", vnfd-connection-point-ref: vnf-data-ext, ip-address: "${datanet_ip1}"}, {member-vnf-index-ref: "2", vnfd-connection-point-ref: vnf-data-ext, ip-address: "${datanet_ip2}"}]} ] } +${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} , {name: datanet, ip-profile: {ip-version: ipv4, subnet-address: "${datanet_subnet}"}, vnfd-connection-point-ref: [ {member-vnf-index-ref: "${vnf_member_index_1}", vnfd-connection-point-ref: vnf-data-ext, ip-address: "${datanet_ip1}"}, {member-vnf-index-ref: "${vnf_member_index_2}", vnfd-connection-point-ref: vnf-data-ext, ip-address: "${datanet_ip2}"}]} ] } ${success_return_code} 0 *** Test Cases *** Create VNF Descriptor - Remove Environment Variable OVERRIDES - Create VNFD '%{PACKAGES_FOLDER}/${vnfd_pkg}' + Remove Environment Variable OVERRIDES + Create VNFD '%{PACKAGES_FOLDER}/${vnfd_pkg}' Create NS Descriptor - Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' + Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' Instantiate Network Service - ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${EMPTY} - Set Suite Variable ${ns_id} ${id} + ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${EMPTY} + Set Suite Variable ${ns_id} ${id} Get Management Ip Addresses - Variable Should Exist ${ns_id} msg=Network service instance is not available - ${ip} Get Vnf Management Ip Address ${ns_id} ${vnf_member_index_1} - Set Suite Variable ${ip_mgmt_1} ${ip} - log ${ip_mgmt_1} + Variable Should Exist ${ns_id} msg=Network service instance is not available + ${ip} Get Vnf Management Ip Address ${ns_id} ${vnf_member_index_1} + Set Suite Variable ${ip_mgmt_1} ${ip} + log ${ip_mgmt_1} - ${ip} Get Vnf Management Ip Address ${ns_id} ${vnf_member_index_2} - Set Suite Variable ${ip_mgmt_2} ${ip} - log ${ip_mgmt_2} + ${ip} Get Vnf Management Ip Address ${ns_id} ${vnf_member_index_2} + Set Suite Variable ${ip_mgmt_2} ${ip} + log ${ip_mgmt_2} Ping from Vnf1 to Vnf2 - Variable Should Exist ${ip_mgmt_1} msg=IP address of the data VNF '${vnf_member_index_1}' is not available - Variable Should Exist ${privatekey} msg=SSH private key not available + Variable Should Exist ${ip_mgmt_1} msg=IP address of the data VNF '${vnf_member_index_1}' is not available Sleep 30 seconds Wait for SSH daemon to be up - ${stdout}= Execute Remote Command Check Rc Return Output ${ip_mgmt_1} ${username} ${password} ${privatekey} ip addr ; ping -c 5 ${datanet_ip2} - log ${stdout} + ${stdout}= Execute Remote Command Check Rc Return Output ${ip_mgmt_1} ${username} ${password} ${EMPTY} ip addr ; ping -c 5 ${datanet_ip2} + log ${stdout} Ping from Vnf2 to Vnf1 - Variable Should Exist ${ip_mgmt_2} msg=IP address of the data VNF '${vnf_member_index_2}' is not available - Variable Should Exist ${privatekey} msg=SSH private key not available - ${stdout}= Execute Remote Command Check Rc Return Output ${ip_mgmt_2} ${username} ${password} ${privatekey} ip addr ; ping -c 5 ${datanet_ip1} - log ${stdout} + Variable Should Exist ${ip_mgmt_2} msg=IP address of the data VNF '${vnf_member_index_2}' is not available + ${stdout}= Execute Remote Command Check Rc Return Output ${ip_mgmt_2} ${username} ${password} ${EMPTY} ip addr ; ping -c 5 ${datanet_ip1} + log ${stdout} Delete NS Instance [Tags] cleanup - Delete NS ${ns_name} + Delete NS ${ns_name} Delete NS Descriptor [Tags] cleanup - Delete NSD ${nsd_name} + Delete NSD ${nsd_name} Delete VNF Descriptor [Tags] cleanup - Delete VNFD ${vnfd_name} + Delete VNFD ${vnfd_name} *** Keywords *** Suite Cleanup - [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance + [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Any Tests Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Any Tests Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name}