Revert "Feature 11001: Robot framework linting for E2E tests"

[osm/tests.git] / robot-systest / testsuite / k8s_07-dummy_helm.robot

diff --git a/robot-systest/testsuite/k8s_07-dummy_helm.robot b/robot-systest/testsuite/k8s_07-dummy_helm.robot
index 59c73ba..c37fe4e 100644 (file)
--- a/robot-systest/testsuite/k8s_07-dummy_helm.robot
+++ b/robot-systest/testsuite/k8s_07-dummy_helm.robot
@@ -1,4 +1,3 @@
-*** 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
@@ -11,7 +10,6 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-
 *** Settings ***
 Documentation   [K8s-07] Openldap Helm in isolated cluster with dummy VIM.
 
@@ -20,101 +18,90 @@ Library   String
 Library   Collections
 Library   Process
 
-Resource   ../lib/vim_lib.resource
-Resource   ../lib/vnfd_lib.resource
-Resource   ../lib/nsd_lib.resource
-Resource   ../lib/ns_lib.resource
-Resource   ../lib/connectivity_lib.resource
-Resource   ../lib/ssh_lib.resource
-Resource   ../lib/k8scluster_lib.resource
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vim_lib.robot
+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/connectivity_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
-Test Tags   k8s_07   cluster_k8s   daily   regression   azure
+Force Tags   k8s_07   cluster_k8s   daily   regression   azure
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
 # VIM Configuration
-${VIM_NAME}   k8s07_dummy
-${VIM_USER}   user
-${VIM_PASSWORD}   pass
-${VIM_AUTH_URL}   http://localhost/dummy
-${VIM_TENANT}   tenant
-${VIM_ACCOUNT_TYPE}   dummy
+${vim_name}   k8s07_dummy
+${vim_user}   user
+${vim_password}   pass
+${vim_auth_url}   http://localhost/dummy
+${vim_tenant}   tenant
+${vim_account_type}   dummy
 
 # K8s cluster data
-${K8SCLUSTER_NAME}   k8s07
-${K8SCLUSTER_VERSION}   v1
-${K8SCLUSTER_NET}   null
+${k8scluster_name}   k8s07
+${k8scluster_version}   v1
+${k8scluster_net}   null
 
 # NS and VNF descriptor package files
-${VNFD_PKG}   openldap_knf
-${NSD_PKG}   openldap_ns
-${VNFD_NAME}   openldap_knf
-${NSD_NAME}   openldap_ns
+${vnfd_pkg}   openldap_knf
+${nsd_pkg}   openldap_ns
+${vnfd_name}   openldap_knf
+${nsd_name}   openldap_ns
 
 # NS instance name
-${NS_NAME}   ldap
+${ns_name}   ldap
 
-${NS_ID}   ${EMPTY}
-${NS_CONFIG}   ${EMPTY}
-${PUBLICKEY}   ${EMPTY}
+${ns_id}   ${EMPTY}
+${ns_config}   ${EMPTY}
+${publickey}   ${EMPTY}
 
 
 *** Test Cases ***
 Create Package For OpenLDAP CNF
-    [Documentation]   Upload NF package for the testsuite.
-    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG}'
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 Create Package For OpenLDAP NS
-    [Documentation]   Upload NS package for the testsuite.
-    Create NSD   '%{PACKAGES_FOLDER}/${NSD_PKG}'
+    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 Create Dummy VIM
-    [Documentation]   Register a VIM of type dummy in OSM.
-    ${created_vim_account_id}=   Create VIM Target   ${VIM_NAME}   ${VIM_USER}   ${VIM_PASSWORD}   ${VIM_AUTH_URL}   ${VIM_TENANT}   ${VIM_ACCOUNT_TYPE}
-    Log   ${created_vim_account_id}
+    ${created_vim_account_id}=   Create VIM Target   ${vim_name}   ${vim_user}   ${vim_password}   ${vim_auth_url}   ${vim_tenant}   ${vim_account_type}
 
 Add K8s Cluster To OSM
-    [Documentation]   Register a K8s cluster associated to the dummy VIM.
-    Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   ${VIM_NAME}   ${K8SCLUSTER_NET}   ${K8SCLUSTER_NAME}
+    Create K8s Cluster   %{K8S_CREDENTIALS}   ${k8scluster_version}   ${vim_name}   ${k8scluster_net}   ${k8scluster_name}
 
 Create Network Service Instance
-    [Documentation]   Instantiate NS for the testsuite.
-    ${id}=   Create Network Service   ${NSD_NAME}   ${VIM_NAME}   ${NS_NAME}   ${NS_CONFIG}   ${PUBLICKEY}
-    Set Suite Variable   ${NS_ID}   ${id}
+    ${id}=   Create Network Service   ${nsd_name}   ${vim_name}   ${ns_name}   ${ns_config}   ${publickey}
+    Set Suite Variable   ${ns_id}   ${id}
 
 Delete Network Service Instance
-    [Documentation]   Delete NS instance.
     [Tags]   cleanup
-    Delete NS   ${NS_NAME}
+    Delete NS   ${ns_name}
 
 Remove K8s Cluster from OSM
-    [Documentation]   Remove K8s cluster from OSM.
     [Tags]   cleanup
-    Delete K8s Cluster   ${K8SCLUSTER_NAME}
+    Delete K8s Cluster   ${k8scluster_name}
 
 Delete VIM
-    [Documentation]   Remove VIM from OSM.
     [Tags]   cleanup
-    Delete VIM Target   ${VIM_NAME}
+    Delete VIM Target   ${vim_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 NF package from OSM.
     [Tags]   cleanup
-    Delete VNFD   ${VNFD_NAME}
+    Delete VNFD   ${vnfd_name}
 
 
 *** Keywords ***
 Suite Cleanup
     [Documentation]   Test Suit Cleanup: Deleting Descriptor, instance, cluster 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 K8s Cluster   ${K8SCLUSTER_NAME}
-    Run Keyword If Any Tests Failed   Delete VIM Target   ${VIM_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}
+    Run Keyword If Any Tests Failed   Delete K8s Cluster   ${k8scluster_name}
+    Run Keyword If Any Tests Failed   Delete VIM Target   ${vim_name}