Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
api-tests
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
NFV - Network Functions Virtualisation
api-tests
Commits
52911bf0
Commit
52911bf0
authored
4 years ago
by
Hammad Zafar
Committed by
Giacomo Bernini
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
updated importing variables for descriptors
parent
ad1b2ff2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!199
Merge "3.3.1 dev" into "release 3" master
,
!152
SOL002 VNF Lifecycle Management - Implementation of deltas between v3.3.1 and v2.7.1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+10
-2
10 additions, 2 deletions
.../VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
with
10 additions
and
2 deletions
SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+
10
−
2
View file @
52911bf0
...
...
@@ -11,8 +11,8 @@ Library Collections
Library
JSONSchemaLibrary
schemas/
Library
String
Library
Process
Variables
descriptors/SOL001/VNFD/vnfd_SOL001.yaml
Variables
descriptors/SOL006/VNFD/vnfd_SOL006.yaml
#
Variables descriptors/SOL001/VNFD/vnfd_SOL001.yaml
#
Variables descriptors/SOL006/VNFD/vnfd_SOL006.yaml
*** Keywords ***
Create Sessions
...
...
@@ -1455,6 +1455,7 @@ 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
@{VDU_labels}
=
Create List
@{VNF_labels}
=
Create List
@{VirtualLink_labels}
=
Create List
...
...
@@ -1482,6 +1483,7 @@ Fetch Information from SOL001 descriptor file
Get VNF Attributes from SOL001
[
Arguments
]
${VNF_label}
Import Variables
${CURDIR}
/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
${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}
${product_name}
=
Get Variable Value
${topology_template.node_templates.${VNF_label}.properties.product_name}
...
...
@@ -1497,6 +1499,7 @@ Get VNF Attributes from SOL001
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']}
...
...
@@ -1524,6 +1527,7 @@ Fetch Information from SOL006 descriptor file
Get VDU IDs
[
Arguments
]
${count}
Import Variables
${CURDIR}
/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
@{VDU_labels}
=
Create List
${Storage_labels}
=
Create List
FOR
${i}
IN RANGE
${count}
...
...
@@ -1536,6 +1540,7 @@ Get VDU IDs
Get Internal CPs for each VDU
[
Arguments
]
${vdu}
Import Variables
${CURDIR}
/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
${count}
=
Get Length
${nfv.vnfd[0].vdu[${vdu}]['int-cpd']}
${internal_CPs}
=
Create List
FOR
${i}
IN RANGE
${count}
...
...
@@ -1545,6 +1550,7 @@ Get Internal CPs for each VDU
Get External CP IDs
[
Arguments
]
${count}
Import Variables
${CURDIR}
/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
@{external_CPs}
=
Create List
FOR
${i}
IN RANGE
${count}
Append To List
${external_CPs}
${nfv.vnfd[0]['ext-cpd'][${i}]['id']}
...
...
@@ -1553,6 +1559,7 @@ Get External CP IDs
Get Virtual Link IDs
[
Arguments
]
${count}
Import Variables
${CURDIR}
/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
${VirtualLink_labels}
=
Create List
FOR
${i}
IN RANGE
${count}
Append To List
${VirtualLink_labels}
${nfv.vnfd[0]['int-virtual-link-desc'][${i}]['id']}
...
...
@@ -1561,6 +1568,7 @@ Get Virtual Link IDs
Get Instantiation Levels
[
Arguments
]
${count}
Import Variables
${CURDIR}
/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
@{Instantiation_Levels}
=
Create List
FOR
${i}
IN RANGE
${count}
Append To List
${Instantiation_Levels}
${nfv.vnfd[0].df['instantiation-level'][${i}]['id']}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment