Commit dd0c37d5 authored by Elian Kraja's avatar Elian Kraja
Browse files

Merge branch '2.6.1-fix-plu' of https://forge.etsi.org/rep/nfv/api-tests into 2.6.1-fix-plu

parents 9e667fcd c0d00346

SOL002/VNFFaultManagement-API/NotificationEndpoint.robot

+6 −3
Original line number Original line Diff line number Diff line
@@ -114,7 +114,8 @@ 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

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





Configure Notification Alarm Handler

Configure Notification Alarm Handler
@@ -124,7 +125,8 @@ 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

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





Configure Notification Alarm Cleareance Handler

Configure Notification Alarm Cleareance Handler
@@ -134,7 +136,8 @@ 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

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

  

  

Configure Notification Forward

Configure Notification Forward

SOL002/VNFIndicator-API/Subscriptions.robot

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

    

Check Notification Endpoint

Check Notification Endpoint

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

    Create Mock Expectation  ${notification_request}  ${notification_response}

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

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

    Clear Requests  ${callback_endpoint}

    Clear Requests  ${callback_endpoint}

SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot

+2 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,8 @@ Configure Notification Indicator Value Change 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}





Configure Notification Forward

Configure Notification Forward

SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot

+8 −4
Original line number Original line Diff line number Diff line
@@ -98,7 +98,8 @@ Configure Notification VNF 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 VNF LCM Operation Occurrence Result Notification Http POST Request Body Json Schema Is  

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

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

Check VNF Identifier Deletion Notification Http POST Request Body Json Schema Is
@@ -164,7 +167,8 @@ Configure Notification VNF 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 VNF LCM Operation Occurrence Start Notification Http POST Request Body notificationStatus attribute Is

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

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+8 −4
Original line number Original line Diff line number Diff line
@@ -957,7 +957,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
@@ -970,7 +971,8 @@ POST Id creation 
    ${BODY}=	evaluate	json.loads('''${json}''')	json

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

    Log  Creating mock request and response to handle vnfLcmOperationOccurrenceNotification

    Log  Creating mock request and response to handle vnfLcmOperationOccurrenceNotification

    &{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
@@ -983,7 +985,8 @@ POST Id deletion 
    ${BODY}=	evaluate	json.loads('''${json}''')	json

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

    Log  Creating mock request and response to handle vnfLcmOperationOccurrenceNotification

    Log  Creating mock request and response to handle vnfLcmOperationOccurrenceNotification

    &{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
@@ -993,7 +996,8 @@ POST Id deletion 
GET test endpoint

GET test 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}