Merge "Security groups smoke test in FDS"

1 files changed, 1 insertions, 67 deletions

diff --git a/testing/robot/smoke.robot b/testing/robot/smoke.robot
index a6c7d70..d6f8fe6 100644
--- a/testing/robot/smoke.robot
+++ b/testing/robot/smoke.robot
@@ -10,6 +10,7 @@
 *** Settings ***
 Library         OperatingSystem
 Library         lib/FDSLibrary.py
+Library         lib/Keywords.robot
 Variables       data/test_data.py
 Suite Setup     Setup Suite
 Suite Teardown  Teardown Suite
@@ -70,70 +71,3 @@ Teardown Suite
     Run Keyword If  $port1_id is not $None      Delete ports    ${port1_id}
     Run Keyword If  $port2_id is not $None      Delete ports    ${port2_id}
     Run Keyword If  $network_id is not $None    Delete network  ${network_id}
-
-Ensure Flavor
-    ${result} =     Check Flavor Exists     ${vm_flavor}
-    Return From Keyword If  '${result}' == 'True'
-    Create Flavor  ${vm_flavor}  ram=768
-    ${result} =     Check Flavor Exists     ${vm_flavor}
-    Should be True      ${result}
-
-Ensure Image
-    ${result} =     Check Image Exists  ${vm_image}
-    Return From Keyword If  '${result}' == 'True'
-    Create Image  ${vm_image}  /home/opnfv/functest/data/cirros-0.3.4-x86_64-disk.img
-    ${result} =     Check Image Exists  ${vm_image}
-    Should be True      ${result}
-
-Create tenant network
-    &{response} =   create network  ${network_name}
-    log many    &{response}
-    Set Suite Variable  ${network_id}   ${response.network['id']}
-    log     ${network_id}
-
-Create subnet without dhcp
-    &{response} =   create subnet  ${subnet_name}   ${network_id}   ${subnet_cidr}  dhcp=False
-    log many    &{response}
-    Set Suite Variable  ${subnet_id}    ${response.subnet['id']}
-    log     ${subnet_id}
-
-Create port with ip
-    [Arguments]     ${port_name}    ${ip_address}
-    &{response} =   create port     ${port_name}    ${network_id}   ${subnet_id}    ${ip_address}
-    log many    &{response}
-    log         ${response.port['id']}
-    [Return]    ${response.port['id']}
-
-Create vm
-    [Arguments]     ${vm_name}     ${port_ids}  ${security_groups}=${None}  ${userdata}=${None}
-    Log Many    ${vm_name}  ${vm_image}     ${vm_flavor}    ${port_ids}     ${userdata}
-    ${response} =   create server   ${vm_name}     ${vm_image}     ${vm_flavor}    ${port_ids}  ${security_groups}
-    ...                             ${userdata}
-    log many    ${response}
-    log         ${response.id}
-    [Return]    ${response.id}
-
-Check vm console
-    [Arguments]     ${vm_id}    ${string}
-    ${response} =   check server console    ${vm_id}    ${string}
-    [Return]    ${response}
-
-Poll vm
-    [Arguments]     ${id}   ${state}
-    poll server     ${id}   ${state}
-
-Delete vm
-    [Arguments]     ${id}
-    ${response} =   delete server   ${id}
-    log     ${response}
-    Poll vm     ${id}   ${None}
-
-Delete ports
-    [Arguments]     ${id}
-    ${response} =   delete port     ${id}
-    log     ${response}
-
-Delete network
-    [Arguments]     ${id}
-    ${response} =   delete net      ${id}
-    log     ${response}