Skip to content
Snippets Groups Projects
Commit c0d6d76d authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch '3.3.1-dev-SOL003-VNFLifecycleOperationGranting' into '3.3.1-dev' 

SOL003 VNF Lifecycle Operation Granting - Implementation of deltas between v3.3.1 and v2.7.1

See merge request nfv/api-tests!158
parents e11ef6aa ab31b3da
No related branches found
No related tags found
2 merge requests!199Merge "3.3.1 dev" into "release 3" master,!158SOL003 VNF Lifecycle Operation Granting - Implementation of deltas between v3.3.1 and v2.7.1
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 775 additions and 663 deletions
SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
+ 10
− 10
View file @ c0d6d76d
......@@ -13,7 +13,7 @@ POST API Version - Method not implemented
... Test title: POST API version - Method not implemented
... Test objective: The objective is to test that POST method is not implemented
... Pre-conditions: none
... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v3.3.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
......@@ -25,7 +25,7 @@ GET API Version
... Test title: GET API Version
... Test objective: The objective is to test that GET method successfully return ApiVersionInformation
... Pre-conditions: none
... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v3.3.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
......@@ -38,7 +38,7 @@ PUT API Version - Method not implemented
... Test title: PUT API Version - Method not implemented
... Test objective: The objective is to test that PUT method is not implemented
... Pre-conditions: none
... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v3.3.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
......@@ -50,7 +50,7 @@ PATCH API Version - Method not implemented
... Test title: PATCH API Version - Method not implemented
... Test objective: The objective is to test that PATCH method is not implemented
... Pre-conditions: none
... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v3.3.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
......@@ -62,7 +62,7 @@ DELETE API Version - Method not implemented
... Test title: DELETE API Version - Method not implemented
... Test objective: The objective is to test that DELETE method is not implemented
... Pre-conditions: none
... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v3.3.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
......@@ -74,7 +74,7 @@ POST API Version with apiMajorVerion - Method not implemented
... Test title: POST API version with apiMajorVerion - Method not implemented
... Test objective: The objective is to test that POST method is not implemented
... Pre-conditions: none
... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v3.3.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
......@@ -86,7 +86,7 @@ GET API Version with apiMajorVerion
... Test title: GET API Version with apiMajorVerion
... Test objective: The objective is to test that GET method successfully return ApiVersionInformation
... Pre-conditions: none
... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v3.3.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
......@@ -99,7 +99,7 @@ PUT API Version with apiMajorVerion - Method not implemented
... Test title: PUT API Version with apiMajorVerion - Method not implemented
... Test objective: The objective is to test that PUT method is not implemented
... Pre-conditions: none
... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v3.3.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
......@@ -111,7 +111,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
... Test title: PATCH API Version with apiMajorVerion - Method not implemented
... Test objective: The objective is to test that PATCH method is not implemented
... Pre-conditions: none
... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v3.3.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
......@@ -123,7 +123,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
... Test title: DELETE API Version with apiMajorVerion - Method not implemented
... Test objective: The objective is to test that DELETE method is not implemented
... Pre-conditions: none
... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v3.3.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
......
SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+ 14
− 15
View file @ c0d6d76d
......@@ -6,8 +6,8 @@ Library OperatingSystem
Library JSONLibrary
Library JSONSchemaLibrary schemas/
Library Collections
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
Documentation This resource represents grants. The client can use this resource to obtain permission
... from the NFVO to perform a particular VNF lifecycle operation.
......@@ -21,8 +21,8 @@ Requests a grant for a particular VNF lifecycle operation - Synchronous mode
[Documentation] Test ID: 7.3.2.1.1
... Test title: Requests a grant for a particular VNF lifecycle operation - Synchronous mode
... Test objective: The objective is to request a grant for a particular VNF lifecycle operation and perform a JSON schema validation on the returned grant data structure
... Pre-conditions:
... Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Pre-conditions: none
... Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: The NFVO can decide immediately what to respond to a grant request
... Post-Conditions: The grant information is available to the VNFM.
......@@ -35,8 +35,8 @@ Requests a grant for a particular VNF lifecycle operation - Asynchronous mode
[Documentation] Test ID: 7.3.2.1.2
... Test title: Requests a grant for a particular VNF lifecycle operation - Asynchronous mode
... Test objective: The objective is to request a grant for a particular VNF lifecycle operation and perform a JSON schema validation on the returned grant data structure
... Pre-conditions:
... Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Pre-conditions: none
... Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: The NFVO can not decide immediately what to respond to a grant request
... Post-Conditions: The grant information is available to the VNFM.
......@@ -51,7 +51,7 @@ Requests a grant for a particular VNF lifecycle operation - Forbidden
... Test title: Requests a grant for a particular VNF lifecycle operation - Forbidden
... Test objective: The objective is to request a grant for a particular VNF lifecycle operation and the grant is rejected
... Pre-conditions: none
... Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -64,7 +64,7 @@ GET Grants - Method not implemented
... Test title: GET Grants - Method not implemented
... Test objective: The objective is to test that GET method is not allowed for Life cycle operation granting
... Pre-conditions: none
... Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -76,7 +76,7 @@ PUT Grants - Method not implemented
... Test title: PUT Grants - Method not implemented
... Test objective: The objective is to test that PUT method is not allowed for Life cycle operation granting
... Pre-conditions: none
... Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -88,7 +88,7 @@ PATCH Grants - Method not implemented
... Test title: PATCH Grants - Method not implemented
... Test objective: The objective is to test that PATCH method is not allowed for Life cycle operation granting
... Pre-conditions: none
... Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -100,13 +100,12 @@ DELETE Grants - Method not implemented
... Test title: DELETE Grants - Method not implemented
... Test objective: The objective is to test that DELETE method is not allowed for Life cycle operation granting
... Pre-conditions: none
... Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: resources are not deleted
Delete Grants
Check HTTP Response Status Code Is 405
Get an individual grant - Successful
*** Keywords ***
Wait for individual grant successful notification
......@@ -216,6 +215,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
${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}
......@@ -230,6 +230,7 @@ Fetch Information from SOL001 descriptor file
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']}
......@@ -239,6 +240,4 @@ Fetch Information from SOL006 descriptor file
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 ${Descriptor_Version} ${descriptor_version}
\ No newline at end of file
SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+ 17
− 12
View file @ c0d6d76d
......@@ -5,8 +5,8 @@ Library JSONLibrary
Library JSONSchemaLibrary schemas/
Library Collections
Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false
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
Documentation This resource represents an individual grant. The client can use this resource to read the grant.
... It is determined by means outside the scope of the present document, such as configuration or policy,
... how long an individual grant is available.
......@@ -17,7 +17,7 @@ POST Individual Grant - Method not implemented
... Test title: POST Individual Grant - Method not implemented
... Test objective: The objective is to test that POST method is not allowed for Life cycle operation granting
... Pre-conditions: none
... Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -28,8 +28,8 @@ GET an individual grant - Successful
[Documentation] Test ID: 7.3.2.2.2
... Test title: GET an individual grant - Successful
... Test objective: The objective is to retrieve a grant for a particular VNF Lifecycle Operation.
... Pre-conditions: The grant information is available to the VNFM
... Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Pre-conditions: The grant information is available to the NFVO
... Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -44,7 +44,7 @@ GET an individual grant - Process ongoing
... Test title: GET an individual grant - Process ongoing
... Test objective: The objective is to retrieve a grant for a particular VNF lifecycle operation when process is ongoing and no grant is available yet.
... Pre-conditions: The process of creating the grant is ongoing, no grant is available yet.
... Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -58,7 +58,7 @@ GET an individual grant - grant rejected
... Test title: GET an individual grant - grant rejected
... Test objective: The objective is to retrieve a grant for a particular VNF Lifecycle Operation but error returned because grant has been rejected.
... Pre-conditions: none
... Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -71,7 +71,7 @@ PUT an individual grant - Method not implemented
... Test title: PUT an individual grant - Method not implemented
... Test objective: The objective is to test that PUT method is not allowed to for Life cycle operation granting
... Pre-conditions: none
... Reference: Clause 9.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -83,7 +83,7 @@ PATCH an individual grant - Method not implemented
... Test title: PATCH an individual grant - Method not implemented
... Test objective: The objective is to test that PATCH method is not allowed to for Life cycle operation granting
... Pre-conditions: none
... Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -95,7 +95,7 @@ DELETE an individual grant - Method not implemented
... Test title: DELETE an individual grant - Method not implemented
... Test objective: The objective is to test that DELETE method is not allowed to for Life cycle operation granting
... Pre-conditions: none
... Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
... Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v3.3.1
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
......@@ -176,6 +176,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
@{VirtualLink_labels}= Create List
@{CP_labels}= Create List
......@@ -193,6 +194,7 @@ Fetch Information from SOL001 descriptor file
Set Global Variable @{CP_IDs} @{CP_labels}
Fetch Information from SOL006 descriptor file
Import Variables ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
${VDUcount}= Get Length ${nfv.vnfd[0].vdu}
${extCP_count}= Get Length ${nfv.vnfd[0]['ext-cpd']}
${virtualLink_count}= Get length ${nfv.vnfd[0]['int-virtual-link-desc']}
......@@ -206,7 +208,8 @@ Fetch Information from SOL006 descriptor file
END
Get VDU IDs
[Arguments] ${count}
[Arguments] ${count}
Import Variables ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
@{VDU_labels}= Create List
@{Compute_labels}= Create List
FOR ${i} IN RANGE ${count}
......@@ -218,6 +221,7 @@ Get VDU IDs
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}
......@@ -225,7 +229,8 @@ Get External CP IDs
Set Global Variable ${externalCP_IDs} ${external_CPs}
Get Virtual Link IDs
[Arguments] ${count}
[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']}
......
SOL003/VNFLifecycleOperationGranting-API/jsons/grantRejectedRequest.json
+ 1
− 0
View file @ c0d6d76d
......@@ -5,6 +5,7 @@
"flavourId": "{flavourId}",
"operation": "INSTANTIATE",
"isAutomaticInvocation": true,
"instantiationLevelId": "",
"_links": {{
"vnfLcmOpOcc": {{
"href": "string"
......
SOL003/VNFLifecycleOperationGranting-API/jsons/grantRequest.json
+ 1
− 0
View file @ c0d6d76d
......@@ -5,6 +5,7 @@
"flavourId": "{flavourId}",
"operation": "INSTANTIATE",
"isAutomaticInvocation": true,
"instantiationLevelId": "",
"_links": {{
"vnfLcmOpOcc": {{
"href": "string"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment