Commit 349c85ab authored by zafar's avatar zafar
Browse files

NS descriptors added for NS-LCM-API test cases

parent cf182b24

SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot

+1 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ Get status information about Individual NS LCM occurrences 
	GET Individual NS LCM OP Occurrence

	GET Individual NS LCM OP Occurrence

	Check HTTP Response Status Code Is    200

	Check HTTP Response Status Code Is    200

	Check HTTP Response Body Json Schema Is    NsLcmOpOcc

	Check HTTP Response Body Json Schema Is    NsLcmOpOcc

	Check NsLcmOpOcc content against NS Descriptor

	

	

PUT status information about Individual NS LCM occurrences - Method not implemented

PUT status information about Individual NS LCM occurrences - Method not implemented

     [Documentation]    Test ID: 5.3.2.9.3

     [Documentation]    Test ID: 5.3.2.9.3

SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot

+5 −3
Original line number Original line Diff line number Diff line
@@ -559,8 +559,9 @@ GET Instantiate NSInstance 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

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

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

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

    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File

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

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

    ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}   vimAccountId=${vimAccountId}   nsdId=${nsdId}

    ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}   vimAccountId=${vimAccountId}   nsdId=${nsdId}    sapdId=${SAP_IDs[0]}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate    ${body}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate    ${body}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}
@@ -651,8 +652,9 @@ POST Update NSInstance 
    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

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

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

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

    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File

    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File

    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File  

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

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

    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfFlavourId=${Flavour_ID}    newFlavourId=${Flavour_ID}    vnfVirtualLinkDescId=${VirtualLink_IDs[0]}    instantiationLevelId=${InstantiationLevel_IDs[1]}    vnfInstantiationLevelId=${InstantiationLevel_IDs[0]}    

    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfFlavourId=${Flavour_ID}    newFlavourId=${Flavour_ID}    vnfVirtualLinkDescId=${VirtualLink_IDs[0]}    instantiationLevelId=${InstantiationLevel_IDs[1]}    vnfInstantiationLevelId=${InstantiationLevel_IDs[0]}    newNsdId=${NS_DescriptorID}    sapdId=${SAP_IDs[0]}    

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update    ${body}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update    ${body}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse}

SOL005/NSLifecycleManagement-API/NotificationConsumer.robot

+2 −1
Original line number Original line Diff line number Diff line
@@ -67,8 +67,9 @@ Post Ns Lcm Operation Occurrence Notification 
    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

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

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

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

    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File

    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File

    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File

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

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

    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${Descriptor_ID}  

    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${Descriptor_ID}    nsdId=${NS_DescriptorID}  

    Post    ${callbackResp}    ${body}

    Post    ${callbackResp}    ${body}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json

+5 −3
Original line number Original line Diff line number Diff line 
{

{{

	"nsFlavourId": "floavour_id",

	"nsFlavourId": "floavour_id",

	"sapData":[],

	"sapData":[

		"{sapdId}"

	],

	"addpnfData":[],

	"addpnfData":[],

	"vnfInstanceData":[],

	"vnfInstanceData":[],

	"nestedNsInstanceData":[],

	"nestedNsInstanceData":[],
@@ -8,4 +10,4 @@ 
	"additionalParamsForNs":{},

	"additionalParamsForNs":{},

	"additionalParamForNestedNs":[],

	"additionalParamForNestedNs":[],

	"additionalParamsForVnf":[]

	"additionalParamsForVnf":[]

}
 
}}
 
 No newline at end of file
 
 No newline at end of file

SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json

+3 −0
Original line number Original line Diff line number Diff line
@@ -12,5 +12,8 @@ 
	"affectedVnf": {{

	"affectedVnf": {{

		"vnfdId": "{vnfdId}"

		"vnfdId": "{vnfdId}"

	}},

	}},

	"affectedNs": {{

		"nsdId": "{nsdId}"

	}},

	"_links":""

	"_links":""

}}
 
}}