[CSIT] fix /operations/GENERIC-RESOURCE-API path for RFC8040 conformance

remove tailing '/'

enable csit tests for GENERIC-RESOURCE-API

Issue-ID: SDNC-1812
Signed-off-by: demskeq8 <alexander.dehn@highstreet-technologies.com>
Change-Id: Ie6a82d18973b6e58fa20c1284640baed69eb577e

Former-commit-id: dcfccebc367687ba878674287a89c0b7834594af

3 files changed, 53 insertions, 64 deletions

diff --git a/csit/tests/sdnc/resources/sdnc-keywords.robot b/csit/tests/sdnc/resources/sdnc-keywords.robot
index 76d11401..8c417bc3 100644
--- a/csit/tests/sdnc/resources/sdnc-keywords.robot
+++ b/csit/tests/sdnc/resources/sdnc-keywords.robot
@@ -5,7 +5,7 @@ Resource          ./sdnc-properties.robot
 Library           Collections
 Library           RequestsLibrary
 Library           OperatingSystem
-Library           HttpLibrary.HTTP
+# Library           HttpLibrary.HTTP
 
 
 *** Keywords ***
@@ -21,9 +21,7 @@ Send Post File And Validate Response
     Create SDNC RESTCONF Session
     ${body}=      Get File     ${path}
     &{headers}=  Create Dictionary    Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==    Content-Type=application/json    Accept=application/json
-    ${resp}=  POST On Session  sdnc_restconf  ${url}  headers=${headers}  data=${body}  expected_status=200
-    ${respjson}=    Parse Json    ${resp.content}
-    Should Be Equal As Strings    ${respjson['output']['response-code']}        ${resp_code}
+    ${resp}=  POST On Session  sdnc_restconf  ${url}  headers=${headers}  data=${body}  expected_status=${resp_code}
 
 
 Send Empty Post Request And Validate Response
diff --git a/csit/tests/sdnc/resources/sdnc-properties.robot b/csit/tests/sdnc/resources/sdnc-properties.robot
index 6be1225d..1480d67e 100644
--- a/csit/tests/sdnc/resources/sdnc-properties.robot
+++ b/csit/tests/sdnc/resources/sdnc-properties.robot
@@ -7,18 +7,18 @@ ${SDNC_CONTAINER_NAME}          %{SDNC_CONTAINER_NAME}
 ${GRA_DATA_DIRECTORY}           %{WORKSPACE}/tests/sdnc/resources/grafiles
 # ${SDNC_RESTCONF_URL}            http://localhost:8282/restconf
 ${SDNC_RESTCONF_URL}            http://localhost:8282/rests
-${SDNC_HEALTHCHECK}             /operations/SLI-API:healthcheck/
+${SDNC_HEALTHCHECK}             /operations/SLI-API:healthcheck
 # ${SDNC_KEYSTORE_CONFIG_PATH}    /config/netconf-keystore:keystore
 # ${SDNC_NETWORK_TOPOLOGY}        /config/network-topology:network-topology
 # ${SDNC_MOUNT_PATH}              /config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo
 # ${PNFSIM_MOUNT_PATH}            /config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo/yang-ext:mount/turing-machine:turing-machine
 ${SDNC_KEYSTORE_CONFIG_PATH}    /data/netconf-keystore:keystore?content=config
 ${SDNC_NETWORK_TOPOLOGY}        /data/network-topology:network-topology?content=config
