X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_12-ns_primitives.robot;h=84a9128e02069532874bf06ec407f9bc00183d11;hb=61bbf92c1b2a4563f1636f053a4846b669161714;hp=d1a0ebde4be7081567c3918608f0b31679f4ff48;hpb=576487e73575ad72071aa5680b8d17b2d8ff8027;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot
index d1a0ebd..84a9128 100644
--- a/robot-systest/testsuite/basic_12-ns_primitives.robot
+++ b/robot-systest/testsuite/basic_12-ns_primitives.robot
@@ -12,7 +12,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [BASIC-12] NS Primitives
+Documentation   [BASIC-12] NS Primitives
 
 Library   OperatingSystem
 Library   String
@@ -43,7 +43,7 @@ ${nsd_file}   nscharm_nsd.yaml
 # NS instance name and configuration
 ${ns_name}   test_nscharm
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${ns_timeout}   40min
+${ns_timeout}   15min
 
 ${old_juju_password}   a5611fc6452349cc6e45705d34c501d4
 ${publickey}   ${EMPTY}
@@ -52,13 +52,13 @@ ${success_return_code}   0
 
 *** Test Cases ***
 Change Juju Password
-    [Documentation]  NS package needs to be updated with the Juju credentials for your OSM installation
+    [Documentation]   NS package needs to be updated with the Juju credentials for your OSM installation
 
     ${rc}   ${stdout}=   Run and Return RC and Output   cp -r '%{PACKAGES_FOLDER}/${nsd_pkg}' '%{PACKAGES_FOLDER}/${new_nsd_pkg}'
     Should Be Equal As Integers   ${rc}   ${success_return_code}
-    ${nsd_yaml}=   Get File  %{PACKAGES_FOLDER}/${new_nsd_pkg}/${nsd_file}
-    ${changed_nsd_yaml}=   Replace String  ${nsd_yaml}  ${old_juju_password}  %{JUJU_PASSWORD}
-    Create File  %{PACKAGES_FOLDER}/${new_nsd_pkg}/${nsd_file}  ${changed_nsd_yaml}
+    ${nsd_yaml}=   Get File   %{PACKAGES_FOLDER}/${new_nsd_pkg}/${nsd_file}
+    ${changed_nsd_yaml}=   Replace String   ${nsd_yaml}   ${old_juju_password}   %{JUJU_PASSWORD}
+    Create File   %{PACKAGES_FOLDER}/${new_nsd_pkg}/${nsd_file}   ${changed_nsd_yaml}
 
 Upload Vnfds
 
@@ -67,16 +67,16 @@ Upload Vnfds
 
 Upload Nsd
 
-    Create NSD  %{PACKAGES_FOLDER}/${new_nsd_pkg}/
+    Create NSD   %{PACKAGES_FOLDER}/${new_nsd_pkg}/
 
 Instantiate NS
 
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}  ns_launch_max_wait_time=${ns_timeout}
-    Set Suite Variable  ${ns_id}  ${id}
+    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}   ns_launch_max_wait_time=${ns_timeout}
+    Set Suite Variable   ${ns_id}   ${id}
 
 # TODO: Check Initial Config Primitives Status
 
-Delete NS 
+Delete NS
     [Tags]   cleanup
 
     Delete NS   ${ns_name}
@@ -85,7 +85,7 @@ Delete NS Descriptor
     [Tags]   cleanup
 
     Delete NSD   ${nsd_name}
-    Delete Temporary Descriptor Folder  '%{PACKAGES_FOLDER}/${new_nsd_pkg}'
+    Delete Temporary Descriptor Folder   '%{PACKAGES_FOLDER}/${new_nsd_pkg}'
 
 Delete VNF Descriptors
     [Tags]   cleanup
@@ -96,17 +96,17 @@ Delete VNF Descriptors
 
 *** Keywords ***
 Suite Cleanup
-    [Documentation]  Test Suit Cleanup: Deleting Descriptor and instance
+    [Documentation]   Test Suit Cleanup: Deleting Descriptor and instance
 
-    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_name1}
-    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name2}
-    Delete Temporary Descriptor Folder  '%{PACKAGES_FOLDER}/${new_nsd_pkg}'
+    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_name1}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_name2}
+    Delete Temporary Descriptor Folder   '%{PACKAGES_FOLDER}/${new_nsd_pkg}'
 
 
 Delete Temporary Descriptor Folder
-    [Documentation]  Removes the temporary package folder created for the test
+    [Documentation]   Removes the temporary package folder created for the test
     [Arguments]   ${folder_name}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   rm -rf '${folder_name}'