Commit 0d96b359 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

update-bis to fix for issue #156 for v2.6.1

parent 985f849b

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+2 −1
Original line number Diff line number Diff line
@@ -1054,7 +1054,8 @@ Create Sessions 
       

Check Notification Endpoint

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}

    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}

    Clear Requests  ${callback_endpoint}

SOL005/NSDManagement-API/NSDManagementNotification.robot

+14 −7
Original line number Diff line number Diff line
@@ -224,7 +224,8 @@ Configure PNFD Deletion Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}



Configure NSD Deletion Handler
@@ -234,7 +235,8 @@ Configure NSD Deletion Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}



Configure NSD Operational State Change Handler
@@ -244,7 +246,8 @@ Configure NSD Operational State Change Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}



Configure PNFD Onboarding Handler
@@ -254,7 +257,8 @@ Configure PNFD Onboarding Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}



Configure Notification PNFD Onboarding Failure Handler
@@ -264,7 +268,8 @@ Configure Notification PNFD Onboarding Failure Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}



Configure NSD Onboarding Handler
@@ -274,7 +279,8 @@ Configure NSD Onboarding Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}



Configure Notification NSD Onboarding Failure Handler
@@ -284,7 +290,8 @@ Configure Notification NSD Onboarding Failure Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}

  

Configure Notification Forward

SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot

+8 −4
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ Do POST Alarm Notification Endpoint 
    ${BODY}=	evaluate	json.loads('''${json}''')	json

    Log  Creating mock request and response to handle alarmNotification

    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}

    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${req}  ${rsp}

    Set Global Variable    @{req_mock}    ${req}

    Set Global Variable    @{resp_mock}    ${rsp}
@@ -401,7 +402,8 @@ Do POST Alarm Clearance Notification Endpoint 
    ${BODY}=	evaluate	json.loads('''${json}''')	json

    Log  Creating mock request and response to handle alarmNotification

    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}

    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${req}  ${rsp}

    Set Global Variable    @{req_mock}    ${req}

    Set Global Variable    @{resp_mock}    ${rsp}
@@ -412,7 +414,8 @@ Do POST Alarm List Rebuilt Notification Endpoint 
    ${BODY}=	evaluate	json.loads('''${json}''')	json

    Log  Creating mock request and response to handle alarmNotification

    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}

    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${req}  ${rsp}

    Set Global Variable    @{req_mock}    ${req}

    Set Global Variable    @{resp_mock}    ${rsp}
@@ -420,7 +423,8 @@ Do POST Alarm List Rebuilt Notification Endpoint 
Do GET Notification Endpoint

    log    The GET method allows the server to test the notification endpoint

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

    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${req}  ${rsp}    

    Set Global Variable    @{req_mock}    ${req}

    Set Global Variable    @{resp_mock}    ${rsp}

SOL005/NSFaultManagement-API/NotificationEndpoint.robot

+6 −3
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ Configure Notification Alarm List Rebuilt Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}



Configure Notification Alarm Handler
@@ -125,7 +126,8 @@ Configure Notification Alarm Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}



Configure Notification Alarm Cleareance Handler
@@ -135,7 +137,8 @@ Configure Notification Alarm Cleareance Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

    Log  Creating mock request and response to handle status notification

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}

  

Configure Notification Forward

SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot

+2 −1
Original line number Diff line number Diff line
@@ -808,7 +808,8 @@ Create Sessions 
    

Check Notification Endpoint

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

    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}

    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}

    Clear Requests  ${callback_endpoint}