diff --git a/SOL005/VNFSnapshotPackageManagement-API/AccessConfigurationForExternalArtifacts.robot b/SOL005/VNFSnapshotPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
new file mode 100644
index 0000000000000000000000000000000000000000..9f0595b80df3c8491d68607a67ec9ab5c46fed5f
--- /dev/null
+++ b/SOL005/VNFSnapshotPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
@@ -0,0 +1,78 @@
+*** Settings ***
+Resource    VnfSnapshotPackageManagementKeywords.robot 
+
+*** Test Cases ***
+POST Access Configuration for External Artifacts - Method not implemented
+    [Documentation]    Test ID: 5.3.6.9.1
+    ...    Test title: POST Access Configuration for External Artifacts - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not implemented
+    ...    Pre-conditions: Individual VNF Snapshot Package resource have been created.
+    ...    Reference: Clause 11.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST Access Configuration for External Artifacts
+    Check HTTP Response Status Code Is    405
+    
+GET Access Configuration for External Artifacts
+    [Documentation]    Test ID: 5.3.6.9.2
+    ...    Test title: GET Access Configuration for External Artifacts
+    ...    Test objective: The objective is to test that GET method reads the access configuration information that is used by the NFVO to get the content of external VNF snapshot package artifacts.
+    ...    Pre-conditions: Individual VNF Snapshot Package resource have been created.
+    ...    Reference: Clause 11.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Access Configuration for External Artifacts
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   VnfSnapshotPkgExtArtifactsAccessInfo
+    
+PUT Access Configuration for External Artifacts
+    [Documentation]    Test ID: 5.3.6.9.3
+    ...    Test title: PUT Access Configuration for External Artifacts
+    ...    Test objective: The objective is to test that PUT method provides the access configuration information for the NFVO to download the content of external VNF package artifacts.
+    ...    Pre-conditions: Individual VNF Snapshot Package resource have been created.
+    ...    Reference: Clause 11.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PUT Access Configuration for External Artifacts
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   VnfSnapshotPkgExtArtifactsAccessInfo
+
+PUT Access Configuration for External Artifacts - Conflict
+    [Documentation]    Test ID: 5.3.6.9.4
+    ...    Test title: PUT Access Configuration for External Artifacts - Conflict
+    ...    Test objective: The objective is to test that PUT method cannot provide the access configuration information to the NFVO when the VNF Snapshot Package resource is not in CREATED or ERROR state.
+    ...    Pre-conditions: Individual VNF Snapshot Package resource have been created.
+    ...    Reference: Clause 11.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The "state" attribute of the "Individual VNF snapshot package" resources contains a value different from "CREATED" or "ERROR".
+    ...    Post-Conditions: none
+    PUT Access Configuration for External Artifacts - Conflict
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+PATCH Access Configuration for External Artifacts - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.9.5
+    ...    Test title: PATCH Access Configuration for External Artifacts - Method Not implemented
+    ...    Test objective: The objective is to test that PATCH method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Access Configuration for External Artifacts
+    Check HTTP Response Status Code Is    405
+
+DELETE Access Configuration for External Artifacts - Method Not implemented 
+    [Documentation]    Test ID: 5.3.6.9.6
+    ...    Test title: DELETE Access Configuration for External Artifacts - Method Not implemented
+    ...    Test objective: The objective is to test that DELETE method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    DELETE Access Configuration for External Artifacts
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/BuildVNFSnapshotPackageContentTask.robot b/SOL005/VNFSnapshotPackageManagement-API/BuildVNFSnapshotPackageContentTask.robot
new file mode 100644
index 0000000000000000000000000000000000000000..142e5485f3d067c4a309a7f186f49440235cd67f
--- /dev/null
+++ b/SOL005/VNFSnapshotPackageManagement-API/BuildVNFSnapshotPackageContentTask.robot
@@ -0,0 +1,76 @@
+*** Settings ***
+Resource    VnfSnapshotPackageManagementKeywords.robot 
+
+*** Test Cases ***
+POST Build VNF Snapshot Package Content Task
+    [Documentation]    Test ID: 5.3.6.6.1
+    ...    Test title: POST Build VNF Snapshot Package Content Task
+    ...    Test objective: The objective is to test that POST method provides the information for the NFVO to start building the content of a VNF snapshot package.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST Build VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    202 
+
+POST Build VNF Snapshot Package Content Task - Conflict
+    [Documentation]    Test ID: 5.3.6.6.2
+    ...    Test title: POST Build VNF Snapshot Package Content Task - Conflict
+    ...    Test objective: The objective is to test that a correct error code is returned when the POST method tries to intiate building of VNF Snapshot Package and the state of the VNF snapshot package resource is other than "CREATED".
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The state of the VNF snapshot package resource is other than "CREATED".
+    ...    Post-Conditions: none
+    POST Build VNF Snapshot Package Content Task - Conflict
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET Build VNF Snapshot Package Content Task - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.6.3
+    ...    Test title: GET Build VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that GET method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Build VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
+
+PUT Build VNF Snapshot Package Content Task - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.6.4
+    ...    Test title: PUT Build VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that PUT method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Build VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
+    
+PATCH Build VNF Snapshot Package Content Task - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.6.5
+    ...    Test title: PATCH Build VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that PATCH method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Build VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
+
+DELETE Build VNF Snapshot Package Content Task - Method Not implemented 
+    [Documentation]    Test ID: 5.3.6.6.6
+    ...    Test title: DELETE Build VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that DELETE method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    DELETE Build VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/CancelVNFSnapshotPackageOperationTask.robot b/SOL005/VNFSnapshotPackageManagement-API/CancelVNFSnapshotPackageOperationTask.robot
new file mode 100644
index 0000000000000000000000000000000000000000..7e9f6829b6b4e38c3bd9c42ff13fdd30e3d271ae
--- /dev/null
+++ b/SOL005/VNFSnapshotPackageManagement-API/CancelVNFSnapshotPackageOperationTask.robot
@@ -0,0 +1,76 @@
+*** Settings ***
+Resource    VnfSnapshotPackageManagementKeywords.robot 
+
+*** Test Cases ***
+POST Cancel VNF Snapshot Package Content Task
+    [Documentation]    Test ID: 5.3.6.8.1
+    ...    Test title: POST Cancel VNF Snapshot Package Content Task
+    ...    Test objective: The objective is to test that  POST method provides the information for the NFVO to cancel the ongoing operation related to the content of a VNF snapshot package.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST Cancel VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    202 
+
+POST Cancel VNF Snapshot Package Content Task - Conflict
+    [Documentation]    Test ID: 5.3.6.8.2
+    ...    Test title: POST Cancel VNF Snapshot Package Content Task - Conflict
+    ...    Test objective: The objective is to test that a correct error code is returned when the POST method tries to cancel a VNF Snapshot Package task and the state of the VNF snapshot package resource is other than "UPLOADING", "BUILDING", "PROCESSING" or "EXTRACTING".
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The state of the VNF snapshot package resource is other than "UPLOADING", "BUILDING", "PROCESSING" or "EXTRACTING".
+    ...    Post-Conditions: none
+    POST Cancel VNF Snapshot Package Content Task - Conflict
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET Cancel VNF Snapshot Package Content Task - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.8.3
+    ...    Test title: GET Cancel VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that GET method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Cancel VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
+
+PUT Cancel VNF Snapshot Package Content Task - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.8.4
+    ...    Test title: PUT Cancel VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that PUT method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Cancel VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
+    
+PATCH Cancel VNF Snapshot Package Content Task - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.8.5
+    ...    Test title: PATCH Cancel VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that PATCH method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Cancel VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
+
+DELETE Cancel VNF Snapshot Package Content Task - Method Not implemented 
+    [Documentation]    Test ID: 5.3.6.8.6
+    ...    Test title: DELETE Cancel VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that DELETE method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    DELETE Cancel VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/ExtractVNFSnapshotPackageContentTask.robot b/SOL005/VNFSnapshotPackageManagement-API/ExtractVNFSnapshotPackageContentTask.robot
new file mode 100644
index 0000000000000000000000000000000000000000..2a5ec3d061b673c8b625031bbc39553a075ed693
--- /dev/null
+++ b/SOL005/VNFSnapshotPackageManagement-API/ExtractVNFSnapshotPackageContentTask.robot
@@ -0,0 +1,89 @@
+*** Settings ***
+Resource    VnfSnapshotPackageManagementKeywords.robot 
+
+*** Test Cases ***
+POST Extract VNF Snapshot Package Content Task
+    [Documentation]    Test ID: 5.3.6.7.1
+    ...    Test title: POST Extract VNF Snapshot Package Content Task
+    ...    Test objective: The objective is to test that POST method provides the information for the NFVO to start extracting the content of a VNF snapshot package.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST Extract VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    202 
+
+POST Extract VNF Snapshot Package Content Task - Conflict State
+    [Documentation]    Test ID: 5.3.6.7.2
+    ...    Test title: POST Extract VNF Snapshot Package Content Task - Conflict
+    ...    Test objective: The objective is to test that a correct error code is returned when the POST method tries to intiate extraction of VNF Snapshot Package and the state of the VNF snapshot package resource is other than "AVAILABLE".
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The state of the VNF snapshot package resource is other than "AVAILABLE".
+    ...    Post-Conditions: none
+    POST Extract VNF Snapshot Package Content Task - Conflict State
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+POST Extract VNF Snapshot Package Content Task - Invalid VnfInstanceId
+    [Documentation]    Test ID: 5.3.6.7.3
+    ...    Test title: POST Extract VNF Snapshot Package Content Task - Conflict
+    ...    Test objective: The objective is to test that a correct error code is returned when the POST method tries to intiate extraction of VNF Snapshot Package using an invalid VnfInstanceId in the request body.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The state of the VNF snapshot package resource is other than "CREATED".
+    ...    Post-Conditions: none
+    POST Extract VNF Snapshot Package Content Task - Invalid vnfInstanceId
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET Extract VNF Snapshot Package Content Task - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.7.4
+    ...    Test title: GET Extract VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that GET method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Extract VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
+
+PUT Extract VNF Snapshot Package Content Task - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.7.5
+    ...    Test title: PUT Extract VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that PUT method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Extract VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
+    
+PATCH Extract VNF Snapshot Package Content Task - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.7.6
+    ...    Test title: PATCH Extract VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that PATCH method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Extract VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
+
+DELETE Extract VNF Snapshot Package Content Task - Method Not implemented 
+    [Documentation]    Test ID: 5.3.6.7.7
+    ...    Test title: DELETE Extract VNF Snapshot Package Content Task - Method Not implemented
+    ...    Test objective: The objective is to test that DELETE method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    DELETE Extract VNF Snapshot Package Content Task
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/UploadVNFSnapshotPackageFromUriTask.robot b/SOL005/VNFSnapshotPackageManagement-API/UploadVNFSnapshotPackageFromUriTask.robot
new file mode 100644
index 0000000000000000000000000000000000000000..4d4a00a69eabd59def1602bcb7826a6a5daf7c5d
--- /dev/null
+++ b/SOL005/VNFSnapshotPackageManagement-API/UploadVNFSnapshotPackageFromUriTask.robot
@@ -0,0 +1,76 @@
+*** Settings ***
+Resource    VnfSnapshotPackageManagementKeywords.robot 
+
+*** Test Cases ***
+POST Upload VNF Snapshot Package Content from URI
+    [Documentation]    Test ID: 5.3.6.5.1
+    ...    Test title: POST Upload VNF Snapshot Package Content from URI
+    ...    Test objective: The objective is to test that POST method provides the information for the NFVO to get the content of a VNF snapshot package.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST Upload VNF Snapshot Package Content from URI
+    Check HTTP Response Status Code Is    202 
+
+POST Upload VNF Snapshot Package Content from URI - Conflict
+    [Documentation]    Test ID: 5.3.6.5.2
+    ...    Test title: POST Upload VNF Snapshot Package Content from URI - Conflict
+    ...    Test objective: The objective is to test that a correct error code is returned when the POST method tries to intiate upload VNF Snapshot Package from URI task and the state of the VNF snapshot package resource is other than "CREATED" or "ERROR".
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The state of the VNF snapshot package resource is other than "CREATED" or "ERROR".
+    ...    Post-Conditions: none
+    POST Upload VNF Snapshot Package Content from URI - Conflict
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET Upload VNF Snapshot Package Content from URI - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.5.3
+    ...    Test title: GET Upload VNF Snapshot Package Content from URI - Method Not implemented
+    ...    Test objective: The objective is to test that GET method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Upload VNF Snapshot Package Content from URI
+    Check HTTP Response Status Code Is    405
+
+PUT Upload VNF Snapshot Package Content from URI - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.5.4
+    ...    Test title: PUT Upload VNF Snapshot Package Content from URI - Method Not implemented
+    ...    Test objective: The objective is to test that PUT method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Upload VNF Snapshot Package Content from URI
+    Check HTTP Response Status Code Is    405
+    
+PATCH Upload VNF Snapshot Package Content from URI - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.5.5
+    ...    Test title: PATCH Upload VNF Snapshot Package Content from URI - Method Not implemented
+    ...    Test objective: The objective is to test that PATCH method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Upload VNF Snapshot Package Content from URI
+    Check HTTP Response Status Code Is    405
+
+DELETE Upload VNF Snapshot Package Content from URI - Method Not implemented 
+    [Documentation]    Test ID: 5.3.6.5.6
+    ...    Test title: DELETE Upload VNF Snapshot Package Content from URI - Method Not implemented
+    ...    Test objective: The objective is to test that DELETE method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 11.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    DELETE Upload VNF Snapshot Package Content from URI
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot b/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
index 9a81e1097ccf865cf3b0ee3974bbf4e6939e409b..b54ed478d43a08c7bb445cd4d0a61b13459894c0 100644
--- a/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
+++ b/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
@@ -252,7 +252,7 @@ Check state of the VNF Snapshot Package - PATCH
     ${state}=    Get variable value    ${response['body']['state']}
     @{error_states_VnfSnapshotPackage}=    Create List
     Append to List   ${error_states_VnfSnapshotPackage}    ERROR    BUILDING    UPLOADING    EXTRACTING
-    List should contain value    @{error_states_VnfSnapshotPackage}    ${state}
+    List should contain value    ${error_states_VnfSnapshotPackage}    ${state}
 
 PATCH individual VNF Snapshot Package - Erroneous State
     Check state of the VNF Snapshot Package - PATCH
@@ -270,7 +270,7 @@ Check state of the VNF Snapshot Package - DELETE
     ${state}=    Get variable value    ${response['body']['state']}
     @{error_states_VnfSnapshotPackage}=    Create List
     Append to List   ${error_states_VnfSnapshotPackage}    ERROR_EXTRACTING    BUILDING    UPLOADING    EXTRACTING
-    List should contain value    @{error_states_VnfSnapshotPackage}    ${state}
+    List should contain value    ${error_states_VnfSnapshotPackage}    ${state}
 
 DELETE individual VNF Snapshot Package
     log    Trying to DELETE an individual VNF Snapshot package
@@ -474,3 +474,323 @@ Check HTTP Content-Type Header Is Set For Package Artifact
     Should Be Equal As Strings    ${response['headers']['Content-Type']}    ${CONTENT_TYPE_OCTET} 
     Log    Content type validated
 
+POST Upload VNF Snapshot Package Content from URI
+    Log    Trying to initiate Upload VNF Snapshot Content from URI task
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/UploadVnfSnapshotPkgFromUriRequest.json
+    ${body}=        Format String   ${template}    addressInformation=${vnfPackageContent_URI}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/upload_from_uri    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}        
+    
+POST Upload VNF Snapshot Package Content from URI - Conflict
+    Check Conflict State for PUT VNF Snapshot Package Content
+    Log    Trying to initiate Upload VNF Snapshot Content from URI task when the state of the VNF Snapshot Package is other than ERROR or CREATED.
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/UploadVnfSnapshotPkgFromUriRequest.json
+    ${body}=        Format String   ${template}    addressInformation=${vnfPackageContent_URI}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/upload_from_uri    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}        
+    
+GET Upload VNF Snapshot Package Content from URI
+    log    Trying to perform a GET. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/upload_from_uri 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PUT Upload VNF Snapshot Package Content from URI
+    log    Trying to perform a PUT. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/upload_from_uri 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PATCH Upload VNF Snapshot Package Content from URI
+    log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/upload_from_uri 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+DELETE Upload VNF Snapshot Package Content from URI
+    log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/upload_from_uri 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST Build VNF Snapshot Package Content Task
+    Log    Trying to initiate the Build of VNF Snapshot Content Task
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/BuildVnfSnapshotPkgRequest.json
+    ${body}=        Format String   ${template}    vnfSnapshotInfoId=${vnfSnapshotInfoId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/build    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}        
+    
+POST Build VNF Snapshot Package Content Task - Conflict
+    Check Conflict State for BUILD VNF Snapshot Package Content
+    Log    Trying to initiate the Build VNF Snapshot Content task when the state of the VNF Snapshot Package is not CREATED.
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/BuildVnfSnapshotPkgRequest.json
+    ${body}=        Format String   ${template}    vnfSnapshotInfoId=${vnfSnapshotInfoId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/build    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}    
+	
+Check Conflict State for BUILD VNF Snapshot Package Content
+    GET individual VNF Snapshot Package
+    ${state}=    Get variable value    ${response['body']['state']}
+    Should not be equal as strings    ${state}    CREATED
+          
+GET Build VNF Snapshot Package Content Task
+    log    Trying to perform a GET. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/build 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PUT Build VNF Snapshot Package Content Task
+    log    Trying to perform a PUT. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/build 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PATCH Build VNF Snapshot Package Content Task
+    log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/build 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+DELETE Build VNF Snapshot Package Content Task
+    log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/build 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST Extract VNF Snapshot Package Content Task
+    Log    Trying to initiate Extract VNF Snapshot Content from URI task
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/ExtractVnfSnapshotPkgRequest.json
+    ${body}=        Format String   ${template}    vnfSnapshotInfoId=${vnfSnapshotInfoId}    
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/extract    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}        
+    
+POST Extract VNF Snapshot Package Content Task - Conflict State
+    Check Conflict State for Extract VNF Snapshot Package Content
+    Log    Trying to initiate the Extract VNF Snapshot Content task when the state of the VNF Snapshot Package is not AVAILABLE.
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/ExtractVnfSnapshotPkgRequest.json
+    ${body}=        Format String   ${template}    vnfSnapshotInfoId=${vnfSnapshotInfoId}    vnfInstanceId=${vnfInstanceId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/extract    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}        
+
+Check Conflict State for Extract VNF Snapshot Package Content
+    GET individual VNF Snapshot Package
+    ${state}=    Get variable value    ${response['body']['state']}
+    Should not be equal as strings    ${state}    AVAILABLE
+          
+POST Extract VNF Snapshot Package Content Task - Invalid vnfInstanceId
+    Log    Trying to initiate the Extract VNF Snapshot Content task when the state of the VNF Snapshot Package is not AVAILABLE.
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/ExtractVnfSnapshotPkgRequest.json
+    ${body}=        Format String   ${template}    vnfSnapshotInfoId=${vnfSnapshotInfoId}    vnfInstanceId=${invalidVnfInstanceId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/extract    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}        
+    
+GET Extract VNF Snapshot Package Content Task
+    log    Trying to perform a GET. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/extract 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PUT Extract VNF Snapshot Package Content Task
+    log    Trying to perform a PUT. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/extract 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PATCH Extract VNF Snapshot Package Content Task
+    log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/extract 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+DELETE Extract VNF Snapshot Package Content Task
+    log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/extract 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST Cancel VNF Snapshot Package Content Task
+    Log    Trying to initiate cancelation of VNF Snapshot Content Task
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${body}=    Get File    jsons/CancelVnfSnapshotPkgOperationRequest.json
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/cancel    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}        
+    
+POST Cancel VNF Snapshot Package Content Task - Conflict
+    Check Conflict State for Cancel VNF Snapshot Package Content
+    Log    Trying to initiate the cancelation of VNF Snapshot Content task when the state of the VNF Snapshot Package is other than "UPLOADING", "BUILDING", "PROCESSING" or "EXTRACTING".
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${body}=    Get File    jsons/CancelVnfSnapshotPkgOperationRequest.json
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/cancel    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}    
+	
+Check Conflict State for Cancel VNF Snapshot Package Content
+    GET individual VNF Snapshot Package
+    ${state}=    Get variable value    ${response['body']['state']}
+    @{allowedStates}=    Create List
+    Append to List   ${allowedStates}    PROCESSING    BUILDING    UPLOADING    EXTRACTING
+    List should not contain value    ${allowedStates}    ${state}
+
+GET Cancel VNF Snapshot Package Content Task
+    log    Trying to perform a GET. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/cancel 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PUT Cancel VNF Snapshot Package Content Task
+    log    Trying to perform a PUT. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/cancel 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PATCH Cancel VNF Snapshot Package Content Task
+    log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/cancel 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+DELETE Cancel VNF Snapshot Package Content Task
+    log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content/cancel 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST Access Configuration for External Artifacts
+    Log    Trying to perform a POST. This method should not be implemented.
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/ext_artifacts_access
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}        
+
+PUT Access Configuration for External Artifacts
+    Log    Trying to provide the access configuration information to the NFVO using PUT method.
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${body}=    Get File    jsons/VnfSnapshotPkgExtArtifactsAccessInfo.json
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/ext_artifacts_access    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}    
+    
+PUT Access Configuration for External Artifacts - Conflict
+    Check Conflict State for Cancel VNF Snapshot Package Content
+    Log    Trying to provide the access configuration information to the NFVO using PUT method when the state of VNF Snapshot Package is not ERROR or CREATED.
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${body}=    Get File    jsons/VnfSnapshotPkgExtArtifactsAccessInfo.json
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/ext_artifacts_access    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}    
+	
+Check Conflict State for External Artifact Access Configuration
+    GET individual VNF Snapshot Package
+    ${state}=    Get variable value    ${response['body']['state']}
+    @{allowedStates}=    Create List
+    Append to List   ${allowedStates}    CREATED    ERROR
+    List should not contain value    ${allowedStates}    ${state}
+
+GET Access Configuration for External Artifacts
+    log    Trying to read the access configuration information that is used by the NFVO to get the content of external VNF snapshot package artifacts
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/ext_artifacts_access 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PATCH Access Configuration for External Artifacts
+    log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/ext_artifacts_access 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+DELETE Access Configuration for External Artifacts
+    log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/ext_artifacts_access 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/environment/variables.txt b/SOL005/VNFSnapshotPackageManagement-API/environment/variables.txt
index aa96fc3d7a0a9c83e6100736c8884dc2f19821e3..e614f4a8b3a53d39a340d0a74db032aca77cc87e 100644
--- a/SOL005/VNFSnapshotPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFSnapshotPackageManagement-API/environment/variables.txt
@@ -96,5 +96,9 @@ ${callbackResp}    localhost
 ${vnfSnapshotPkgId}
 ${invalidVnfSnapshotPkgId}
 ${vnfSnapshotPkgId_notInAvailableState}
+${vnfSnapshotInfoId}
+${vnfInstanceId}    associated-with-extraction-of-VNF-snapshot-package
+${invalidVnfInstanceId}    invlalid-association-with-VNF-snapshot-package
 
-${erroneousState_VnfSnapshotPackage}    1
+${vnfPackageContent_URI}    http://uri/for/vnfpackagecontent/upload
+${externalArtifact_URI}    http://uri/for/external/artifact
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/jsons/BuildVnfSnapshotPkgRequest.json b/SOL005/VNFSnapshotPackageManagement-API/jsons/BuildVnfSnapshotPkgRequest.json
new file mode 100644
index 0000000000000000000000000000000000000000..55e7f94ce2ac02a80c11c65b21129aef54e54ecf
--- /dev/null
+++ b/SOL005/VNFSnapshotPackageManagement-API/jsons/BuildVnfSnapshotPkgRequest.json
@@ -0,0 +1,3 @@
+{{
+  "vnfSnapshotInfoId": "{vnfSnapshotInfoId}"
+}}
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/jsons/CancelVnfSnapshotPkgOperationRequest.json b/SOL005/VNFSnapshotPackageManagement-API/jsons/CancelVnfSnapshotPkgOperationRequest.json
new file mode 100644
index 0000000000000000000000000000000000000000..b5cd8abd905b3a0d1d3dd9516d9aaed54da16897
--- /dev/null
+++ b/SOL005/VNFSnapshotPackageManagement-API/jsons/CancelVnfSnapshotPkgOperationRequest.json
@@ -0,0 +1,3 @@
+{
+  "cause": "Cancelation cause..."
+}
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/jsons/ExtractVnfSnapshotPkgRequest.json b/SOL005/VNFSnapshotPackageManagement-API/jsons/ExtractVnfSnapshotPkgRequest.json
new file mode 100644
index 0000000000000000000000000000000000000000..9984bf184c30e700323aa121340219dfa3598aaa
--- /dev/null
+++ b/SOL005/VNFSnapshotPackageManagement-API/jsons/ExtractVnfSnapshotPkgRequest.json
@@ -0,0 +1,4 @@
+{{
+  "vnfSnapshotInfoId": "{vnfSnapshotInfoId}",
+  "vnfInstanceId": "{vnfInstanceId}"
+}}
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/jsons/UploadVnfSnapshotPkgFromUriRequest.json b/SOL005/VNFSnapshotPackageManagement-API/jsons/UploadVnfSnapshotPkgFromUriRequest.json
new file mode 100644
index 0000000000000000000000000000000000000000..133ac9d840f6d4e80636cb414eb64100eba4da5c
--- /dev/null
+++ b/SOL005/VNFSnapshotPackageManagement-API/jsons/UploadVnfSnapshotPkgFromUriRequest.json
@@ -0,0 +1,3 @@
+{{
+  "addressInformation": "{addressInformation}"
+}}
\ No newline at end of file
diff --git a/SOL005/VNFSnapshotPackageManagement-API/jsons/VnfSnapshotPkgExtArtifactsAccessConfig.json b/SOL005/VNFSnapshotPackageManagement-API/jsons/VnfSnapshotPkgExtArtifactsAccessConfig.json
new file mode 100644
index 0000000000000000000000000000000000000000..d7ccdb92f857fcfabb01d123b63ac205368557b0
--- /dev/null
+++ b/SOL005/VNFSnapshotPackageManagement-API/jsons/VnfSnapshotPkgExtArtifactsAccessConfig.json
@@ -0,0 +1,7 @@
+{{
+  "artifact": [
+    {{
+      "artifactUri": "{artifactUri}"
+    }}
+  ]
+}}
\ No newline at end of file