Commit 914a5823 authored by Najam UI Hassan's avatar Najam UI Hassan
Browse files

bugs fix added and redundant keywords removed

parent 429f89d2

SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot

+2 −24
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ POST Cancel operation task Conflict 
    Check HTTP Response Body Json Schema Is    ProblemDetails



POST Cancel operation task Not Found

    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent

     [Documentation]    Test ID: 7.3.1.16.3

    ...    Test title: POST Cancel operation task Not Found

    ...    Test objective: The objective is to test that POST method cannot cancel a VNF lifecycle operation because the resource is not found
@@ -46,6 +45,7 @@ POST Cancel operation task Not Found 
    ...    Post-Conditions: none

    POST Cancel operation task

    Check HTTP Response Status Code Is    404

    Check HTTP Response Body Json Schema Is    ProblemDetails

    

GET Cancel operation task - Method not implemented

    [Documentation]    Test ID: 7.3.1.16.4
@@ -94,25 +94,3 @@ DELETE Cancel operation task - Method not implemented 
    ...    Post-Conditions: none 

    DELETE Cancel operation task

	Check HTTP Response Status Code Is    405
 
 No newline at end of file
 


*** Keywords ***

Check resource existence

    Set Headers    {"Accept":"${ACCEPT}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}

    Integer    response status    200



Launch another error handling action

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry

    Integer    response status    202

    

Check Fail not supported

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}

    # how to check if Fail is not supported?



Check resource FAILED_TEMP

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 

    String    response body operationState    FAILED_TEMP
 
 No newline at end of file

SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot

+1 −7
Original line number Diff line number Diff line
@@ -58,11 +58,6 @@ Precondition Checks - STARTING 
    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 

    String    response body operationState    STARTING



Precondition Checks - PROCESSING - ROLLING_BACK

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 

    String    response body operationState    PROCESSING 



Check Postcondition VNF Cancel - STARTING

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
@@ -76,4 +71,3 @@ Check Postcondition VNF Cancel - PROCESSING - ROLLING_BACK 
Check Operation Notification For Cancel 

    [Arguments]    ${status}

    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
 
 No newline at end of file
 
    
 No newline at end of file

SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot

+1 −17
Original line number Diff line number Diff line
@@ -68,19 +68,3 @@ DELETE Change external VNF connectivity - Method not implemented 
    ...    Post-Conditions: none 

    DELETE Change External VNF Connectivity

    Check HTTP Response Status Code Is    405
 
 No newline at end of file
 


*** Keywords ***

Check resource existence

    Set Headers    {"Accept":"${ACCEPT}"}  

    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 

    Integer    response status    200



Launch another LCM operation

    Set Headers  {"Accept":"${ACCEPT}"}  

    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    ${body}=    Get File    jsons/scaleVnfRequest.json

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}

    Integer    response status    202
 
 No newline at end of file

SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot

+1 −10
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ Library Process 
Suite Setup    Initialize System

Suite Teardown    Terminate All Processes    kill=true





*** Test Cases ***

Change external connectivity of VNF Workflow

    [Documentation]    Test ID: 7.3.1.20.1
@@ -39,19 +38,11 @@ Initialize System 
    ${body}=    Get File    jsons/changeExtVnfConnectivityRequest.json

    ${changeVnfExtConnectivityRequest}=    evaluate    json.loads('''${body}''')    json    

    

Precondition Checks

    Check resource instantiated

    ${LccnSubscriptions}=    Check subscriptions about one VNFInstance and operation type    ${vnfInstanceId}    VnfLcmOperationOccurrenceNotification    operationType=SCALE



Check Postcondition VNF Change Ext Connectivity

    Check resource instantiated

    ${extVLId}=    Get Vnf Ext Link Id    ${vnfInstanceId}

    Should be Equal    ${changeVnfExtConnectivityRequest["extVirtualLinks"][0]["id"]}    ${extVLId}

    

Create a new Grant - Sync - OPERATE

    Create a new Grant - Synchronous mode        ${vnfInstanceId}    ${vnfLcmOpOccId}    OPERATE

    

Check Operation Notification For Change Ext Connectivity 

    [Arguments]    ${status}

    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
 
 No newline at end of file
 
    
 No newline at end of file

SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot

+1 −39
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated) 
    Check HTTP Response Body Json Schema Is    ProblemDetails

  

POST Change deployment flavour of a vnfInstance Not Found

    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent

    [Documentation]    Test ID: 7.3.1.6.3

    ...    Test title: POST Change deployment flavour of a vnfInstance Not Found

    ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because the VNF instance resource is not found.
@@ -95,40 +94,3 @@ DELETE Change deployment flavour VNFInstance - Method not implemented 
    ...    Post-Conditions: none 

    DELETE Change VNF deployment flavour   

    Check HTTP Response Status Code Is    405
 
 No newline at end of file
 


*** Keywords ***

Check resource existence

    Set Headers    {"Accept":"${ACCEPT}"}  

    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 

    Integer    response status    200



Check resource not instantiated

    Set Headers    {"Accept":"${ACCEPT}"}  

    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 

    String    response body instantiationState    NOT_INSTANTIATED



Check resource instantiated

    Set Headers    {"Accept":"${ACCEPT}"}  

    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 

    String    response body instantiationState    INSTANTIATED    



Check change flavour not supported

    Set Headers    {"Accept":"${ACCEPT}"}  

    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 

    # how to check if change floavour is not supported? "flavourId" doesn't exist?



Launch another LCM operation

    Set Headers  {"Accept":"${ACCEPT}"}  

    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    ${body}=    Get File    jsons/scaleVnfRequest.json

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}

    Integer    response status    202
 
 No newline at end of file