Commit 3a5eb54b authored by Hammad Zafar's avatar Hammad Zafar Committed by Giacomo Bernini
Browse files

updated importing of variables for NSD

parent 197891b1
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ Library JSONSchemaLibrary schemas/
Library    RequestsLibrary
Library    Process
Library    String
Variables  descriptors/SOL006/NSD/nsd_SOL006.yaml
Variables  descriptors/SOL001/NSD/nsd_SOL001.yaml
#Variables  descriptors/SOL006/NSD/nsd_SOL006.yaml
#Variables  descriptors/SOL001/NSD/nsd_SOL001.yaml

*** Keywords ***
GET all Network Service Descriptors Information
@@ -1532,6 +1532,7 @@ PARSE the NS Descriptor File
    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 NS descriptor file    ELSE    Fetch Information from SOL006 NS descriptor file

Fetch Information from SOL001 NS descriptor file
    Import Variables    ${CURDIR}/descriptors/SOL001/NSD/nsd_SOL001.yaml
    ${ns_descriptor_id}=    Get Variable Value    ${topology_template.node_templates.properties.descriptorId}
    ${designer}=    Get Variable Value    ${topology_template.node_templates.properties.designer}
    ${version}=    Get Variable Value    ${topology_template.node_templates.properties.version}
@@ -1545,6 +1546,7 @@ Fetch Information from SOL001 NS descriptor file
    Set Global Variable    ${NS_InvariantID}    ${invariantId}

Fetch Information from SOL006 NS descriptor file
    Import Variables    ${CURDIR}/descriptors/SOL006/NSD/nsd_SOL006.yaml
    ${nsd_id}=    Get Variable Value    ${nfv.nsd[0].id}
    Set Global Variable    ${NS_DescriptorID}    ${nsd_id}