Update remaining tests for combos

[integration/test.git] / csit / libraries / LiveMigration.robot

diff --git a/csit/libraries/LiveMigration.robot b/csit/libraries/LiveMigration.robot
index 7d295f041723adbf3afdc09d110e452c8c15d5c5..d080b56194143b5e9154c0ce47dad48e757cdb9f 100644 (file)
--- a/csit/libraries/LiveMigration.robot
+++ b/csit/libraries/LiveMigration.robot
@@ -24,14 +24,12 @@ Live Migration Suite Teardown
 
 Setup Live Migration In Compute Nodes
     [Documentation]    Set instances to be created in the shared directory.
-    OpenStackOperations.Modify OpenStack Configuration File    ${OS_CMP1_CONN_ID}    ${NOVA_CPU_CONF}    DEFAULT    instances_path    ${CMP_INSTANCES_SHARED_PATH}
-    OpenStackOperations.Modify OpenStack Configuration File    ${OS_CMP2_CONN_ID}    ${NOVA_CPU_CONF}    DEFAULT    instances_path    ${CMP_INSTANCES_SHARED_PATH}
-    OpenStackOperations.Restart DevStack Service    ${OS_CMP1_CONN_ID}    ${NOVA_COMPUTE_SERVICE}
-    OpenStackOperations.Restart DevStack Service    ${OS_CMP2_CONN_ID}    ${NOVA_COMPUTE_SERVICE}
+    : FOR    ${conn_id}    IN    @{OS_CMP_CONN_IDS}
+    \    OpenStackOperations.Modify OpenStack Configuration File    ${conn_id}    ${NOVA_CPU_CONF}    DEFAULT    instances_path    ${CMP_INSTANCES_SHARED_PATH}
+    \    OpenStackOperations.Restart DevStack Service    ${conn_id}    ${NOVA_COMPUTE_SERVICE}
 
 UnSet Live Migration In Compute Nodes
     [Documentation]    Clear settings done for Live Migration
-    OpenStackOperations.Modify OpenStack Configuration File    ${OS_CMP1_CONN_ID}    ${NOVA_CPU_CONF}    DEFAULT    instances_path    ${CMP_INSTANCES_DEFAULT_PATH}
-    OpenStackOperations.Modify OpenStack Configuration File    ${OS_CMP2_CONN_ID}    ${NOVA_CPU_CONF}    DEFAULT    instances_path    ${CMP_INSTANCES_DEFAULT_PATH}
-    OpenStackOperations.Restart DevStack Service    ${OS_CMP1_CONN_ID}    ${NOVA_COMPUTE_SERVICE}
-    OpenStackOperations.Restart DevStack Service    ${OS_CMP2_CONN_ID}    ${NOVA_COMPUTE_SERVICE}
+    : FOR    ${conn_id}    IN    @{OS_CMP_CONN_IDS}
+    \    OpenStackOperations.Modify OpenStack Configuration File    ${conn_id}    ${NOVA_CPU_CONF}    DEFAULT    instances_path    ${CMP_INSTANCES_DEFAULT_PATH}
+    \    OpenStackOperations.Restart DevStack Service    ${conn_id}    ${NOVA_COMPUTE_SERVICE}