Commit 9fa376e3 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fixed mock server expectation in v2.6.1

parent 3a51b7d1

SOL002/VNFFaultManagement-API/NotificationEndpoint.robot

+6 −3
Original line number Original line Diff line number Diff line
@@ -113,7 +113,8 @@ Configure Notification Alarm List Rebuilt Handler 
    set to dictionary    ${json}    notificationType    ${type}    

    set to dictionary    ${json}    notificationType    ${type}    

    ${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

    &{notification_request}=  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}

    &{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}
@@ -124,7 +125,8 @@ Configure Notification Alarm Handler 
    set to dictionary    ${json}    notificationType    ${type}    

    set to dictionary    ${json}    notificationType    ${type}    

    ${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

    &{notification_request}=  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}

    &{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}
@@ -135,7 +137,8 @@ Configure Notification Alarm Cleareance Handler 
    set to dictionary   ${json}    notificationType    ${type}

    set to dictionary   ${json}    notificationType    ${type}

    ${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

    &{notification_request}=  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}

    &{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}

SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot

+2 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,8 @@ Configure Notification Indicator Value Change Handler 
    set to dictionary    ${json}    notificationType    ${type}    

    set to dictionary    ${json}    notificationType    ${type}    

    ${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

    &{notification_request}=  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}

    &{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}

SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot

+8 −4
Original line number Original line Diff line number Diff line
@@ -97,7 +97,8 @@ Configure Notification VNF LCM Operation Occurrence Start Handler 
    set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}

    set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}

    ${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

    &{notification_request}=  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}

    &{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}
@@ -120,7 +121,8 @@ Configure Notification VNF LCM Operation Occurrence Result Handler 
    set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}

    set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}

    ${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

    &{notification_request}=  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}

    &{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}
@@ -143,7 +145,8 @@ Configure Notification VNF Identifier Creation Handler 
    set to dictionary   ${json}    notificationType    ${type}

    set to dictionary   ${json}    notificationType    ${type}

    ${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

    &{notification_request}=  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}

    &{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}
@@ -166,7 +169,8 @@ Configure Notification VNF Identifier Deletion Handler 
    set to dictionary   ${json}    notificationType    ${type}

    set to dictionary   ${json}    notificationType    ${type}

    ${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

    &{notification_request}=  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}

    &{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}

SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot

+4 −2
Original line number Original line Diff line number Diff line
@@ -86,7 +86,8 @@ Configure Notification Performance Information Available Handler 
    set to dictionary    ${json}    notificationType    ${type}    

    set to dictionary    ${json}    notificationType    ${type}    

    ${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

    &{notification_request}=  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}

    &{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}
@@ -97,7 +98,8 @@ Configure Notification Threshold Crossed Handler 
    set to dictionary   ${json}    notificationType    ${type}

    set to dictionary   ${json}    notificationType    ${type}

    ${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

    &{notification_request}=  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}

    &{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}

SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot

+6 −3
Original line number Original line Diff line number Diff line
@@ -113,7 +113,8 @@ Configure Notification Alarm List Rebuilt Handler 
    set to dictionary    ${json}    notificationType    ${type}    

    set to dictionary    ${json}    notificationType    ${type}    

    ${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

    &{notification_request}=  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}

    &{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}
@@ -124,7 +125,8 @@ Configure Notification Alarm Handler 
    set to dictionary    ${json}    notificationType    ${type}    

    set to dictionary    ${json}    notificationType    ${type}    

    ${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

    &{notification_request}=  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}

    &{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}
@@ -135,7 +137,8 @@ Configure Notification Alarm Cleareance Handler 
    set to dictionary   ${json}    notificationType    ${type}

    set to dictionary   ${json}    notificationType    ${type}

    ${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

    &{notification_request}=  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}

    &{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}