X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fepa_03-crud_operations_on_sdnc.robot;h=48c9e906eedd00d007ef46d4fbb86b168129eae7;hb=6eef5a62c976891bd580d52e0ead6cb9a959afc1;hp=4b222e4ef9246e25f83641382d133cf8ba1921d7;hpb=4cf45d797499817b5f639bd6245c3f84e762de14;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/epa_03-crud_operations_on_sdnc.robot b/robot-systest/testsuite/epa_03-crud_operations_on_sdnc.robot
index 4b222e4..48c9e90 100644
--- a/robot-systest/testsuite/epa_03-crud_operations_on_sdnc.robot
+++ b/robot-systest/testsuite/epa_03-crud_operations_on_sdnc.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [EPA-03] CRUD operations on SDNC accounts.
+Documentation   [EPA-03] CRUD operations on SDNC accounts.
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/sdnc_lib.robot
 
@@ -19,22 +19,36 @@ Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_03-crud_operations_on_sdnc_data
 
 Force Tags   epa_03   cluster_epa   daily   regression
 
+Suite Setup   Run Keyword And Ignore Error   Suite Preparation
 Suite Teardown   Run Keyword And Ignore Error   Delete Basic SDNC
 
 
+*** Variables ***
+${sdnc_enabled_max_wait_time}   1min
+${sdnc_enabled_pol_time}   10
+
+
 *** Test Cases ***
 Create Basic SDNC
 
-    ${created_sdnc_id}=  Create SDNC  ${sdnc_name}  ${sdnc_user}  ${sdnc_password}  ${sdnc_url}  ${sdnc_type}
-    Check for SDNC  ${sdnc_name}
+    ${created_sdnc_id}=   Create SDNC   ${sdnc_name}   ${sdnc_user}   ${sdnc_password}   ${sdnc_url}   ${sdnc_type}
+    Set Suite Variable   ${sdnc_id}   ${created_sdnc_id}
+    Wait Until Keyword Succeeds   ${sdnc_enabled_max_wait_time}   ${sdnc_enabled_pol_time}   Check for SDNC   ${sdnc_id}
 
 
 Check SDNC Status Is Healthy
 
-    Check for SDNC Status  ${sdnc_name}  ${prometheus_host}  ${prometheus_port}
+    Check for SDNC Status   ${sdnc_id}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
 
 
 Delete Basic SDNC
     [Tags]   cleanup
 
-    Delete SDNC  ${sdnc_name}
+    Delete SDNC   ${sdnc_name}
+
+
+*** Keywords ***
+Suite Preparation
+    [Documentation]   Test Suite Preparation: Setting Prometheus Testsuite Variables
+
+    Set Testsuite Prometheus Variables