Commit d61a1faf authored by Muhammad Hamza's avatar Muhammad Hamza Committed by Giacomo Bernini
Browse files

fixed VNFD parsing in SOL003 APIs

parent 4e774dd7

SOL002/VNFLifecycleManagement-API/environment/variables.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,7 @@ ${check_descriptors} 1 
${descriptorType}    SOL006

${descriptorType}    SOL006

${check_multiple_instances}    0

${check_multiple_instances}    0





#############internal variables used for descriptor parsing################

${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute

${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute

${tosca_type_VNF}    tosca.nodes.nfv.VNF

${tosca_type_VNF}    tosca.nodes.nfv.VNF

${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink

${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

+17 −9
Original line number Original line Diff line number Diff line
@@ -1530,14 +1530,22 @@ PARSE the Descriptor File 
    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file

    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file

    

    

Fetch Information from SOL001 descriptor file

Fetch Information from SOL001 descriptor file

    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL001.yaml 

    @{VDU_labels}=    Create List

    @{VDU_labels}=    Create List

    @{VNF_labels}=    Create List

    @{VNF_labels}=    Create List

    @{VirtualLink_labels}=    Create List

    @{VirtualLink_labels}=    Create List

    @{CP_labels}=    Create List

    @{CP_labels}=    Create List

    @{Storage_labels}=    Create List

    @{Storage_labels}=    Create List

    FOR    ${key}    IN    @{node_types.keys()}

        ${node_type}=    Get Variable Value    ${node_types['${key}']['derived_from']}

        ${is_VNF}=    Run Keyword And Return Status    Should Be Equal As Strings    ${node_type}    ${tosca_type_VNF}

        Run Keyword If    ${is_VNF}    Set Global Variable    ${tosca_type_derived_from_VNF}    ${key}

    END  

    ${derived_type_is_used}=    Run Keyword And Return Status    Should not be empty    ${tosca_type_derived_from_VNF}

    Run Keyword If    ${derived_type_is_used}    Set Global Variable    ${tosca_type_VNF}    ${tosca_type_derived_from_VNF}



    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 

    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 

        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}

        ${key_type}=    Get Variable Value    ${topology_template.node_templates['${key}'].type}

        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}

        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}

        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}

        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}

        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}

        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
@@ -1558,13 +1566,13 @@ Fetch Information from SOL001 descriptor file 




Get VNF Attributes from SOL001

Get VNF Attributes from SOL001

    [Arguments]    ${VNF_label}

    [Arguments]    ${VNF_label}

    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL001.yaml    

    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_id}

    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.descriptor_id}

    ${provider}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.provider}

    ${provider}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.provider}

    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.product_name}

    ${product_name}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.product_name}

    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}

    ${software_version}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.software_version}

    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}

    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.descriptor_version}

    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}

    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.flavour_id}

    

    

    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}

    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}

    Set Global Variable    ${Provider}    ${provider}

    Set Global Variable    ${Provider}    ${provider}

SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

+1 −3
Original line number Original line Diff line number Diff line
@@ -90,7 +90,6 @@ topology_template: 
        order: 1

        order: 1

      requirements:

      requirements:

        - virtual_binding: VDU-B

        - virtual_binding: VDU-B

    vdu-b-1-vsd:

    management:

    management:

      type: "tosca.nodes.nfv.VduCp"

      type: "tosca.nodes.nfv.VduCp"

      properties:

      properties:
@@ -98,7 +97,6 @@ topology_template: 
        order: 0

        order: 0

      requirements:

      requirements:

        - virtual_binding: VDU-B

        - virtual_binding: VDU-B

    vdu-b-1-vsd:

    left:

    left:

      type: "tosca.nodes.nfv.VduCp"

      type: "tosca.nodes.nfv.VduCp"

      properties:

      properties:

SOL003/VNFLifecycleManagement-API/environment/variables.txt

+4 −2
Original line number Original line Diff line number Diff line
@@ -110,11 +110,13 @@ ${callbackResp} localhost 
${descriptorType}    SOL001

${descriptorType}    SOL001

${check_descriptors}	1

${check_descriptors}	1





#############internal variables used for descriptor parsing################

