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

diff --git a/robot-systest/lib/openstack_lib.robot b/robot-systest/lib/openstack_lib.robot
index c335963..6ef6d0a 100644
--- a/robot-systest/lib/openstack_lib.robot
+++ b/robot-systest/lib/openstack_lib.robot
@@ -20,9 +20,9 @@ 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}
+    [Return]   ${stdout}
 
 
 Get Flavor Properties
@@ -30,45 +30,45 @@ 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}
+    [Return]   ${stdout}
 
 
 Check NS Servers In VIM
-    [Documentation]     Check if the number of servers in Openstack by filtering by NS name is as expected.
+    [Documentation]   Check if the number of servers in Openstack by filtering by NS name is as expected.
     [Arguments]   ${ns_name}   ${number}
 
     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}
+    @{servers} =   Split String   ${stdout}
+    ${n_servers}=   Get Length   ${servers}
     Should Be Equal As Integers   ${number}   ${n_servers}
 
 
 Get Project Quota
-    [Documentation]     Get a field (ram, cores, ports, etc.) from quota in current project.
+    [Documentation]   Get a field (ram, cores, ports, etc.) from quota in current project.
     [Arguments]   ${field}
 
     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}
+    [Return]   ${stdout}
 
 
 Get Server Property
-    [Documentation]     Get a field (flavor, image, volumes_attached, etc.) from a server.
-    [Arguments]    ${server_id}   ${field}
+    [Documentation]   Get a field (flavor, image, volumes_attached, etc.) from a server.
+    [Arguments]   ${server_id}   ${field}
 
     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}
+    [Return]   ${stdout}
 
 
 Check VM In Server Group
@@ -78,49 +78,63 @@ 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}
 
 
 Check If Volume Exists
-    [Documentation]     Checks if a volume id exists
-    [Arguments]    ${volume_id}
+    [Documentation]   Checks if a volume id exists
+    [Arguments]   ${volume_id}
 
     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}
+    [Return]   ${stdout}
 
 
 Delete Volume
-    [Documentation]     Delete a volume by its identifier
-    [Arguments]    ${volume_id}
+    [Documentation]   Delete a volume by its identifier
+    [Arguments]   ${volume_id}
 
     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}
+    [Return]   ${stdout}
 
 
 Stop Server
-    [Documentation]     Stop a server
-    [Arguments]    ${server_id}
+    [Documentation]   Stop a server
+    [Arguments]   ${server_id}
 
     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}
+    [Return]   ${stdout}
+
 
 Halt Server
-    [Documentation]    Reset a server
-    [Arguments]    ${server_id}
+    [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}
+    [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}
+
+