-${SDNC_MOUNT_PATH}              /data/network-topology:network-topology/topology/topology-netconf/node/PNFDemo?content=config
-${PNFSIM_MOUNT_PATH}            /data/network-topology:network-topology/topology/topology-netconf/node/PNFDemo/yang-ext:mount/turing-machine:turing-machine?content=config
-${GRA_PRELOAD_NETWORK}          /operations/GENERIC-RESOURCE-API:preload-network-topology-operation/
-${GRA_PRELOAD_VFMODULE}         /operations/GENERIC-RESOURCE-API:preload-vf-module-topology-operation/
-${GRA_SERVICE_TOPOLOGY}         /operations/GENERIC-RESOURCE-API:service-topology-operation/
-${GRA_NETWORK_TOPOLOGY}         /operations/GENERIC-RESOURCE-API:network-topology-operation/
-${GRA_VNF_TOPOLOGY}             /operations/GENERIC-RESOURCE-API:vnf-topology-operation/
-${GRA_VFMODULE_TOPOLOGY}        /operations/GENERIC-RESOURCE-API:vf-module-topology-operation/
+${SDNC_MOUNT_PATH}              /data/network-topology:network-topology/topology=topology-netconf/node=PNFDemo
+${PNFSIM_MOUNT_PATH}            /data/network-topology:network-topology/topology=topology-netconf/node=PNFDemo/yang-ext:mount/turing-machine:turing-machine?content=config
+${GRA_PRELOAD_NETWORK}          /operations/GENERIC-RESOURCE-API:preload-network-topology-operation
+${GRA_PRELOAD_VFMODULE}         /operations/GENERIC-RESOURCE-API:preload-vf-module-topology-operation
+${GRA_SERVICE_TOPOLOGY}         /operations/GENERIC-RESOURCE-API:service-topology-operation
+${GRA_NETWORK_TOPOLOGY}         /operations/GENERIC-RESOURCE-API:network-topology-operation
+${GRA_VNF_TOPOLOGY}             /operations/GENERIC-RESOURCE-API:vnf-topology-operation
+${GRA_VFMODULE_TOPOLOGY}        /operations/GENERIC-RESOURCE-API:vf-module-topology-operation
diff --git a/csit/tests/sdnc/sdnc_csit.robot b/csit/tests/sdnc/sdnc_csit.robot
index 63a1c126..6b49b0f7 100644
--- a/csit/tests/sdnc/sdnc_csit.robot
+++ b/csit/tests/sdnc/sdnc_csit.robot
@@ -26,57 +26,48 @@ Check SDNC NETCONF/TLS Connection to PNF Simulator
 Check Dropping NETCONF/TLS Connection
     [Tags]      SDNC-PNFSIM-TLS-DISCONNECT-CHECK
     [Documentation]    Checking PNF Simulator Mount Delete from SDNC