${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute

${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute

${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder

${tosca_type_VNF}    tosca.nodes.nfv.VNF

${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink

${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink

${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp

${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp

${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage

${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage

${tosca_type_derived_from_VNF} 





${VDU_IDs}

${VDU_IDs}

${VNF_IDs}

${VNF_IDs}

SOL003/VNFLifecycleOperationGranting-API/Grants.robot

+3 −138
Original line number Original line Diff line number Diff line 
*** Settings ***

*** Settings ***

Library    String

Library    String

Resource   environment/variables.txt

Resource   environment/variables.txt

Resource   VNFLifecycleOperationGrantingKeywords.robot 

Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false

Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false

Library    OperatingSystem

Library    OperatingSystem

Library    JSONLibrary

Library    JSONLibrary
@@ -12,7 +13,6 @@ Documentation This resource represents grants. The client can use this resour 
...     from the NFVO to perform a particular VNF lifecycle operation.

...     from the NFVO to perform a particular VNF lifecycle operation.





*** Variables ***

*** Variables ***

${response}    {}

${retry}   2 min

${retry}   2 min

${polling}    10 sec

${polling}    10 sec
@@ -111,138 +111,3 @@ DELETE Grants - Method not implemented 
*** Keywords ***

*** Keywords ***

Wait for individual grant successful notification

Wait for individual grant successful notification

    Wait Until Keyword Succeeds    ${retry}   ${polling}    Get an individual grant - Successful
 
    Wait Until Keyword Succeeds    ${retry}   ${polling}    Get an individual grant - Successful
 
 No newline at end of file
 
Send Request Grant Request in Synchronous mode

    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/grants

    Pass Execution If    ${SYNC_MODE} == 0    The Granting process is asynchronous mode. Skipping the test

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

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

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

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

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

    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${Descriptor_ID}    flavourId=${Flavour_ID}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}

    ${body}=    Output    response

    Set Suite Variable    ${response}    ${body}

    

Send Request Grant Request in Asynchronous mode

    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/grants

    Pass Execution If    ${SYNC_MODE} == 1    The Granting process is synchronous mode. Skipping the test

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

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

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

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

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

    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${Descriptor_ID}    flavourId=${Flavour_ID}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}

    ${body}=    Output    response

    Set Suite Variable    ${response}    ${body}

    

Send Request for a new Grant Forbiden Operation   

    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/grants

    Log    The grant request should be rejected

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

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

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

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

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

    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${Descriptor_ID}    flavourId=${Flavour_ID}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}

    ${body}=    Output    response

    Set Suite Variable    ${response}    ${body}

    

Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}    

    Should Be Equal As Strings    ${response['status']}    ${expected_status}

    Log    Status code validated



Check Operation Occurrence Id existence 

    ${occId}=    Get Value From Json    ${response['headers']}    $..Location

    Should Not Be Empty    ${occId}



Check HTTP Response Header Contains

    [Arguments]    ${CONTENT_TYPE}

    Should Contain    ${response['headers']}    ${CONTENT_TYPE}

    Log    Header is present

    

Check HTTP Response Body Json Schema Is

    [Arguments]    ${input}

    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json

    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json

    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json

    Validate Json    ${schema}    ${response['body']}

    

Get an individual grant - Successful

    log    Trying to read an individual grant

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

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

    Get    ${response['headers']['Location']}

    Log    Validate Status code

    Integer    response status    200

    

Get Grants

    Log    Trying to perform a GET. This method should not be implemented

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

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

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

    ${body}=    Output    response

    Set Suite Variable    ${response}    ${body}

    

Put Grants

    Log    Trying to perform a PUT. This method should not be implemented

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

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

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

    ${body}=    Output    response

    Set Suite Variable    ${response}    ${body}

    

Patch Grants

    Log    Trying to perform a PATCH. This method should not be implemented

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

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

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

    ${body}=    Output    response

    Set Suite Variable    ${response}    ${body} 

    

Delete Grants

    Log    Trying to perform a DELETE. This method should not be implemented

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

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

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

    ${body}=    Output    response

    Set Suite Variable    ${response}    ${body}

    

Add VNF Descriptor Content to Grant Request

    PARSE the Descriptor File

    

PARSE the Descriptor File

    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file

    

Fetch Information from SOL001 descriptor file

    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.properties.descriptor_id}

    ${provider}=    Get Variable Value    ${topology_template.node_templates.properties.provider}

    ${product_name}=    Get Variable Value    ${topology_template.node_templates.properties.product_name}

    ${software_version}=    Get Variable Value    ${topology_template.node_templates.properties.software_version}

    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.properties.descriptor_version}

    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.properties.flavour_id}

    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}

    Set Global Variable    ${Provider}    ${provider}

    Set Global Variable    ${Product_Name}    ${product_name}

    Set Global Variable    ${Software_Version}    ${software_version}

    Set Global Variable    ${Descriptor_Version}    ${descriptor_version}

    Set Global Variable    ${Flavour_ID}    ${flavour_id}

    

Fetch Information from SOL006 descriptor file

    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml

    ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}

    ${provider}=    Get Variable Value    ${nfv.vnfd[0].provider}

    ${product_name}=    Get Variable Value    ${nfv.vnfd[0]['product-name']}

    ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}

    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}       

    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}

    Set Global Variable    ${Provider}    ${provider}

    Set Global Variable    ${Product_Name}    ${product_name}

    Set Global Variable    ${Software_Version}    ${software_version}

    Set Global Variable    ${Descriptor_Version}    ${descriptor_version}