X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fopenstack_lib.robot;h=6ef6d0af2ce075edbd2b8f06ff5a3f5a22a45e6e;hb=ef4e1f2187ed8ac9ee69ee9d37e0c91b664de9c2;hp=ff02b29ecad3f8beb4a12086b398d4d795d567fe;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;p=osm%2Ftests.git

diff --git a/robot-systest/lib/openstack_lib.robot b/robot-systest/lib/openstack_lib.robot
index ff02b29..6ef6d0a 100644
--- a/robot-systest/lib/openstack_lib.robot
+++ b/robot-systest/lib/openstack_lib.robot
@@ -20,7 +20,7 @@ Get Server Flavor ID
 
     Should Not Be Empty   ${server_id}
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack server show ${server_id} | grep flavor | awk 'NR>1{print $1}' RS='(' FS=')'
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -30,7 +30,7 @@ Get Flavor Properties
 
     Should Not Be Empty   ${flavor_id}
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack flavor show ${flavor_id} | grep properties | awk -F '|' '{print $3}'
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -41,7 +41,7 @@ Check NS Servers In VIM
 
     Should Not Be Empty   ${ns_name}
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack server list | grep ${ns_name} | awk '{print $4}'
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     @{servers} =   Split String   ${stdout}
     ${n_servers}=   Get Length   ${servers}
@@ -54,7 +54,7 @@ Get Project Quota
 
     Should Not Be Empty   ${field}
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack quota show -c ${field} -f value
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -66,7 +66,7 @@ Get Server Property
     Should Not Be Empty   ${server_id}
     Should Not Be Empty   ${field}
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack server show ${server_id} -c ${field} -f value
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -78,7 +78,7 @@ Check VM In Server Group
     Should Not Be Empty   ${server_group_name}
     Should Not Be Empty   ${server_id}
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack server group show ${server_group_name} -c members -f value
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Should Contain   ${stdout}   ${server_id}
 
@@ -89,7 +89,7 @@ Check If Volume Exists
 
     Should Not Be Empty   ${volume_id}
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack volume list | grep ${volume_id} | wc -l
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -100,7 +100,7 @@ Delete Volume
 
     Should Not Be Empty   ${volume_id}
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack volume delete ${volume_id}
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -111,16 +111,30 @@ Stop Server
 
     Should Not Be Empty   ${server_id}
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack server stop ${server_id}
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
+
 Halt Server
     [Documentation]   Reset a server
     [Arguments]   ${server_id}
 
     Should Not Be Empty   ${server_id}
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack server set --state error ${server_id}
-    log   ${stdout}
+    Log   ${stdout}
+    Should Be Equal As Integers   ${rc}   ${success_return_code}
+    [Return]   ${stdout}
+
+
+Delete Server
+    [Documentation]   Delete a server
+    [Arguments]   ${server_id}
+
+    Should Not Be Empty   ${server_id}
+    ${rc}   ${stdout}=   Run and Return RC and Output   openstack server delete ${server_id}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
+
+