Commit 37a10eba authored by Elian Kraja's avatar Elian Kraja
Browse files

Fix on instrumentation platform hooks

parent e0293cb6

SOL005/NSFaultManagement-API/Notifications.robot

+15 −12
Original line number Original line Diff line number Diff line
@@ -134,7 +134,7 @@ Configure Notification Alarm List Rebuilt Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

    Log  Creating mock request and response to handle status notification

    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}

    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}

    Set Global Variable    ${req}    ${notification_request}

    Set Global Variable    ${notification_request}    ${req}    

    &{headers} =	Create Dictionary	Content-Type=application/json

    &{headers} =	Create Dictionary	Content-Type=application/json

    &{notification_response}=  Create Mock Response	 headers=${headers}  status_code=204

    &{notification_response}=  Create Mock Response	 headers=${headers}  status_code=204

    Create Mock Expectation  ${notification_request}  ${notification_response}

    Create Mock Expectation  ${notification_request}  ${notification_response}
@@ -146,7 +146,7 @@ Configure Notification Alarm Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

    Log  Creating mock request and response to handle status notification

    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}

    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}

    Set Global Variable    ${req}    ${notification_request}

    Set Global Variable    ${notification_request}    ${req}    

    &{headers} =	Create Dictionary	Content-Type=application/json

    &{headers} =	Create Dictionary	Content-Type=application/json

    &{notification_response}=  Create Mock Response	    headers=${headers}      status_code=204

    &{notification_response}=  Create Mock Response	    headers=${headers}      status_code=204

    Create Mock Expectation  ${notification_request}  ${notification_response}

    Create Mock Expectation  ${notification_request}  ${notification_response}
@@ -158,7 +158,7 @@ Configure Notification Alarm Cleareance Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

    Log  Creating mock request and response to handle status notification

    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}

    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}

    Set Global Variable    ${req}    ${notification_request}

    Set Global Variable    ${notification_request}    ${req}    

    &{headers} =	Create Dictionary	Content-Type=application/json

    &{headers} =	Create Dictionary	Content-Type=application/json

    &{notification_response}=  Create Mock Response	  headers=${headers}  status_code=204

    &{notification_response}=  Create Mock Response	  headers=${headers}  status_code=204

    Create Mock Expectation  ${notification_request}  ${notification_response}

    Create Mock Expectation  ${notification_request}  ${notification_response}
@@ -184,7 +184,7 @@ Create Alarm Subscription 
    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}

    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}

    &{notification_response}=  Create Mock Response	status_code=204

    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    #Create Mock Expectation  ${notification_request}  ${notification_response}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    

    ${output}=    Output    response

    ${output}=    Output    response

    Set Global Variable    ${response}    ${output}

    Set Global Variable    ${response}    ${output}
@@ -193,7 +193,10 @@ Create Alarm Subscription 




Trigger instrumentation platform    

Trigger instrumentation platform    

     [Arguments]    ${upperTesterUrl}    ${resourceId}    ${resourceType}    ${event}    ${value}    &{keyvalues}

     [Arguments]    ${upperTesterUrl}    ${resourceId}    ${resourceType}    ${event}    ${value}    &{keyvalues}

     Run Keyword If    ${event} == "AlarmNotification" or ${event} == "AlarmClearedNotification" or ${event} == "AlarmListRebuildNotification"   

     ${alarmNotificationBoolean}    Run Keyword And Return Status    Should Be Equal As Strings    ${event}    AlarmNotification        

     ${alarmClearedNotificationBoolean}    Run Keyword And Return Status    Should Be Equal As Strings    ${event}    AlarmClearedNotification        

     ${alarmListRebuiltNotificationBoolean}    Run Keyword And Return Status    Should Be Equal As Strings    ${event}    AlarmListRebuiltNotification        

     Run Keyword If    ${alarmNotificationBoolean} == True or ${alarmClearedNotificationBoolean} == True or ${alarmListRebuiltNotificationBoolean} == True

     ...    Trigger Alarm Management UpperTester     ${upperTesterUrl}    ${resourceId}    ${resourceType}    ${event}    ${value}    &{keyvalues}

     ...    Trigger Alarm Management UpperTester     ${upperTesterUrl}    ${resourceId}    ${resourceType}    ${event}    ${value}    &{keyvalues}

SOL005/NSFaultManagement-API/environment/variables.txt

+1 −1
Original line number Original line Diff line number Diff line 
*** Variables ***

*** Variables ***

${NFVO_HOST}      localhost    # Hostname of the VNFM

${NFVO_HOST}      localhost    # Hostname of the VNFM

${NFVO_PORT}      8080    # Listening port of the VNFM

${NFVO_PORT}      8080    # Listening port of the VNFM

${NFVO_SCHEMA}    https

${NFVO_SCHEMA}    http

${AUTHORIZATION_HEADER}    Authorization

${AUTHORIZATION_HEADER}    Authorization

${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42

${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42

${ACCEPT}         application/json

${ACCEPT}         application/json

SOL005/NSFaultManagement-API/jsons/AlarmNotificationUpperTester.json

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,5 +3,5 @@ 
	"resourceType":"{resourceType}",

	"resourceType":"{resourceType}",

	"event":"{event}",

	"event":"{event}",

	"value":"{value}",

	"value":"{value}",

	"keyvalue": "{keyvalue}"

	"keyvalue": "{keyvalues}"

}}
 
}}