X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_24-affinity_groups.robot;fp=robot-systest%2Ftestsuite%2Fbasic_24-affinity_groups.robot;h=46860fbb2c266a5e4f9c4b4c5350d3f56f1f1bbd;hp=b3b51ebbfa7b36a1cfdf4461831209164c1df2e3;hb=7a9e031926d2fa7ed5041485b3d41b0c1e85d2a9;hpb=23ff8f980f66ef57fb4d254336a018e3a697a187

diff --git a/robot-systest/testsuite/basic_24-affinity_groups.robot b/robot-systest/testsuite/basic_24-affinity_groups.robot
index b3b51eb..46860fb 100644
--- a/robot-systest/testsuite/basic_24-affinity_groups.robot
+++ b/robot-systest/testsuite/basic_24-affinity_groups.robot
@@ -1,3 +1,4 @@
+*** Comments ***
 #   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
@@ -10,6 +11,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+
 *** Settings ***
 Documentation   [BASIC-24] VNF with two VDUs belonging to an Openstack server group
 
@@ -18,93 +20,83 @@ Library   String
 Library   Collections
 Library   Process
 
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnf_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot
-
-Force Tags   basic_24   cluster_main   daily   regression
+Resource   ../lib/vnfd_lib.resource
+Resource   ../lib/nsd_lib.resource
+Resource   ../lib/ns_lib.resource
+Resource   ../lib/vnf_lib.resource
+Resource   ../lib/openstack_lib.resource
 
+Test Tags   basic_24   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
 # NS and VNF descriptor package folder and ids
-${vnfd_pkg}   affinity_basic_vnf
-${vnfd_name}   affinity_basic-vnf
-${nsd_pkg}   affinity_basic_ns
-${nsd_name}   affinity_basic-ns
+${VNFD_PKG}   affinity_basic_vnf
+${VNFD_NAME}   affinity_basic-vnf
+${NSD_PKG}   affinity_basic_ns
+${NSD_NAME}   affinity_basic-ns
 
 # NS instance name and configuration
-${ns_name}   basic_24
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${NS_NAME}   basic_24
+${NS_CONFIG}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 
 # SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
-${username}   ubuntu
-${password}   ${EMPTY}
+${PUBLICKEY}   %{HOME}/.ssh/id_rsa.pub
+${PRIVATEKEY}   %{HOME}/.ssh/id_rsa
+${USERNAME}   ubuntu
+${PASSWORD}   ${EMPTY}
+
+${NS_ID}   ${EMPTY}
+${VNF_MEMBER_INDEX}   affinity-basic-1
+${SUCCESS_RETURN_CODE}   0
 
-${ns_id}   ${EMPTY}
-${vnf_member_index}   affinity-basic-1
-${success_return_code}   0
 
 *** Test Cases ***
 Create VNF Package
-
-    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
-
+    [Documentation]   Upload VNF package for the testsuite.
+    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG}'
 
 Create NS Package
-
-    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
-
+    [Documentation]   Upload NS package for the testsuite.
+    Create NSD   '%{PACKAGES_FOLDER}/${NSD_PKG}'
 
 Network Service Instance Test
-
-    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
-    Set Suite Variable   ${ns_id}   ${id}
-
+    [Documentation]   Instantiate NS for the testsuite.
+    ${id}=   Create Network Service   ${NSD_NAME}   %{VIM_TARGET}   ${NS_NAME}   ${NS_CONFIG}   ${PUBLICKEY}
+    Set Suite Variable   ${NS_ID}   ${id}
 
 Check Vnf Affinity Groups
-
-    Variable Should Exist   ${ns_id}   msg=NS is not available
-    ${vnf_id}   Get Vnf Id   ${ns_id}   ${vnf_member_index}
-    @{vdur_id_list}   Get VDU list from VNF   ${vnf_id}
+    [Documentation]   Check that all VDUs of the VNF belong to the expected affinity group.
+    Variable Should Exist   ${NS_ID}   msg=NS is not available
+    ${vnf_id}=   Get Vnf Id   ${NS_ID}   ${VNF_MEMBER_INDEX}
+    @{vdur_id_list}=   Get VDU List From VNF   ${vnf_id}
     FOR   ${vdur_id}   IN   @{vdur_id_list}
-        ${server_group_name}   Get VDU Affinity Group Name   ${ns_name}   ${vnf_id}   ${vdur_id}
-        ${vm_vim_id}   Get VDU VIM Id   ${vnf_id}   ${vdur_id}
+        ${server_group_name}=   Get VDU Affinity Group Name   ${NS_NAME}   ${vnf_id}   ${vdur_id}
+        ${vm_vim_id}=   Get VDU VIM Id   ${vnf_id}   ${vdur_id}
         Check VM In Server Group   ${vm_vim_id}   ${server_group_name}
     END
 
-
 Delete NS Instance Test
+    [Documentation]   Delete NS instance.
     [Tags]   cleanup
-
-    Delete NS   ${ns_name}
-
+    Delete NS   ${NS_NAME}
 
 Delete NS Descriptor Test
+    [Documentation]   Delete NS package from OSM.
     [Tags]   cleanup
-
-    Delete NSD   ${nsd_name}
-
+    Delete NSD   ${NSD_NAME}
 
 Delete VNF Descriptor Test
+    [Documentation]   Delete VNF package from OSM.
     [Tags]   cleanup
-
-    Delete VNFD   ${vnfd_name}
+    Delete VNFD   ${VNFD_NAME}
 
 
 *** Keywords ***
 Suite Cleanup
     [Documentation]   Test Suit Cleanup: Deleting Descriptor, instance and vim
-
-    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 VNFD   ${vnfd_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 VNFD   ${VNFD_NAME}