Update AAF Health for Beijing

Issue-ID: AAF-256
Change-Id: Ie6e700a7e3f02730f771070ac286cb265ab5882a
Signed-off-by: Brian Freeman <bf1936@att.com>

diff --git a/robot/resources/aaf_interface.robot b/robot/resources/aaf_interface.robot
index c6a5e6f..15de39c 100644 (file)
--- a/robot/resources/aaf_interface.robot
+++ b/robot/resources/aaf_interface.robot
@@ -7,23 +7,23 @@ Library                 UUID
 Resource          global_properties.robot
 
 *** Variables ***
-${AAF_HEALTH_CHECK_PATH}        /authz/nss/org.openecomp
+${AAF_HEALTH_CHECK_PATH}        /authz/perms/user/${GLOBAL_AAF_USERNAME}
 
 *** Keywords ***
 Run AAF Health Check
      [Documentation]    Runs AAF Health check
      ${resp}=    Run AAF Get Request    ${AAF_HEALTH_CHECK_PATH}    
      Should Be Equal As Strings        ${resp.status_code}     200
-     Should Contain    ${resp.json()}    ns
+     #Should Contain    ${resp.json()}    access
          
 Run AAF Get Request
      [Documentation]    Runs AAF Get request
      [Arguments]    ${data_path}
      ${auth}=  Create List  ${GLOBAL_AAF_USERNAME}    ${GLOBAL_AAF_PASSWORD}
      ${session}=    Create Session     aaf     ${GLOBAL_AAF_SERVER}    auth=${auth}
-     ${session_client}=    Add Client Cert    ${session}    cert
+     #${session_client}=    Add Client Cert    ${session}    cert
      ${uuid}=    Generate UUID
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
      ${resp}=  Get Request     aaf     ${data_path}     headers=${headers}
      Log    Received response from aaf ${resp.text}
-     [Return]    ${resp}
\ No newline at end of file
+     [Return]    ${resp}

diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index 6adf3ad..5eb36e7 100644 (file)
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -31,6 +31,10 @@ Basic A&AI Health Check
     [Tags]    health    core
     Run A&AI Health Check
 
+Basic AAF Health Check
+    [Tags]    health    core
+    Run AAF Health Check
+
 Basic APPC Health Check
     [Tags]    health    core
     Run APPC Health Check
@@ -203,4 +207,4 @@ Portal Login Tests
 Portal Application Access Tests
     [Tags]    healthportalapp
     [Timeout]   180
-    Run Portal Application Access Tests
\ No newline at end of file
+    Run Portal Application Access Tests