X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Fsdnc%2Fsdnc_netconf_tls_post_deploy%2Fsdnc_post_deploy_cert_check.robot;h=7d322c1b475371b80f390083d98bc8c8ed8df8f6;hb=af0838981ce48bb1d004edd2a16a5eb22df0da74;hp=f18141447017b128c601a1a63c31b97d0565e7dd;hpb=1f080ab55640d6cd754b83822cdd9793a68976e2;p=integration%2Fcsit.git

diff --git a/tests/sdnc/sdnc_netconf_tls_post_deploy/sdnc_post_deploy_cert_check.robot b/tests/sdnc/sdnc_netconf_tls_post_deploy/sdnc_post_deploy_cert_check.robot
index f1814144..7d322c1b 100644
--- a/tests/sdnc/sdnc_netconf_tls_post_deploy/sdnc_post_deploy_cert_check.robot
+++ b/tests/sdnc/sdnc_netconf_tls_post_deploy/sdnc_post_deploy_cert_check.robot
@@ -1,39 +1,28 @@
 *** Settings ***
-Library     Collections
-Library     RequestsLibrary
-Library     OperatingSystem
-Library     json
-Library     String
-
-*** Variables ***
-${SDNC_KEYSTORE_CONFIG_PATH}    /config/netconf-keystore:keystore
-${SDNC_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/netopeer2
-${PNFSIM_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/netopeer2/yang-ext:mount/mynetconf:netconflist
-
- *** Test Cases ***
- Test SDNC Keystore
-      [Documentation]    Checking keystore after SDNC installation
-      Create Session   sdnc  http://localhost:8282/restconf
-      &{headers}=  Create Dictionary    Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==    Content-Type=application/json    Accept=application/json
-      ${resp}=    Get Request    sdnc    ${SDNC_KEYSTORE_CONFIG_PATH}    headers=${headers}
-      Should Be Equal As Strings    ${resp.status_code}    200
-      ${keystoreContent}=    Convert To String    ${resp.content}
-      Log to console  *************************
-      Log to console  ${resp.content}
-      Log to console  *************************
-
- Test SDNC PNF Mount
-     [Documentation]    Checking PNF mount after SDNC installation
-     Create Session   sdnc  http://localhost:8282/restconf
-     ${mount}=    Get File     ${CURDIR}${/}data${/}mount.xml
-     Log to console  ${mount}
-     &{headers}=  Create Dictionary    Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==    Content-Type=application/xml    Accept=application/xml
-     ${resp}=    Put Request    sdnc    ${SDNC_MOUNT_PATH}    data=${mount}    headers=${headers}
-     Should Be Equal As Strings    ${resp.status_code}    201
-     Sleep  30
-     &{headers1}=  Create Dictionary    Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==    Content-Type=application/json    Accept=application/json
-     ${resp1}=    Get Request    sdnc    ${PNFSIM_MOUNT_PATH}    headers=${headers1}
-     Should Be Equal As Strings    ${resp1.status_code}    200
-     Log to console  ${resp1.content}
-     Should Contain  ${resp1.content}     netconf-id
-     Should Contain  ${resp1.content}     netconf-param
\ No newline at end of file
+
+Documentation     SDNC, Netconf-Pnp-Simulator E2E Test Case Scenarios
+
+Library 	      RequestsLibrary
+Resource          ./resources/sdnc-keywords.robot
+
+Suite Setup       Create sessions
+
+*** Test Cases ***
+
+Check SDNC Keystore For Netopeer2 Certificates
+    [Tags]      SDNC-NETOPEER2-CERT-DEPLOYMENT
+    [Documentation]    Checking Keystore after SDNC istallation
+    Send Get Request And Validate Response Sdnc  ${SDNC_KEYSTORE_CONFIG_PATH}  200
+
+# TLS connection to netconf simulator is not currently working. Commenting
+# out for now, and will uncomment when we have working solution.
+#Check SDNC And PNF TLS Connection Over Netopeer2 Certificates
+#    [Tags]      SDNC-PNF-TLS-CONNECTION-CHECK
+#   [Documentation]    Checking PNF Mount after SDNC Installation
+#    Send Get Request And Validate TLS Connection Response  ${SDNC_MOUNT_PATH}  200
+
+#Check PNF Delete And Remove Netopeer2 Certificates From Keystore
+#    [Tags]      SDNC-PNF-MOUNT-DELETE-CLEAR-KEYSTORE
+#    [Documentation]    Checking PNF Mount Delete from SDNC
+#   Send Delete Request And Validate PNF Mount Deleted  ${SDNC_MOUNT_PATH}  200
+