Condense Liquibase steps

[cps.git] / csit / tests / cps-admin / cps-admin.robot

diff --git a/csit/tests/cps-admin/cps-admin.robot b/csit/tests/cps-admin/cps-admin.robot
index a075788..0df67b6 100644 (file)
--- a/csit/tests/cps-admin/cps-admin.robot
+++ b/csit/tests/cps-admin/cps-admin.robot
@@ -33,7 +33,6 @@ ${dataspaceName}        CSIT-Dataspace
 ${schemaSetName}        CSIT-SchemaSet
 ${anchorName}           CSIT-Anchor
 ${ranDataspaceName}     NFP-Operational
-${ranSchemaSetName}     cps-ran-schema-model
 
 *** Test Cases ***
 Create Dataspace
@@ -46,7 +45,7 @@ Create Dataspace
 Create Schema Set from YANG file
     ${uri}=             Set Variable        ${basePath}/v1/dataspaces/${dataspaceName}/schema-sets
     ${params}=          Create Dictionary   schema-set-name=${schemaSetName}
-    ${fileData}=        Get Binary File     ${DATADIR}${/}test-tree.yang
+    ${fileData}=        Get Binary File     ${DATADIR_CPS_CORE}${/}test-tree.yang
     ${fileTuple}=       Create List         test.yang   ${fileData}   application/zip
     &{files}=           Create Dictionary   file=${fileTuple}
     ${headers}=         Create Dictionary   Authorization=${auth}
@@ -56,7 +55,7 @@ Create Schema Set from YANG file
 Create Schema Set from ZIP file
     ${uri}=             Set Variable        ${basePath}/v1/dataspaces/${dataspaceName}/schema-sets
     ${params}=          Create Dictionary   schema-set-name=ZipTestSchemaSet
-    ${fileData}=        Get Binary File     ${DATADIR}${/}yang-resources.zip
+    ${fileData}=        Get Binary File     ${DATADIR_CPS_CORE}${/}yang-resources.zip
     ${fileTuple}=       Create List         test.zip   ${fileData}   application/zip
     &{files}=           Create Dictionary   file=${fileTuple}
     ${headers}=         Create Dictionary   Authorization=${auth}
@@ -77,11 +76,3 @@ Create Anchor
     ${headers}=         Create Dictionary   Authorization=${auth}
     ${response}=        POST On Session     CPS_URL   ${uri}   params=${params}   headers=${headers}
     Should Be Equal As Strings              ${response.status_code}   201
-
-Get CPS RAN Schema Set info
-    ${uri}=              Set Variable       ${basePath}/v1/dataspaces/${ranDataspaceName}/schema-sets/${ranSchemaSetName}
-    ${headers}=          Create Dictionary  Authorization=${auth}
-    ${response}=         Get On Session     CPS_URL   ${uri}   headers=${headers}   expected_status=200
-    ${responseJson}=     Set Variable       ${response.json()}
-    Should Be Equal As Strings              ${responseJson['name']}   ${ranSchemaSetName}
-    Should Be Equal As Strings              ${responseJson['dataspaceName']}   ${ranDataspaceName}