Commit 944a23bc authored by zafar's avatar zafar
Browse files

descriptors added

parent 89700584

SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot

+2 −1
Original line number Diff line number Diff line
@@ -513,8 +513,9 @@ POST scale nsInstance 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to NS Instance

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

    ${body}=        Format String   ${template}     scaleType=${scaleType}   scaleTimeout=${scaleTimeout}   scaleVnfType=${scaleVnfType}   scaleGroupDescriptor=${scaleGroupDescriptor}   scaleMemberVnfIndex=${scaleMemberVnfIndex}

    ${body}=        Format String   ${template}     scaleType=${scaleType}   scaleTimeout=${scaleTimeout}   scaleVnfType=${scaleVnfType}   scaleGroupDescriptor=${scaleGroupDescriptor}   scaleMemberVnfIndex=${scaleMemberVnfIndex}    vnfInstantiationLevelId=${instantiationLevel_id}

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

SOL005/NSLifecycleManagement-API/NotificationConsumer.robot

+7 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=fal 
Library    OperatingSystem

Library    JSONLibrary

Library    JSONSchemaLibrary    schemas/

Resource   NSLCMOperationKeywords.robot   



Suite Setup    Check resource existence and get CallbackUri
@@ -65,12 +66,16 @@ Post Ns Lcm Operation Occurrence Notification 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Notification

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

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

    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    affectedVnf=${descriptor_id}   

    Post    ${callbackResp}    ${body}

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	

Add VNF Descriptor Content to Notification

    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 NS Instance    ELSE    Parse SOL006 NS Instance

	

Post Ns Identifier Creation Notification

    log    Trying to perform a POST to get notification

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

SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json

+1 −0
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ 
	"notificationStatus":"START",

	"operationState":"PROCESSING",

	"isAutomaticInvocation":"True",

	"affectedVnf": "{affectedVnf}",

	"_links":""

}}

SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json

+4 −0
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@ 
	"scaleType": "{scaleType}",

	"timeout_ns_scale": {scaleTimeout},

	"scaleVnfData": {{

		"vnfInstanceid": {},

		"scaleVnfType": "{scaleVnfType}",

		"scaleToLevelData": {{

			"vnfInstantiationLevelId": "{vnfInstantiationLevelId}"

		}},

		"scaleByStepData": {{

			"scaling-group-descriptor": "{scaleGroupDescriptor}",

			"member-vnf-index": "{scaleMemberVnfIndex}"

SOL005/VNFPackageManagement-API/IndividualSubscription.robot

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ GET Individual VNF Package Subscription 
    Check HTTP Response Status Code Is    200

    Check HTTP Response Body Json Schema Is   PkgmSubscription

    Check HTTP Response Body Subscription Identifier matches the requested Subscription

    Check HTTP Response Body PkgmSubscription content against VNF Descriptor



GET Individual VNF Package Subscription with invalid resource identifier

    [Documentation]    Test ID: 5.3.5.8.2