X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=robot-systest%2Ftestsuite%2Fepa_03-crud_operations_on_sdnc.robot;h=116082b3b3afa76fc989acfede8c0e6ffefa2059;hb=e7d562d157ac81f2f70e82f0b653cce4ec2c2397;hp=b0d86df30e6ff22147edd48d897e0d168ef414a9;hpb=4987de4177c3f593f99b94923d26f5c966c004ed;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 b0d86df..116082b 100644
--- a/robot-systest/testsuite/epa_03-crud_operations_on_sdnc.robot
+++ b/robot-systest/testsuite/epa_03-crud_operations_on_sdnc.robot
@@ -1,3 +1,4 @@
+*** Comments ***
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
@@ -10,37 +11,51 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-*** Settings ***
-Documentation     [EPA-03] CRUD operations on SDNC accounts.
 
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/sdnc_lib.robot
+*** Settings ***
+Documentation   [EPA-03] CRUD operations on SDNC accounts.
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_03-crud_operations_on_sdnc_data.py
+Resource   ../lib/prometheus_lib.resource
+Resource   ../lib/sdnc_lib.resource
 
-Force Tags   epa_03   cluster_epa   daily   regression
+Test Tags   epa_03   cluster_epa   daily   regression
 
-Suite Teardown   Run Keyword And Ignore Error   Delete Basic SDNC
+Suite Setup   Run Keyword And Ignore Error   Suite Preparation
+Suite Teardown   Run Keyword And Ignore Error   Clean SDNC
 
 
 *** Variables ***
-${sdnc_enabled_max_wait_time}   1min
-${sdnc_enabled_pol_time}   10
+${SDNC_ENABLED_MAX_WAIT_TIME}   1min
+${SDNC_ENABLED_POL_TIME}   10
+${SDNC_NAME}   epa_03
+${SDNC_USER}   %{SDNC_USER=karaf}
+${SDNC_PASSWORD}   %{SDNC_PASSWORD=karaf}
+${SDNC_URL}   %{SDNC_URL=http://localhost:8181}
+${SDNC_TYPE}   %{SDNC_TYPE=onos_vpls}
 
 
 *** Test Cases ***
 Create Basic SDNC
-
-    ${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}
-
+    [Documentation]   Register SDN controller in OSM.
+    ${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_id}  ${prometheus_host}  ${prometheus_port}
-
+    [Documentation]   Check in Prometheus that the SDN controller is in healthy state.
+    Check For SDNC Status   ${SDNC_ID}   ${PROMETHEUS_HOST}   ${PROMETHEUS_PORT}   ${PROMETHEUS_USER}   ${PROMETHEUS_PASSWORD}
 
 Delete Basic SDNC
+    [Documentation]   Delete SDN controller from OSM.
     [Tags]   cleanup
+    Delete SDNC   ${SDNC_NAME}
+
+
+*** Keywords ***
+Suite Preparation
+    [Documentation]   Test Suite Preparation: Setting Prometheus Testsuite Variables.
+    Set Testsuite Prometheus Variables
 
-    Delete SDNC  ${sdnc_name}
+Clean SDNC
+    [Documentation]   Delete SDN controller from OSM.
+    Delete SDNC   ${sdnc_name}