Commit 2c95f916 authored by Mudassar Khan's avatar Mudassar Khan Committed by Giacomo Bernini
Browse files

Fix issue #188: Set version headers

parent 9b2c35b9

SOL003/VNFLifecycleManagement-API/ApiVersion.robot

+20 −10
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ DELETE API Version with apiMajorVerion - Method not implemented 
*** Keywords ***

POST API Version

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Post    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response
@@ -138,6 +139,7 @@ POST API Version 
	

GET API Version

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Get    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response
@@ -145,6 +147,7 @@ GET API Version 
	

PUT API Version

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Put    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response
@@ -152,6 +155,7 @@ PUT API Version 
	

PATCH API Version

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Patch    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response
@@ -159,6 +163,7 @@ PATCH API Version 
	

DELETE API Version

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Delete    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response
@@ -166,6 +171,7 @@ DELETE API Version 
	

POST API Version with apiMajorVersion

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions

    ${outputResponse}=    Output    response
@@ -173,6 +179,7 @@ POST API Version with apiMajorVersion 
	

GET API Version with apiMajorVersion

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions

    ${outputResponse}=    Output    response
@@ -180,6 +187,7 @@ GET API Version with apiMajorVersion 
	

PUT API Version with apiMajorVersion

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions

    ${outputResponse}=    Output    response
@@ -187,6 +195,7 @@ PUT API Version with apiMajorVersion 
	

PATCH API Version with apiMajorVersion

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions

    ${outputResponse}=    Output    response
@@ -194,6 +203,7 @@ PATCH API Version with apiMajorVersion 
	

DELETE API Version with apiMajorVersion

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions

    ${outputResponse}=    Output    response

SOL003/VNFLifecycleManagement-API/ChangeCurrentVNFPackageTask.robot

+2 −1
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ POST Change current VNF Package Task with not permitted authorization scope 
*** Keywords ***

Check resource existence

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

    Set Headers    {"Version": "${API_VERSION}"}  

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

SOL003/VNFLifecycleManagement-API/CreateVNFSnapshotTask.robot

+2 −1
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ POST Create VNF Snapshot Task with not permitted authorization scope 
*** Keywords ***

Check resource existence

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

    Set Headers    {"Version": "${API_VERSION}"}  

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot

+2 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ Get Information about an individual VNF Instance with not permitted authorizatio 
*** Keywords ***

Check resource existence

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

    Set Headers    {"Version": "${API_VERSION}"}  

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot

+6 −3
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ VNF Instantiation with attribute targetScaleLevelInfo 
Send VNF Instantiation Request

    Log    Instantiate a VNF Instance

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

    Set Headers    {"Version": "${API_VERSION}"}  

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${body}=    Get File    jsons/instantiateVnfRequest.json
@@ -81,6 +82,7 @@ Send VNF Instantiation Request 
Send VNF Instantiation Request with attribute instantiationLevelId

    Log    Instantiate a VNF Instance

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

    Set Headers    {"Version": "${API_VERSION}"}  

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${template}=    Get File    jsons/instantiateVnfRequestInstantiationLevelId.json
@@ -90,6 +92,7 @@ Send VNF Instantiation Request with attribute instantiationLevelId 
Send VNF Instantiation Request with attribute targetScaleLevelInfo 

    Log    Instantiate a VNF Instance

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

    Set Headers    {"Version": "${API_VERSION}"}  

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${template}=    Get File    jsons/instantiateVnfRequestTargetScaleLevelInfo.json