Commit 6d4a5d58 authored by zafar's avatar zafar
Browse files

descriptors added for IndividualVNFPackage & NotificationConsumer resources

parent f3b7789e

SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot

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

    Check HTTP Response Status Code Is    200

    Check HTTP Response Body Json Schema Is   vnfPkgInfo

    Check HTTP Response Body Json Schema Is   vnfPkgInfo

    Check HTTP Response Body vnfPkgInfo Identifier matches the requested VNF Package

    Check HTTP Response Body vnfPkgInfo Identifier matches the requested VNF Package

    Check HTTP Response Body vnfPkgInfo content against VNF Descriptor





GET Individual VNF Package with invalid resource identifier

GET Individual VNF Package with invalid resource identifier

    [Documentation]    Test ID: 5.3.5.2.2

    [Documentation]    Test ID: 5.3.5.2.2

SOL005/VNFPackageManagement-API/NotificationConsumer.robot

+5 −2
Original line number Original line Diff line number Diff line 
*** Settings ***

*** Settings ***

Library           JSONSchemaLibrary    schemas/

Library           JSONSchemaLibrary    schemas/

Resource          environment/variables.txt

Resource          environment/variables.txt

Resource          VNFPackageManagementKeywords.robot

Library           OperatingSystem

Library           OperatingSystem

Library           JSONLibrary

Library           JSONLibrary

Library           String

Library           String
@@ -52,8 +53,9 @@ Post VNF Package Onboarding Notification 
    Set Headers  {"Accept":"${ACCEPT_JSON}"}  

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

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

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

    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    Add VNF Descriptor Content to VNF Package

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

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

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${descriptor_id}

    Post    ${callbackResp}    ${body}

    Post    ${callbackResp}    ${body}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}
@@ -63,8 +65,9 @@ Post VNF Package Change Notification 
    Set Headers  {"Accept":"${ACCEPT_JSON}"}  

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

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

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

    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    Add VNF Descriptor Content to VNF Package

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

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

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${descriptor_id}

    Post    ${callbackResp}    ${body}

    Post    ${callbackResp}    ${body}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
 
	Set Global Variable    ${response}    ${outputResponse}
 
 No newline at end of file

SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
	"subscriptionId":"{subscriptionId}",

	"subscriptionId":"{subscriptionId}",

	"timeStamp":"",

	"timeStamp":"",

	"vnfPkgId":"{vnfPkgId}",

	"vnfPkgId":"{vnfPkgId}",

	"vnfdId":"",

	"vnfdId":"{vnfdId}",

	"changeType":"PKG_DELETE",

	"changeType":"PKG_DELETE",

	"_links":""

	"_links":""

}}
 
}}

SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
	"subscriptionId":"{subscriptionId}",

	"subscriptionId":"{subscriptionId}",

	"timeStamp":"",

	"timeStamp":"",

	"vnfPkgId":"{vnfPkgId}",

	"vnfPkgId":"{vnfPkgId}",

	"vnfdId":"",

	"vnfdId":"{vnfdId}",

	"vnfmInfo":"",

	"vnfmInfo":"",

	"_links":""

	"_links":""

}}
 
}}