Commit 985f849b authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

update to fix for issue #156 for v2.6.1

parent 9c7a1243

SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot

+12 −6
Original line number Original line Diff line number Diff line
@@ -102,7 +102,8 @@ Configure Notification Status Handler 
    ${BODY}=    evaluate    json.dumps(${json})    json

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

    Log  Creating mock request and response to handle ${endpoint}

    Log  Creating mock request and response to handle ${endpoint}

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}    

        

        

Check resource operationState is

Check resource operationState is
@@ -1106,7 +1107,8 @@ POST Operation occurrence 
    ${BODY}=	evaluate	json.loads('''${json}''')	json

    ${BODY}=	evaluate	json.loads('''${json}''')	json

    Log  Creating mock request and response to handle NSLcmOperationOccurrenceNotification

    Log  Creating mock request and response to handle NSLcmOperationOccurrenceNotification

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

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

    Create Mock Expectation  ${req}  ${rsp}

    Sleep  ${sleep_interval}

    Sleep  ${sleep_interval}

    Log  Verifying results

    Log  Verifying results
@@ -1120,7 +1122,8 @@ POST Id creation 
    ${BODY}=	evaluate	json.loads('''${json}''')	json

    ${BODY}=	evaluate	json.loads('''${json}''')	json

    Log  Creating mock request and response to handle NsIdentifierCreationNotification

    Log  Creating mock request and response to handle NsIdentifierCreationNotification

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

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

    Create Mock Expectation  ${req}  ${rsp}

    Sleep  ${sleep_interval}

    Sleep  ${sleep_interval}

    Log  Verifying results

    Log  Verifying results
@@ -1134,7 +1137,8 @@ POST Id deletion 
    ${BODY}=	evaluate	json.loads('''${json}''')	json

    ${BODY}=	evaluate	json.loads('''${json}''')	json

    Log  Creating mock request and response to handle NsIdentifierDeletionNotification

    Log  Creating mock request and response to handle NsIdentifierDeletionNotification

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

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

    Create Mock Expectation  ${req}  ${rsp}

    Sleep  ${sleep_interval}

    Sleep  ${sleep_interval}

    Log  Verifying results

    Log  Verifying results
@@ -1145,7 +1149,8 @@ POST Id deletion 
GET Notification endpoint

GET Notification endpoint

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

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

    &{req}=  Create Mock Request Matcher	GET  ${callback_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}

    Create Mock Expectation  ${req}  ${rsp}

    Sleep  ${sleep_interval}

    Sleep  ${sleep_interval}

    Verify Mock Expectation  ${req}

    Verify Mock Expectation  ${req}
@@ -1185,5 +1190,6 @@ Configure Notification NS Creation 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

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

    &{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}
 
    Create Mock Expectation  ${notification_request}  ${notification_response}

SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot

+8 −4
Original line number Original line Diff line number Diff line
@@ -98,7 +98,8 @@ Configure Notification NS LCM Operation Occurrence Start 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

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}





Check NS LCM Operation Occurrence Result Notification Http POST Request Body Json Schema Is  

Check NS LCM Operation Occurrence Result Notification Http POST Request Body Json Schema Is
@@ -120,7 +121,8 @@ Configure Notification NS LCM Operation Occurrence Result 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

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}





Check NS Identifier Creation Notification Http POST Request Body Json Schema Is  

Check NS Identifier Creation Notification Http POST Request Body Json Schema Is
@@ -142,7 +144,8 @@ Configure Notification NS Identifier Creation 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

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}

    

    

Check NS Identifier Deletion Notification Http POST Request Body Json Schema Is  

Check NS Identifier Deletion Notification Http POST Request Body Json Schema Is
@@ -164,7 +167,8 @@ Configure Notification NS Identifier Deletion 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

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

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

    Create Mock Expectation  ${notification_request}  ${notification_response}





Check NS LCM Operation Occurrence Start Notification Http POST Request Body notificationStatus attribute Is

Check NS LCM Operation Occurrence Start Notification Http POST Request Body notificationStatus attribute Is