-   Send Delete Request And Validate PNF Mount Deleted  ${SDNC_MOUNT_PATH}  200
-
-#Load network preload data
-#    [Tags]     SDNC-GRA-PRELOAD-NETWORK
-#    [Documentation]    Loading network preload data
-#    Send Post File And Validate Response    ${GRA_PRELOAD_NETWORK}    ${GRA_DATA_DIRECTORY}/preload-network.json     200
-
-#Load vf-module preload data
-#    [Tags]     SDNC-GRA-PRELOAD-VF-MODULE
-#    [Documentation]    Loading vf-module preload data
-#    Send Post File And Validate Response    ${GRA_PRELOAD_VFMODULE}   ${GRA_DATA_DIRECTORY}/preload-vf-module.json   200
-
-#Check GRA service assign
-#    [Tags]     SDNC-GRA-SERVICE-ASSIGN
-#    [Documentation]    Testing GRA service assign
-#    Send Post File And Validate Response    ${GRA_SERVICE_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/svc-topology-assign.json   200
-
-#Check GRA network assign
-#    [Tags]     SDNC-GRA-NETWORK-ASSIGN
-#    [Documentation]    Testing GRA network assign
-#    Send Post File And Validate Response    ${GRA_NETWORK_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/network-topology-assign.json   200
-
-#Check GRA vnf assign
-#    [Tags]     SDNC-GRA-VNF-ASSIGN
-#    [Documentation]    Testing GRA vnf assign
-#    Send Post File And Validate Response    ${GRA_VNF_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/vnf-topology-assign.json   200
-
-#Check GRA vf-module assign
-#    [Tags]     SDNC-GRA-VF-MODULE-ASSIGN
-#    [Documentation]    Testing GRA vf-module assign
-#    Send Post File And Validate Response    ${GRA_VFMODULE_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/vf-module-topology-assign.json   200
-
-#Check GRA vf-module unassign
-#    [Tags]     SDNC-GRA-VF-MODULE-UNASSIGN
-#    [Documentation]    Testing GRA vf-module unassign
-#    Send Post File And Validate Response    ${GRA_VFMODULE_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/vf-module-topology-unassign.json   200
-
-#Check GRA vnf unassign
-#    [Tags]     SDNC-GRA-VNF-UNASSIGN
-#    [Documentation]    Testing GRA vnf unassign
-#    Send Post File And Validate Response    ${GRA_VNF_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/vnf-topology-unassign.json   200
-
-#Check GRA network unassign
-#    [Tags]     SDNC-GRA-NETWORK-UNASSIGN
-#    [Documentation]    Testing GRA network unassign
-#    Send Post File And Validate Response    ${GRA_NETWORK_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/network-topology-unassign.json   200
-
-#Check GRA service delete
-#    [Tags]     SDNC-GRA-SERVICE-DELETE
-#    [Documentation]    Testing GRA service delete
-#    Send Post File And Validate Response    ${GRA_SERVICE_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/svc-topology-delete.json   200
+   Send Delete Request And Validate PNF Mount Deleted  ${SDNC_MOUNT_PATH}  204
+
+Load network preload data
+    [Tags]     SDNC-GRA-PRELOAD-NETWORK
+    [Documentation]    Loading network preload data
+    Send Post File And Validate Response    ${GRA_PRELOAD_NETWORK}    ${GRA_DATA_DIRECTORY}/preload-network.json     200
+Load vf-module preload data
+    [Tags]     SDNC-GRA-PRELOAD-VF-MODULE
+    [Documentation]    Loading vf-module preload data
+    Send Post File And Validate Response    ${GRA_PRELOAD_VFMODULE}   ${GRA_DATA_DIRECTORY}/preload-vf-module.json   200
+Check GRA service assign
+    [Tags]     SDNC-GRA-SERVICE-ASSIGN
+    [Documentation]    Testing GRA service assign
+    Send Post File And Validate Response    ${GRA_SERVICE_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/svc-topology-assign.json   200
+Check GRA network assign
+    [Tags]     SDNC-GRA-NETWORK-ASSIGN
+    [Documentation]    Testing GRA network assign
+    Send Post File And Validate Response    ${GRA_NETWORK_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/network-topology-assign.json   200
+Check GRA vnf assign
+    [Tags]     SDNC-GRA-VNF-ASSIGN
+    [Documentation]    Testing GRA vnf assign
+    Send Post File And Validate Response    ${GRA_VNF_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/vnf-topology-assign.json   200
+Check GRA vf-module assign
+    [Tags]     SDNC-GRA-VF-MODULE-ASSIGN
+    [Documentation]    Testing GRA vf-module assign
+    Send Post File And Validate Response    ${GRA_VFMODULE_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/vf-module-topology-assign.json   200
+Check GRA vf-module unassign
+    [Tags]     SDNC-GRA-VF-MODULE-UNASSIGN
+    [Documentation]    Testing GRA vf-module unassign
+    Send Post File And Validate Response    ${GRA_VFMODULE_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/vf-module-topology-unassign.json   200
+Check GRA vnf unassign
+    [Tags]     SDNC-GRA-VNF-UNASSIGN
+    [Documentation]    Testing GRA vnf unassign
+    Send Post File And Validate Response    ${GRA_VNF_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/vnf-topology-unassign.json   200
+Check GRA network unassign
+    [Tags]     SDNC-GRA-NETWORK-UNASSIGN
+    [Documentation]    Testing GRA network unassign
+    Send Post File And Validate Response    ${GRA_NETWORK_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/network-topology-unassign.json   200
+Check GRA service delete
+    [Tags]     SDNC-GRA-SERVICE-DELETE
+    [Documentation]    Testing GRA service delete
+    Send Post File And Validate Response    ${GRA_SERVICE_TOPOLOGY}   ${GRA_DATA_DIRECTORY}/svc-topology-delete.json   200