Commit 1b6be94d authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch '3.5.1-dev-SOL003-VNF-Grant' into '3.5.1-dev' 

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

See merge request nfv/api-tests!216
parents 008800e5 fb5ecaa3

SOL003/VNFLifecycleOperationGranting-API/Grants.robot

+7 −7
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ Requests a grant for a particular VNF lifecycle operation - Synchronous mode 
    ...    Test title: Requests a grant for a particular VNF lifecycle operation - Synchronous mode

    ...    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

    ...    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: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: The NFVO can decide immediately what to respond to a grant request

    ...    Applicability: The NFVO can decide immediately what to respond to a grant request

    ...    Post-Conditions: The grant information is available to the VNFM.

    ...    Post-Conditions: The grant information is available to the VNFM.
@@ -36,7 +36,7 @@ Requests a grant for a particular VNF lifecycle operation - Asynchronous mode 
    ...    Test title: Requests a grant for a particular VNF lifecycle operation - Asynchronous mode

    ...    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

    ...    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: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: The NFVO can not decide immediately what to respond to a grant request

    ...    Applicability: The NFVO can not decide immediately what to respond to a grant request

    ...    Post-Conditions: The grant information is available to the VNFM.

    ...    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 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

    ...    Test objective: The objective is to request a grant for a particular VNF lifecycle operation and the grant is rejected

    ...    Pre-conditions: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions: none

    ...    Post-Conditions: none
@@ -64,7 +64,7 @@ GET Grants - Method not implemented 
    ...    Test title: 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 

    ...    Test objective: The objective is to test that GET method is not allowed for Life cycle operation granting 

    ...    Pre-conditions: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions:   none

    ...    Post-Conditions:   none
@@ -76,7 +76,7 @@ PUT Grants - Method not implemented 
    ...    Test title: 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 

    ...    Test objective: The objective is to test that PUT method is not allowed for Life cycle operation granting 

    ...    Pre-conditions: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions: none

    ...    Post-Conditions: none
@@ -88,7 +88,7 @@ PATCH Grants - Method not implemented 
    ...    Test title: 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  

    ...    Test objective: The objective is to test that PATCH method is not allowed for Life cycle operation granting  

    ...    Pre-conditions: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions: none 

    ...    Post-Conditions: none
@@ -100,7 +100,7 @@ DELETE Grants - Method not implemented 
    ...    Test title: 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  

    ...    Test objective: The objective is to test that DELETE method is not allowed for Life cycle operation granting  

    ...    Pre-conditions: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions:  resources are not deleted

    ...    Post-Conditions:  resources are not deleted

SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot

+7 −7
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ POST Individual Grant - Method not implemented 
    ...    Test title: 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  

    ...    Test objective: The objective is to test that POST method is not allowed for Life cycle operation granting  

    ...    Pre-conditions: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions: none 

    ...    Post-Conditions: none
@@ -30,7 +30,7 @@ GET an individual grant - Successful 
    ...    Test title: GET an individual grant - Successful

    ...    Test title: GET an individual grant - Successful

    ...    Test objective: The objective is to retrieve a grant for a particular VNF Lifecycle Operation.

    ...    Test objective: The objective is to retrieve a grant for a particular VNF Lifecycle Operation.

    ...    Pre-conditions: The  grant information is available to the NFVO

    ...    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

    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions: none

    ...    Post-Conditions: none
@@ -45,7 +45,7 @@ GET an individual grant - Process ongoing 
    ...    Test title: 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.

    ...    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.

    ...    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] v3.3.1

    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions: none

    ...    Post-Conditions: none
@@ -59,7 +59,7 @@ GET an individual grant - grant rejected 
    ...    Test title: 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.

    ...    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

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions: none

    ...    Post-Conditions: none
@@ -72,7 +72,7 @@ PUT an individual grant - Method not implemented 
    ...    Test title: 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  

    ...    Test objective: The objective is to test that PUT method is not allowed to for Life cycle operation granting  

    ...    Pre-conditions: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions: none 

    ...    Post-Conditions: none
@@ -84,7 +84,7 @@ PATCH an individual grant - Method not implemented 
    ...    Test title: 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  

    ...    Test objective: The objective is to test that PATCH method is not allowed to for Life cycle operation granting  

    ...    Pre-conditions: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions: none 

    ...    Post-Conditions: none
@@ -96,7 +96,7 @@ DELETE an individual grant - Method not implemented 
    ...    Test title: 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  

    ...    Test objective: The objective is to test that DELETE method is not allowed to for Life cycle operation granting  

    ...    Pre-conditions: none

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v3.3.1

    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v3.5.1

    ...    Config ID: Config_prod_NFVO

    ...    Config ID: Config_prod_NFVO

    ...    Applicability: none

    ...    Applicability: none

    ...    Post-Conditions: none

    ...    Post-Conditions: none

SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt

+0 −21
Original line number Original line Diff line number Diff line
@@ -20,29 +20,10 @@ ${response} {} 
${VNFM_HOST}      localhost    # Hostname of the VNFM

${VNFM_HOST}      localhost    # Hostname of the VNFM

${VNFM_PORT}      8080    # Listening port of the VNFM

${VNFM_PORT}      8080    # Listening port of the VNFM

${VNFM_SCHEMA}    https

${VNFM_SCHEMA}    https

${CONTENT_TYPE_PATCH}    application/merge-patch+json

${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX





${vnfInstanceDescription}    description vnf

${vnfInstanceDescription_Update}    Updated description vnf 

${SINGLE_FILE_VNFD}    1    # If VNFD is PLAIN TEXT

${ACCEPT_PLAIN}    text/plain

${ACCEPT_ZIP}     application/zip

${vnfPkgId_processing}    007c111c-38a1-42c0-a666-7475ecb1567c

${ARTIFACT_TYPE}    application/octet-stream

${ARTIFACT_ID}    artifactId

${WRONG_ACCEPT}    application/json



${sub_filter}    filter

${sub_filter_invalid}    filter_invalid

${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f

${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f

${notification_ep}    notification

${VrQuotaAvailNotification}    {}



${vnfInstanceId}    myVnfInstanceId

${vnfInstanceId}    myVnfInstanceId

${vnfLcmOpOccId}    myLcmOccId

${vnfLcmOpOccId}    myLcmOccId

${vnfdId}    myVnF

${flavourId}    string





${descriptorType}    SOL001

${descriptorType}    SOL001

${check_descriptors}	1

${check_descriptors}	1
@@ -52,8 +33,6 @@ ${tosca_type_virtual_link} tosca.nodes.nfv.VnfVirtualLink 
${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp

${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp

 

 

${VDU_IDs}

${VDU_IDs}

${virtualLink_IDs}

${CP_IDs}

${externalCP_IDs}

${externalCP_IDs}

${Compute_IDs}

${Compute_IDs}

SOL003/VNFLifecycleOperationGranting-API/schemas/grant.schema.json

+80 −160

File changed.

Preview size limit exceeded, changes collapsed.